Author: toad
Date: 2007-12-08 18:25:42 +0000 (Sat, 08 Dec 2007)
New Revision: 16415
Modified:
trunk/freenet/src/freenet/node/PeerNode.java
Log:
Refactor marginally
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2007-12-08 18:15:17 UTC
(rev 16414)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2007-12-08 18:25:42 UTC
(rev 16415)
@@ -1194,14 +1194,16 @@
protected synchronized boolean innerCalcNextHandshake(boolean
successfulHandshakeSend, boolean dontFetchARK, long now) {
if(isBurstOnly())
return calcNextHandshakeBurstOnly(now);
+ long delay;
if(verifiedIncompatibleOlderVersion ||
verifiedIncompatibleNewerVersion || disableRouting) {
// Let them know we're here, but have no hope of
connecting
- sendHandshakeTime = now +
Node.MIN_TIME_BETWEEN_VERSION_SENDS +
node.random.nextInt(Node.RANDOMIZED_TIME_BETWEEN_VERSION_SENDS);
+ delay = Node.MIN_TIME_BETWEEN_VERSION_SENDS +
node.random.nextInt(Node.RANDOMIZED_TIME_BETWEEN_VERSION_SENDS);
} else if(invalidVersion() && !firstHandshake) {
- sendHandshakeTime = now +
Node.MIN_TIME_BETWEEN_VERSION_PROBES +
node.random.nextInt(Node.RANDOMIZED_TIME_BETWEEN_VERSION_PROBES);
+ delay = Node.MIN_TIME_BETWEEN_VERSION_PROBES +
node.random.nextInt(Node.RANDOMIZED_TIME_BETWEEN_VERSION_PROBES);
} else {
- sendHandshakeTime = now +
Node.MIN_TIME_BETWEEN_HANDSHAKE_SENDS +
node.random.nextInt(Node.RANDOMIZED_TIME_BETWEEN_HANDSHAKE_SENDS);
+ delay = Node.MIN_TIME_BETWEEN_HANDSHAKE_SENDS +
node.random.nextInt(Node.RANDOMIZED_TIME_BETWEEN_HANDSHAKE_SENDS);
}
+ sendHandshakeTime = now + delay;
if(successfulHandshakeSend)
firstHandshake = false;
