Author: toad
Date: 2006-05-31 14:34:22 +0000 (Wed, 31 May 2006)
New Revision: 8954
Modified:
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/Version.java
Log:
760: U
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2006-05-31 14:10:00 UTC (rev
8953)
+++ trunk/freenet/src/freenet/node/Node.java 2006-05-31 14:34:22 UTC (rev
8954)
@@ -410,10 +410,10 @@
public static final long MAX_PING_TIME = 1000;
/** Maximum throttled packet delay. If the throttled packet delay is
greater
* than this, reject all packets. */
- public static final long MAX_THROTTLE_DELAY = 1000;
+ public static final long MAX_THROTTLE_DELAY = 2000;
/** If the throttled packet delay is less than this, reject no packets; if
it's
* between the two, reject some packets. */
- public static final long SUB_MAX_THROTTLE_DELAY = 2000;
+ public static final long SUB_MAX_THROTTLE_DELAY = 1000;
/** Accept one request every 10 seconds regardless, to ensure we update the
* block send time.
@@ -1957,6 +1957,7 @@
double pingTime = nodePinger.averagePingTime();
if(pingTime > MAX_PING_TIME) {
if(now - lastAcceptedRequest > MAX_INTERREQUEST_TIME) {
+ Logger.minor(this, "Accepting request anyway (take one
every 10 secs to keep bwlimitDelayTime updated)");
lastAcceptedRequest = now;
return false;
}
@@ -1974,8 +1975,10 @@
// Bandwidth limited packets
double bwlimitDelayTime =
this.throttledPacketSendAverage.currentValue();
+ Logger.minor(this, "bwlimitDelayTime = "+bwlimitDelayTime);
if(bwlimitDelayTime > MAX_THROTTLE_DELAY) {
if(now - lastAcceptedRequest > MAX_INTERREQUEST_TIME) {
+ Logger.minor(this, "Accepting request anyway (take one
every 10 secs to keep bwlimitDelayTime updated)");
lastAcceptedRequest = now;
return false;
}
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-05-31 14:10:00 UTC (rev
8953)
+++ trunk/freenet/src/freenet/node/Version.java 2006-05-31 14:34:22 UTC (rev
8954)
@@ -18,7 +18,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 759;
+ private static final int buildNumber = 760;
/** Oldest build of Fred we will talk to */
private static final int lastGoodBuild = 759;
