760: Important fix relating to backoff. Please upgrade ASAP.
On Wed, May 31, 2006 at 02:34:24PM +0000, toad at freenetproject.org wrote:
> 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;
>
> _______________________________________________
> cvs mailing list
> cvs at freenetproject.org
> http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
>
--
Matthew J Toseland - toad at amphibian.dyndns.org
Freenet Project Official Codemonkey - http://freenetproject.org/
ICTHUS - Nothing is impossible. Our Boss says so.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL:
<https://emu.freenetproject.org/pipermail/cvs/attachments/20060531/d025d8b9/attachment.pgp>