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

SSU2: Hopefully fix rare deadlock via forEachAndNot()

Browse Source
This commit is contained in:
zzz
2024-11-02 16:03:21 -04:00
parent 049ddb3717
commit 115c165bb6
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
router/java/src/net/i2p/router/transport/udp/PeerState2.java
View File

@@ -291,6 +291,28 @@ public class PeerState2 extends PeerState implements SSU2Payload.PayloadCallback
* @since 0.9.55 split out from above
*/
private boolean checkRetransmitSessionConfirmed(long now, boolean force) {
boolean rv = checkRetransmitSessionConfirmed2(now, force);
if (!rv) {
// pulled out from synch block below to avoid deadlock
if (_log.shouldWarn())
_log.warn("Fail, no Sess Conf ACK rcvd on " + this);
try {
UDPPacket pkt = _transport.getBuilder2().buildSessionDestroyPacket(SSU2Util.REASON_FRAME_TIMEOUT, this);
_transport.send(pkt);
} catch (IOException ioe) {}
_transport.dropPeer(this, true, "No Sess Conf ACK rcvd");
}
return rv;
}
/**
* Only call for outbound, if we don't have ack 0 yet.
*
* @param force ignore timer, always send
* @return success, false if total fail
* @since 0.9.65 split out from above
*/
private boolean checkRetransmitSessionConfirmed2(long now, boolean force) {
UDPPacket[] packets = null;
synchronized(this) {
if (_sessConfForReTX != null) {
@@ -300,13 +322,6 @@ public class PeerState2 extends PeerState implements SSU2Payload.PayloadCallback
// note: we generally won't get here, because the
// first outbound message will timeout before this
// and close the session in super.finishMessages()
if (_log.shouldWarn())
_log.warn("Fail, no Sess Conf ACK rcvd on " + this);
try {
UDPPacket pkt = _transport.getBuilder2().buildSessionDestroyPacket(SSU2Util.REASON_FRAME_TIMEOUT, this);
_transport.send(pkt);
} catch (IOException ioe) {}
_transport.dropPeer(this, true, "No Sess Conf ACK rcvd");
_sessConfForReTX = null;
return false;
}

3
router/java/src/net/i2p/router/transport/udp/SSU2Bitfield.java
View File

@@ -12,6 +12,9 @@ import net.i2p.router.transport.udp.SSU2Payload.AckBlock;
*
* Also contains methods to convert to/from an ACK block.
*
* Locking: Most methods are synchronized here.
* Do not call methods with the PeerState2 lock held, chance of deadlock.
*
* @since 0.9.54
*/
class SSU2Bitfield {