Author: nextgens
Date: 2007-09-08 23:16:49 +0000 (Sat, 08 Sep 2007)
New Revision: 15076
Modified:
trunk/freenet/src/freenet/node/PacketSender.java
Log:
Previous commit was meant to go in trunk; it's not specific to the -jfk branch!
Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java 2007-09-08 22:55:48 UTC
(rev 15075)
+++ trunk/freenet/src/freenet/node/PacketSender.java 2007-09-08 23:16:49 UTC
(rev 15076)
@@ -183,23 +183,20 @@
PeerNode pn = nodes[i];
lastReceivedPacketFromAnyNode =
Math.max(pn.lastReceivedPacketTime(),
lastReceivedPacketFromAnyNode);
- pn.maybeOnConnect();
+ pn.maybeOnConnect();
if(pn.isConnected()) {
-
- if(pn.isRoutable() && pn.noLongerRoutable()) {
+ // Is the node dead?
+ if(now - pn.lastReceivedPacketTime() >
pn.maxTimeBetweenReceivedPackets()) {
+ Logger.normal(this, "Disconnecting from "+pn+" -
haven't received packets recently");
+ pn.disconnected();
+ continue;
+ } else if(pn.isRoutable() && pn.noLongerRoutable()) {
// we don't disconnect but we mark it incompatible
pn.invalidate();
pn.setPeerNodeStatus(now);
Logger.normal(this, "shouldDisconnectNow has returned
true : marking the peer as incompatible");
continue;
}
-
- // Is the node dead?
- if(pn.isRoutable() && now - pn.lastReceivedPacketTime() >
pn.maxTimeBetweenReceivedPackets()) {
- Logger.normal(this, "Disconnecting from "+pn+" -
haven't received packets recently");
- pn.disconnected();
- continue;
- }
boolean mustSend = false;
