From 32bba60bed4f6efa6aeaad152bfa7e7bbae448a7 Mon Sep 17 00:00:00 2001 From: zzz <zzz@i2pmail.org> Date: Sun, 24 Apr 2022 15:46:57 -0400 Subject: [PATCH] SSU2: Peer Test fixes part 4 Fix NPE sending message 6 --- .../net/i2p/router/transport/udp/PeerTestManager.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java b/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java index b71fdb181c..b6f8919bf7 100644 --- a/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java +++ b/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java @@ -207,6 +207,17 @@ class PeerTestManager { PeerTestState test = new PeerTestState(ALICE, bob, bobIP instanceof Inet6Address, _context.random().nextLong(MAX_NONCE), _context.clock().now()); + if (bob.getVersion() == 2) { + PeerState2 b2 = (PeerState2) bob; + try { + InetAddress addr = InetAddress.getByAddress(b2.getOurIP()); + test.setAlice(addr, b2.getOurPort(), _context.routerHash()); + } catch (UnknownHostException uhe) { + if (_log.shouldWarn()) + _log.warn("Unable to get our IP", uhe); + return; + } + } _currentTest = test; _currentTestComplete = false; -- GitLab