AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SSU2: Don't replace previous destroyed peer in the cache

Browse Source 
kill the new one instead
This commit is contained in:
zzz
2022-12-23 16:39:30 -05:00
parent fdbdd10a89
commit 2d633a0bfd
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
router/java/src/net/i2p/router/transport/udp/UDPTransport.java
View File

@@ -1732,9 +1732,12 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
*/
void addRecentlyClosed(PeerStateDestroyed peer) {
Long id = Long.valueOf(peer.getRcvConnID());
PeerStateDestroyed oldPSD;
synchronized(_addDropLock) {
_recentlyClosedConnIDs.put(id, peer);
oldPSD = _recentlyClosedConnIDs.putIfAbsent(id, peer);
}
if (oldPSD != null)
peer.kill();
}
/**
@@ -1922,7 +1925,10 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
if (oldPeer != peer && oldPeer.getVersion() == 2) {
PeerState2 state2 = (PeerState2) oldPeer;
Long id = Long.valueOf(state2.getRcvConnID());
_recentlyClosedConnIDs.put(id, new PeerStateDestroyed(_context, this, state2));
PeerStateDestroyed newPSD = new PeerStateDestroyed(_context, this, state2);
PeerStateDestroyed oldPSD = _recentlyClosedConnIDs.putIfAbsent(id, newPSD);
if (oldPSD != null)
newPSD.kill();
_peersByConnID.remove(id);
}
}
@@ -2178,9 +2184,10 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
if (peer.getVersion() == 2) {
PeerState2 state2 = (PeerState2) peer;
Long id = Long.valueOf(state2.getRcvConnID());
// for now, we don't save the PeerState2 for doing termination retransmissions,
// but we may in the future
_recentlyClosedConnIDs.put(id, new PeerStateDestroyed(_context, this, state2));
PeerStateDestroyed newPSD = new PeerStateDestroyed(_context, this, state2);
PeerStateDestroyed oldPSD = _recentlyClosedConnIDs.putIfAbsent(id, newPSD);
if (oldPSD != null)
newPSD.kill();
_peersByConnID.remove(id);
}