Author: toad
Date: 2008-12-09 22:51:17 +0000 (Tue, 09 Dec 2008)
New Revision: 24149
Modified:
trunk/freenet/src/freenet/node/PeerNode.java
Log:
indent
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2008-12-09 22:49:27 UTC
(rev 24148)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2008-12-09 22:51:17 UTC
(rev 24149)
@@ -1364,25 +1364,25 @@
if(isBurstOnly())
return calcNextHandshakeBurstOnly(now);
synchronized(this) {
- long delay;
- if(unroutableOlderVersion || unroutableNewerVersion ||
disableRouting) {
- // Let them know we're here, but have no hope of
routing general data to them.
- delay = Node.MIN_TIME_BETWEEN_VERSION_SENDS +
node.random.nextInt(Node.RANDOMIZED_TIME_BETWEEN_VERSION_SENDS);
- } else if(invalidVersion() && !firstHandshake) {
- delay = Node.MIN_TIME_BETWEEN_VERSION_PROBES +
node.random.nextInt(Node.RANDOMIZED_TIME_BETWEEN_VERSION_PROBES);
- } else {
- delay = Node.MIN_TIME_BETWEEN_HANDSHAKE_SENDS +
node.random.nextInt(Node.RANDOMIZED_TIME_BETWEEN_HANDSHAKE_SENDS);
+ long delay;
+ if(unroutableOlderVersion || unroutableNewerVersion ||
disableRouting) {
+ // Let them know we're here, but have no hope
of routing general data to them.
+ delay = Node.MIN_TIME_BETWEEN_VERSION_SENDS +
node.random.nextInt(Node.RANDOMIZED_TIME_BETWEEN_VERSION_SENDS);
+ } else if(invalidVersion() && !firstHandshake) {
+ delay = Node.MIN_TIME_BETWEEN_VERSION_PROBES +
node.random.nextInt(Node.RANDOMIZED_TIME_BETWEEN_VERSION_PROBES);
+ } else {
+ delay = Node.MIN_TIME_BETWEEN_HANDSHAKE_SENDS +
node.random.nextInt(Node.RANDOMIZED_TIME_BETWEEN_HANDSHAKE_SENDS);
+ }
+ // FIXME proper multi-homing support!
+ delay /= (handshakeIPs == null ? 1 :
handshakeIPs.length);
+ if(delay < 3000) delay = 3000;
+ sendHandshakeTime = now + delay;
+
+ if(successfulHandshakeSend)
+ firstHandshake = false;
+ handshakeCount++;
+ return handshakeCount == MAX_HANDSHAKE_COUNT;
}
- // FIXME proper multi-homing support!
- delay /= (handshakeIPs == null ? 1 : handshakeIPs.length);
- if(delay < 3000) delay = 3000;
- sendHandshakeTime = now + delay;
-
- if(successfulHandshakeSend)
- firstHandshake = false;
- handshakeCount++;
- return handshakeCount == MAX_HANDSHAKE_COUNT;
- }
}
private synchronized boolean calcNextHandshakeBurstOnly(long now) {
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
