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

NTCP: Retain pending messages when replacing connection

Browse Source
This commit is contained in:
zzz
2020-04-09 17:27:23 +00:00
parent 370b7f1124
commit 80ae2ccea6
3 changed files with 38 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 = 6;
public final static long BUILD = 7;
/** for example "-test" */
public final static String EXTRA = "";

26
router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java
View File

@ -342,8 +342,9 @@ public class NTCPConnection implements Closeable {
void finishInboundEstablishment(SessionKey key, long clockSkew, byte prevWriteEnd[], byte prevReadEnd[]) {
NTCPConnection toClose = locked_finishInboundEstablishment(key, clockSkew, prevWriteEnd, prevReadEnd);
if (toClose != null) {
if (_log.shouldLog(Log.DEBUG))
_log.debug("Old connection closed: " + toClose + " replaced by " + this);
int drained = toClose.drainOutboundTo(_outbound);
if (_log.shouldWarn())
_log.warn("Old connection closed: " + toClose + " replaced by " + this + "; drained " + drained);
_context.statManager().addRateData("ntcp.inboundEstablishedDuplicate", toClose.getUptime());
toClose.close();
}
@ -412,6 +413,24 @@ public class NTCPConnection implements Closeable {
return ! _currentOutbound.isEmpty();
}
}
/**
* Drain any pending outbound messages to a new queue
* @return number drained
* @since 0.9.46
*/
private int drainOutboundTo(Queue<OutNetMessage> to) {
int rv = 0;
synchronized (_currentOutbound) {
rv = _currentOutbound.size();
if (rv > 0) {
to.addAll(_currentOutbound);
_currentOutbound.clear();
}
rv += _outbound.drainTo(to);
}
return rv;
}
/** @return milliseconds */
public long getTimeSinceSend() { return _context.clock().now()-_lastSendTime; }
@ -1860,8 +1879,9 @@ public class NTCPConnection implements Closeable {
}
NTCPConnection toClose = _transport.inboundEstablished(this);
if (toClose != null && toClose != this) {
int drained = toClose.drainOutboundTo(_outbound);
if (_log.shouldWarn())
_log.warn("Old connection closed: " + toClose + " replaced by " + this);
_log.warn("Old connection closed: " + toClose + " replaced by " + this + "; drained " + drained);
_context.statManager().addRateData("ntcp.inboundEstablishedDuplicate", toClose.getUptime());
toClose.close();
}