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

SSU: Fix sent msg count, broken in last checkin

Browse Source 
Increase sent threshold from 1 to 2 for mayDisconnect(),
because we send both our RI and a DeliveryStatusMessage
Log tweak
This commit is contained in:
zzz
2015-12-21 14:15:40 +00:00
parent 074c5aa16c
commit 3bce2f5d46
4 changed files with 5 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 = 16;
public final static long BUILD = 17;
/** for example "-test" */
public final static String EXTRA = "";

2
router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java
View File

@ -293,6 +293,7 @@ class OutboundMessageState implements CDPQEntry {
public String toString() {
StringBuilder buf = new StringBuilder(256);
buf.append("OB Message ").append(_i2npMessage.getUniqueId());
buf.append(" type ").append(_i2npMessage.getType());
buf.append(" with ").append(_numFragments).append(" fragments");
buf.append(" of size ").append(_messageBuf.length);
buf.append(" volleys: ").append(_maxSends);
@ -304,6 +305,7 @@ class OutboundMessageState implements CDPQEntry {
buf.append(i).append(' ');
}
}
buf.append(" to: ").append(_peer.toString());
return buf.toString();
}
}

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

@ -1180,7 +1180,6 @@ class PeerState {
_sendWindowBytesRemaining = _sendWindowBytes;
//}
_messagesSent++;
if (numSends < 2) {
// caller synchs
//synchronized (this) {

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

@ -2442,7 +2442,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
public void mayDisconnect(final Hash peer) {
final PeerState ps = _peersByIdent.get(peer);
if (ps != null && ps.isInbound() &&
ps.getMessagesReceived() <= 2 && ps.getMessagesSent() <= 1) {
ps.getMessagesReceived() <= 2 && ps.getMessagesSent() <= 2) {
ps.setMayDisconnect();
}
}
@ -2883,7 +2883,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
if (peer.getWeRelayToThemAs() > 0 || peer.getIntroducerTime() > pingCutoff) {
inactivityCutoff = longInactivityCutoff;
} else if (!haveCap && peer.getMayDisconnect() &&
peer.getMessagesReceived() <= 2 && peer.getMessagesSent() <= 1) {
peer.getMessagesReceived() <= 2 && peer.getMessagesSent() <= 2) {
inactivityCutoff = mayDisconCutoff;
} else {
inactivityCutoff = shortInactivityCutoff;