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

SSU: send destroy message in a couple cases where we previously just called dropPeer()

Browse Source
This commit is contained in:
zzz
2015-05-27 20:54:22 +00:00
parent 5e33ed1169
commit 03dfa6515b
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1310,6 +1310,8 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
markUnreachable(peerHash); markUnreachable(peerHash);
_context.banlist().banlistRouter(peerHash, "Part of the wrong network, version = " + ((RouterInfo) entry).getVersion()); _context.banlist().banlistRouter(peerHash, "Part of the wrong network, version = " + ((RouterInfo) entry).getVersion());
//_context.banlist().banlistRouter(peerHash, "Part of the wrong network", STYLE); //_context.banlist().banlistRouter(peerHash, "Part of the wrong network", STYLE);
if (peer != null)
sendDestroy(peer);
dropPeer(peerHash, false, "wrong network"); dropPeer(peerHash, false, "wrong network");
if (_log.shouldLog(Log.WARN)) if (_log.shouldLog(Log.WARN))
_log.warn("Dropping the peer " + peerHash + " because they are in the wrong net: " + entry); _log.warn("Dropping the peer " + peerHash + " because they are in the wrong net: " + entry);
@@ -1343,12 +1345,22 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
boolean isInDropList(RemoteHostId peer) { return _dropList.contains(peer); } boolean isInDropList(RemoteHostId peer) { return _dropList.contains(peer); }
/**
* This does not send a session destroy, caller must do that if desired.
*
* @param shouldBanlist doesn't really, only sets unreachable
*/
void dropPeer(Hash peer, boolean shouldBanlist, String why) { void dropPeer(Hash peer, boolean shouldBanlist, String why) {
PeerState state = getPeerState(peer); PeerState state = getPeerState(peer);
if (state != null) if (state != null)
dropPeer(state, shouldBanlist, why); dropPeer(state, shouldBanlist, why);
} }
/**
* This does not send a session destroy, caller must do that if desired.
*
* @param shouldBanlist doesn't really, only sets unreachable
*/
void dropPeer(PeerState peer, boolean shouldBanlist, String why) { void dropPeer(PeerState peer, boolean shouldBanlist, String why) {
if (_log.shouldLog(Log.INFO)) { if (_log.shouldLog(Log.INFO)) {
long now = _context.clock().now(); long now = _context.clock().now();
@@ -1402,6 +1414,11 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
rebuildIfNecessary(); rebuildIfNecessary();
} }
/**
* This does not send a session destroy, caller must do that if desired.
*
* @param shouldBanlist doesn't really, only sets unreachable
*/
private void locked_dropPeer(PeerState peer, boolean shouldBanlist, String why) { private void locked_dropPeer(PeerState peer, boolean shouldBanlist, String why) {
peer.dropOutbound(); peer.dropOutbound();
peer.expireInboundMessages(); peer.expireInboundMessages();
@@ -1562,7 +1579,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
* *
* @since 0.8.9 * @since 0.8.9
*/ */
private void sendDestroy(PeerState peer) { void sendDestroy(PeerState peer) {
// peer must be fully established // peer must be fully established
if (peer.getCurrentCipherKey() == null) if (peer.getCurrentCipherKey() == null)
return; return;
@@ -2265,6 +2282,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
// ok, a few conseutive failures, but we /are/ getting through to them // ok, a few conseutive failures, but we /are/ getting through to them
} else { } else {
_context.statManager().addRateData("udp.dropPeerConsecutiveFailures", consecutive, msg.getPeer().getInactivityTime()); _context.statManager().addRateData("udp.dropPeerConsecutiveFailures", consecutive, msg.getPeer().getInactivityTime());
sendDestroy(msg.getPeer());
dropPeer(msg.getPeer(), false, "too many failures"); dropPeer(msg.getPeer(), false, "too many failures");
} }
//if ( (consecutive > MAX_CONSECUTIVE_FAILED) && (msg.getPeer().getInactivityTime() > DROP_INACTIVITY_TIME)) //if ( (consecutive > MAX_CONSECUTIVE_FAILED) && (msg.getPeer().getInactivityTime() > DROP_INACTIVITY_TIME))