diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java index 2485f170e2..935c4224c1 100644 --- a/core/java/src/net/i2p/CoreVersion.java +++ b/core/java/src/net/i2p/CoreVersion.java @@ -14,8 +14,8 @@ package net.i2p; * */ public class CoreVersion { - public final static String ID = "$Revision: 1.61 $ $Date: 2006/05/09 16:17:19 $"; - public final static String VERSION = "0.6.1.19"; + public final static String ID = "$Revision: 1.62 $ $Date: 2006-05-18 17:31:09 $"; + public final static String VERSION = "0.6.1.20"; public static void main(String args[]) { System.out.println("I2P Core version: " + VERSION); diff --git a/history.txt b/history.txt index c39d1758ab..2816af314e 100644 --- a/history.txt +++ b/history.txt @@ -1,5 +1,11 @@ $Id: history.txt,v 1.479 2006-05-18 17:31:08 jrandom Exp $ +* 2006-06-04 0.6.1.20 released + +2006-06-04 jrandom + * Reduce the SSU ack frequency + * Tweaked the tunnel rejection settings to reject less aggressively + 2006-05-31 jrandom * Only send netDb searches to the floodfill peers for the time being * Add some proof of concept filters for tunnel participation. By default, diff --git a/initialNews.xml b/initialNews.xml index 55ec571303..1b96273d71 100644 --- a/initialNews.xml +++ b/initialNews.xml @@ -1,5 +1,5 @@ - - + i2p - 0.6.1.19 + 0.6.1.20 diff --git a/news.xml b/news.xml index a9928526db..854989d30b 100644 --- a/news.xml +++ b/news.xml @@ -1,5 +1,5 @@ - - + getMinThrottleTunnels()) { double tunnelGrowthFactor = getTunnelGrowthFactor(); - Rate avgTunnels = _context.statManager().getRate("tunnel.participatingTunnels").getRate(60*60*1000); + Rate avgTunnels = _context.statManager().getRate("tunnel.participatingTunnels").getRate(10*60*1000); if (avgTunnels != null) { double avg = 0; if (avgTunnels.getLastEventCount() > 0) @@ -142,37 +142,37 @@ class RouterThrottleImpl implements RouterThrottle { double tunnelTestTimeGrowthFactor = getTunnelTestTimeGrowthFactor(); Rate tunnelTestTime1m = _context.statManager().getRate("tunnel.testSuccessTime").getRate(1*60*1000); - Rate tunnelTestTime60m = _context.statManager().getRate("tunnel.testSuccessTime").getRate(60*60*1000); - if ( (tunnelTestTime1m != null) && (tunnelTestTime60m != null) && (tunnelTestTime1m.getLastEventCount() > 0) ) { + Rate tunnelTestTime10m = _context.statManager().getRate("tunnel.testSuccessTime").getRate(10*60*1000); + if ( (tunnelTestTime1m != null) && (tunnelTestTime10m != null) && (tunnelTestTime1m.getLastEventCount() > 0) ) { double avg1m = tunnelTestTime1m.getAverageValue(); - double avg60m = 0; - if (tunnelTestTime60m.getLastEventCount() > 0) - avg60m = tunnelTestTime60m.getAverageValue(); + double avg10m = 0; + if (tunnelTestTime10m.getLastEventCount() > 0) + avg10m = tunnelTestTime10m.getAverageValue(); else - avg60m = tunnelTestTime60m.getLifetimeAverageValue(); + avg10m = tunnelTestTime10m.getLifetimeAverageValue(); - if (avg60m < 2000) - avg60m = 2000; // minimum before complaining + if (avg10m < 2000) + avg10m = 2000; // minimum before complaining - if ( (avg60m > 0) && (avg1m > avg60m * tunnelTestTimeGrowthFactor) ) { - double probAccept = (avg60m*tunnelTestTimeGrowthFactor)/avg1m; + if ( (avg10m > 0) && (avg1m > avg10m * tunnelTestTimeGrowthFactor) ) { + double probAccept = (avg10m*tunnelTestTimeGrowthFactor)/avg1m; probAccept = probAccept * probAccept; // square the decelerator for test times int v = _context.random().nextInt(100); if (v < probAccept*100) { // ok if (_log.shouldLog(Log.INFO)) _log.info("Probabalistically accept tunnel request (p=" + probAccept - + " v=" + v + " test time avg 1m=" + avg1m + " 60m=" + avg60m + ")"); + + " v=" + v + " test time avg 1m=" + avg1m + " 10m=" + avg10m + ")"); } else { if (_log.shouldLog(Log.WARN)) _log.warn("Probabalistically refusing tunnel request (test time avg 1m=" + avg1m - + " 60m=" + avg60m + ")"); - _context.statManager().addRateData("router.throttleTunnelProbTestSlow", (long)(avg1m-avg60m), 0); + + " 10m=" + avg10m + ")"); + _context.statManager().addRateData("router.throttleTunnelProbTestSlow", (long)(avg1m-avg10m), 0); return TunnelHistory.TUNNEL_REJECT_PROBABALISTIC_REJECT; } } else { if (_log.shouldLog(Log.INFO)) - _log.info("Accepting tunnel request, since 60m test time average is " + avg60m + _log.info("Accepting tunnel request, since 60m test time average is " + avg10m + " and past 1m only has " + avg1m + ")"); } } @@ -260,7 +260,7 @@ class RouterThrottleImpl implements RouterThrottle { int used1s = _context.router().get1sRate(); // dont throttle on the 1s rate, its too volatile int used15s = _context.router().get15sRate(); int used1m = _context.router().get1mRate(); // dont throttle on the 1m rate, its too slow - int used = used15s; + int used = Math.min(used15s,used1s); double share = _context.router().getSharePercentage(); int availBps = (int)(((maxKBps*1024)*share) - used); //(int)(((maxKBps*1024) - used) * getSharePercentage()); @@ -269,8 +269,8 @@ class RouterThrottleImpl implements RouterThrottle { _context.statManager().addRateData("router.throttleTunnelBytesUsed", used, maxKBps); _context.statManager().addRateData("router.throttleTunnelBytesAllowed", availBps, (long)bytesAllocated); - if (used1s > (maxKBps*1024)) { - if (_log.shouldLog(Log.WARN)) _log.warn("Reject tunnel, 1s rate (" + used1s + ") indicates overload."); + if (used1m > (maxKBps*1024)) { + if (_log.shouldLog(Log.WARN)) _log.warn("Reject tunnel, 1m rate (" + used1m + ") indicates overload."); return false; } diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index fb17407968..6d8f6258f1 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -16,8 +16,8 @@ import net.i2p.CoreVersion; */ public class RouterVersion { public final static String ID = "$Revision: 1.419 $ $Date: 2006-05-18 17:31:10 $"; - public final static String VERSION = "0.6.1.19"; - public final static long BUILD = 1; + public final static String VERSION = "0.6.1.20"; + public final static long BUILD = 0; public static void main(String args[]) { System.out.println("I2P Router version: " + VERSION + "-" + BUILD); System.out.println("Router ID: " + RouterVersion.ID); diff --git a/router/java/src/net/i2p/router/transport/udp/ACKSender.java b/router/java/src/net/i2p/router/transport/udp/ACKSender.java index d0bdc33d35..66aad6f4d0 100644 --- a/router/java/src/net/i2p/router/transport/udp/ACKSender.java +++ b/router/java/src/net/i2p/router/transport/udp/ACKSender.java @@ -22,7 +22,7 @@ public class ACKSender implements Runnable { private boolean _alive; /** how frequently do we want to send ACKs to a peer? */ - static final int ACK_FREQUENCY = 200; + static final int ACK_FREQUENCY = 500; public ACKSender(RouterContext ctx, UDPTransport transport) { _context = ctx;