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

SSU: Fix OMF looping when timer isn't cancelled after last message acked

Browse Source 
Push out timer when no more bandwidth available
Workarounds for now, more changes to follow
This commit is contained in:
zzz
2020-12-16 09:40:39 -05:00
parent b9444cdc51
commit 4aefe4bf7a
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 3;
public final static long BUILD = 4;
/** for example "-test" */
public final static String EXTRA = "";

15
router/java/src/net/i2p/router/transport/udp/PeerState.java
View File

@@ -1491,7 +1491,8 @@ public class PeerState {
synchronized(this) {
retransmitTimer = _retransmitTimer;
}
List<OutboundMessageState> rv = allocateSend2(retransmitTimer > 0 && now >= retransmitTimer, now);
boolean canSendOld = retransmitTimer > 0 && now >= retransmitTimer;
List<OutboundMessageState> rv = allocateSend2(canSendOld, now);
if (rv != null && !rv.isEmpty()) {
synchronized(this) {
long old = _retransmitTimer;
@@ -1500,6 +1501,18 @@ public class PeerState {
if (_log.shouldLog(Log.DEBUG))
_log.debug(_remotePeer + " allocated " + rv.size() + " pushing retransmitter from " + old + " to " + _retransmitTimer);
}
} else if (canSendOld) {
// failsafe - push out or cancel timer to prevent looping
boolean isEmpty;
synchronized (_outboundMessages) {
isEmpty = _outboundMessages.isEmpty();
}
synchronized(this) {
if (isEmpty)
_retransmitTimer = 0;
else
_retransmitTimer = now + 250;
}
}
return rv;
}