From 5e6ec442a74330486e795344a104e90f167106dd Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Sun, 24 Apr 2022 09:35:00 -0400
Subject: [PATCH] SSU2: Fix PacketPusher NPE
---
router/java/src/net/i2p/router/transport/udp/PeerState2.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/router/java/src/net/i2p/router/transport/udp/PeerState2.java b/router/java/src/net/i2p/router/transport/udp/PeerState2.java
index f6a200faf9..0acb3d75f2 100644
--- a/router/java/src/net/i2p/router/transport/udp/PeerState2.java
+++ b/router/java/src/net/i2p/router/transport/udp/PeerState2.java
@@ -669,6 +669,7 @@ public class PeerState2 extends PeerState implements SSU2Payload.PayloadCallback
if (_sessConfForReTX == null)
return null;
UDPPacket[] rv = new UDPPacket[_sessConfForReTX.length];
+ InetAddress addr = getRemoteIPAddress();
for (int i = 0; i < rv.length; i++) {
UDPPacket packet = UDPPacket.acquire(_context, false);
rv[i] = packet;
@@ -677,7 +678,7 @@ public class PeerState2 extends PeerState implements SSU2Payload.PayloadCallback
int off = pkt.getOffset();
System.arraycopy(_sessConfForReTX[i], 0, data, off, _sessConfForReTX[i].length);
pkt.setLength(_sessConfForReTX.length);
- pkt.setAddress(_remoteIPAddress);
+ pkt.setAddress(addr);
pkt.setPort(_remotePort);
packet.setMessageType(PacketBuilder2.TYPE_CONF);
packet.setPriority(PacketBuilder2.PRIORITY_HIGH);
--
GitLab