Author: toad
Date: 2007-11-28 21:10:34 +0000 (Wed, 28 Nov 2007)
New Revision: 16046
Modified:
trunk/freenet/src/freenet/node/NodeCrypto.java
trunk/freenet/src/freenet/node/PeerNode.java
Log:
Don't take into account nodes which have called forceDisconnect()
Modified: trunk/freenet/src/freenet/node/NodeCrypto.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeCrypto.java 2007-11-28 21:08:37 UTC
(rev 16045)
+++ trunk/freenet/src/freenet/node/NodeCrypto.java 2007-11-28 21:10:34 UTC
(rev 16046)
@@ -134,6 +134,7 @@
if(pm == null) return false;
PeerNode[] peers = isOpennet ?
((PeerNode[])pm.getOpennetPeers()) : ((PeerNode[])pm.getDarknetPeers());
for(int i=0;i<peers.length;i++) {
+ if(peers[i].forceDisconnectCalled())
continue;
if(peers[i].manyPacketsClaimedSentNotReceived()) return true;
}
return false;
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2007-11-28 21:08:37 UTC
(rev 16045)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2007-11-28 21:10:34 UTC
(rev 16046)
@@ -1037,6 +1037,10 @@
disconnected();
}
+ boolean forceDisconnectCalled() {
+ return forceDisconnectCalled;
+ }
+
/**
* Grab all queued Message's.
* @return Null if no messages are queued, or an array of