Author: toad
Date: 2006-05-29 21:00:43 +0000 (Mon, 29 May 2006)
New Revision: 8937
Modified:
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/PeerNode.java
trunk/freenet/src/freenet/node/Version.java
Log:
754: Really revert it. Mandatory build. Also makes max backoff 3 hours.
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2006-05-29 20:56:45 UTC (rev
8936)
+++ trunk/freenet/src/freenet/node/Node.java 2006-05-29 21:00:43 UTC (rev
8937)
@@ -46,7 +46,6 @@
import freenet.clients.http.BookmarkManager;
import freenet.clients.http.FProxyToadlet;
import freenet.clients.http.SimpleToadletServer;
-import freenet.clients.http.Spider;
import freenet.config.Config;
import freenet.config.FilePersistentConfig;
import freenet.config.IntCallback;
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2006-05-29 20:56:45 UTC
(rev 8936)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2006-05-29 21:00:43 UTC
(rev 8937)
@@ -1416,15 +1416,10 @@
long routingBackedOffUntil = -1;
/** Initial nominal routing backoff length */
final int INITIAL_ROUTING_BACKOFF_LENGTH = 5000; // 5 seconds
- /** How much to add during slow routing backoff */
- final int SLOW_ROUTING_BACKOFF_ADDER = 7000; // 7 seconds
/** How much to multiply by during fast routing backoff */
- final int FAST_ROUTING_BACKOFF_MULTIPLIER = 2;
- /** After what routing backoff length do we use fast routing backoff
(slow before this) */
- //final int FAST_ROUTING_BACKOFF_LOW_THRESHOLD = 2*60*60*1000; // 2
hours
- final int FAST_ROUTING_BACKOFF_LOW_THRESHOLD = 2*1000; // 2 seconds
(i.e., never happens)
+ final int BACKOFF_MULTIPLIER = 2;
/** Maximum upper limit to routing backoff slow or fast */
- final int MAX_ROUTING_BACKOFF_LENGTH = 24*60*60*1000; // 24 hours
+ final int MAX_ROUTING_BACKOFF_LENGTH = 3*60*60*1000; // 3 hours
/** Current nominal routing backoff length */
int routingBackoffLength = INITIAL_ROUTING_BACKOFF_LENGTH;
/** Last backoff reason */
@@ -1448,10 +1443,7 @@
long now = System.currentTimeMillis();
// Don't back off any further if we are already backed
off
if(now > routingBackedOffUntil) {
- if(routingBackoffLength <
FAST_ROUTING_BACKOFF_LOW_THRESHOLD)
- routingBackoffLength =
routingBackoffLength + SLOW_ROUTING_BACKOFF_ADDER;
- else
- routingBackoffLength =
routingBackoffLength * FAST_ROUTING_BACKOFF_MULTIPLIER;
+ routingBackoffLength = routingBackoffLength *
BACKOFF_MULTIPLIER;
if(routingBackoffLength >
MAX_ROUTING_BACKOFF_LENGTH)
routingBackoffLength =
MAX_ROUTING_BACKOFF_LENGTH;
int x =
node.random.nextInt(routingBackoffLength);
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-05-29 20:56:45 UTC (rev
8936)
+++ trunk/freenet/src/freenet/node/Version.java 2006-05-29 21:00:43 UTC (rev
8937)
@@ -18,10 +18,10 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 753;
+ private static final int buildNumber = 754;
/** Oldest build of Fred we will talk to */
- private static final int lastGoodBuild = 753;
+ private static final int lastGoodBuild = 754;
public static final int buildNumber() {
return buildNumber;
