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

I2CP: Send DestroySession message when destroying session

Browse Source 
in client-side AppContext SimpleSession, to prevent router-side
error message when closing socket, e.g. for BW limits check
This commit is contained in:
zzz
2021-12-27 08:32:04 -05:00
parent 242dc92397
commit c63cb378e8
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/java/src/net/i2p/client/impl/I2PSessionImpl.java
View File

@@ -55,6 +55,7 @@ import net.i2p.data.SigningPublicKey;
import net.i2p.data.i2cp.BlindingInfoMessage; import net.i2p.data.i2cp.BlindingInfoMessage;
import net.i2p.data.i2cp.DestLookupMessage; import net.i2p.data.i2cp.DestLookupMessage;
import net.i2p.data.i2cp.DestReplyMessage; import net.i2p.data.i2cp.DestReplyMessage;
import net.i2p.data.i2cp.DestroySessionMessage;
import net.i2p.data.i2cp.GetBandwidthLimitsMessage; import net.i2p.data.i2cp.GetBandwidthLimitsMessage;
import net.i2p.data.i2cp.GetDateMessage; import net.i2p.data.i2cp.GetDateMessage;
import net.i2p.data.i2cp.HostLookupMessage; import net.i2p.data.i2cp.HostLookupMessage;
@@ -1306,13 +1307,24 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2
} }
if (_log.shouldLog(Log.INFO)) _log.info(getPrefix() + "Destroy the session", new Exception("DestroySession()")); if (_log.shouldLog(Log.INFO)) _log.info(getPrefix() + "Destroy the session", new Exception("DestroySession()"));
if (sendDisconnect && _producer != null) { // only null if overridden by I2PSimpleSession if (sendDisconnect) {
try { if (_producer != null) { // only null if overridden by I2PSimpleSession
_producer.disconnect(this); try {
} catch (I2PSessionException ipe) { _producer.disconnect(this);
//propogateError("Error destroying the session", ipe); } catch (I2PSessionException ipe) {
if (_log.shouldLog(Log.WARN)) //propogateError("Error destroying the session", ipe);
_log.warn("Error destroying the session", ipe); if (_log.shouldLog(Log.WARN))
_log.warn("Error destroying the session", ipe);
}
} else if (!_context.isRouterContext()) {
// Simple session, prevent error on router side in I2CP reader
DestroySessionMessage dmsg = new DestroySessionMessage();
dmsg.setSessionId(DUMMY_SESSION);
try {
sendMessage_unchecked(dmsg);
// give it a chance to get there
try { Thread.sleep(20); } catch (InterruptedException ie) {}
} catch (I2PSessionException ise) {}
} }
} }
// SimpleSession does not initialize // SimpleSession does not initialize