Author: toad
Date: 2006-05-29 21:45:18 +0000 (Mon, 29 May 2006)
New Revision: 8940
Modified:
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/Version.java
Log:
20-30 seconds handshake when we know the other end is using an old version
(because some firewalls/nats have 30 second tunnel timeouts...)
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2006-05-29 21:37:19 UTC (rev
8939)
+++ trunk/freenet/src/freenet/node/Node.java 2006-05-29 21:45:18 UTC (rev
8940)
@@ -399,8 +399,8 @@
public static final int RANDOMIZED_TIME_BETWEEN_HANDSHAKE_SENDS =
HANDSHAKE_TIMEOUT;
public static final int MIN_TIME_BETWEEN_VERSION_PROBES =
HANDSHAKE_TIMEOUT*4;
public static final int RANDOMIZED_TIME_BETWEEN_VERSION_PROBES =
HANDSHAKE_TIMEOUT*2; // 20-30 secs
- public static final int MIN_TIME_BETWEEN_VERSION_SENDS =
HANDSHAKE_TIMEOUT*5;
- public static final int RANDOMIZED_TIME_BETWEEN_VERSION_SENDS =
HANDSHAKE_TIMEOUT*2; // 25-35 secs
+ public static final int MIN_TIME_BETWEEN_VERSION_SENDS =
HANDSHAKE_TIMEOUT*4;
+ public static final int RANDOMIZED_TIME_BETWEEN_VERSION_SENDS =
HANDSHAKE_TIMEOUT*2; // 20-30 secs
// If we don't receive any packets at all in this period, from any node,
tell the user
public static final long ALARM_TIME = 60*1000;
/** Sub-max ping time. If ping is greater than this, we reject some
requests. */
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-05-29 21:37:19 UTC (rev
8939)
+++ trunk/freenet/src/freenet/node/Version.java 2006-05-29 21:45:18 UTC (rev
8940)
@@ -18,7 +18,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 756;
+ private static final int buildNumber = 757;
/** Oldest build of Fred we will talk to */
private static final int lastGoodBuild = 754;
