diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java index d02b29914a..1c26f5bd07 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java @@ -205,11 +205,7 @@ public class SummaryHelper { public String getInboundMinuteKBps() { if (_context == null) return "0.0"; - - RateStat receiveRate = _context.statManager().getRate("bw.recvRate"); - if (receiveRate == null) return "0.0"; - Rate rate = receiveRate.getRate(60*1000); - double kbps = rate.getAverageValue()/1024; + double kbps = _context.bandwidthLimiter().getReceiveBps()/1024d; DecimalFormat fmt = new DecimalFormat("##0.00"); return fmt.format(kbps); } @@ -221,11 +217,7 @@ public class SummaryHelper { public String getOutboundMinuteKBps() { if (_context == null) return "0.0"; - - RateStat receiveRate = _context.statManager().getRate("bw.sendRate"); - if (receiveRate == null) return "0.0"; - Rate rate = receiveRate.getRate(60*1000); - double kbps = rate.getAverageValue()/1024; + double kbps = _context.bandwidthLimiter().getSendBps()/1024d; DecimalFormat fmt = new DecimalFormat("##0.00"); return fmt.format(kbps); } diff --git a/apps/routerconsole/jsp/summary.jsp b/apps/routerconsole/jsp/summary.jsp index 8fb1bf414e..ad45e9328c 100644 --- a/apps/routerconsole/jsp/summary.jsp +++ b/apps/routerconsole/jsp/summary.jsp @@ -64,7 +64,7 @@ %>
Bandwidth in/out
- 1m: /KBps
+ 1s: /KBps
5m: /KBps
Total: /KBps
Used: /
diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java index 05555718da..382306bdfe 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.43 $ $Date: 2005/09/29 14:19:23 $"; - public final static String VERSION = "0.6.1.1"; + public final static String ID = "$Revision: 1.44 $ $Date: 2005/10/01 14:20:09 $"; + public final static String VERSION = "0.6.1.2"; public static void main(String args[]) { System.out.println("I2P Core version: " + VERSION); diff --git a/history.txt b/history.txt index 2ea7f51bd0..7e082915ac 100644 --- a/history.txt +++ b/history.txt @@ -1,4 +1,11 @@ -$Id: history.txt,v 1.283 2005/10/05 18:24:33 jrandom Exp $ +$Id: history.txt,v 1.284 2005/10/07 05:23:01 jrandom Exp $ + +* 2005-10-07 0.6.1.2 released + +2005-10-07 jrandom + * Include the 1 second bandwidth usage on the console rather than the + 1 minute rate, as the 1 second value doesn't have the 1m/5m quantization + issues. 2005-10-07 jrandom * Allow the I2PTunnelHTTPServer to send back the first few packets of an diff --git a/initialNews.xml b/initialNews.xml index 86ee01ded5..b55013c00c 100644 --- a/initialNews.xml +++ b/initialNews.xml @@ -1,5 +1,5 @@ - - + i2p - 0.6.1.1 + 0.6.1.2 diff --git a/news.xml b/news.xml index 473868fd02..0c01ac8c6c 100644 --- a/news.xml +++ b/news.xml @@ -1,5 +1,5 @@ - - + -• The new 0.6.1.1 release should help fix some long standing bugs, give it a try!
+• Tip: if an eepsite isn't reachable, it may not be online - orion or + polecat tells whether they can reach the site as well
+• I2Phex users should keep track of the progress on the forum
 diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 9e4e506ce2..9f36e5900c 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -15,9 +15,9 @@ import net.i2p.CoreVersion; * */ public class RouterVersion { - public final static String ID = "$Revision: 1.258 $ $Date: 2005/10/05 18:24:33 $"; - public final static String VERSION = "0.6.1.1"; - public final static long BUILD = 5; + public final static String ID = "$Revision: 1.259 $ $Date: 2005/10/07 05:23:01 $"; + public final static String VERSION = "0.6.1.2"; + 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/FIFOBandwidthLimiter.java b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java index 8f897000a8..2b2e1dd47a 100644 --- a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java +++ b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java @@ -97,6 +97,8 @@ public class FIFOBandwidthLimiter { public void setInboundUnlimited(boolean isUnlimited) { _inboundUnlimited = isUnlimited; } public boolean getOutboundUnlimited() { return _outboundUnlimited; } public void setOutboundUnlimited(boolean isUnlimited) { _outboundUnlimited = isUnlimited; } + public float getSendBps() { return _sendBps; } + public float getReceiveBps() { return _recvBps; } public void reinitialize() { _pendingInboundRequests.clear(); @@ -262,13 +264,13 @@ public class FIFOBandwidthLimiter { _lastTotalReceived = totR; _lastStatsUpdated = now; if (_sendBps <= 0) - _sendBps = ((float)sent*time)/1000f; + _sendBps = ((float)sent*1000f)/(float)time; else - _sendBps = (0.9f)*_sendBps + (0.1f)*((float)sent*time)/1000f; + _sendBps = (0.9f)*_sendBps + (0.1f)*((float)sent*1000f)/(float)time; if (_recvBps <= 0) - _recvBps = ((float)recv*time)/1000f; + _recvBps = ((float)recv*1000f)/(float)time; else - _recvBps = (0.9f)*_recvBps + (0.1f)*((float)recv*time)/1000f; + _recvBps = (0.9f)*_recvBps + (0.1f)*((float)recv*1000)/(float)time; if (_log.shouldLog(Log.WARN)) { if (_log.shouldLog(Log.INFO)) _log.info("BW: time = " + time + " sent: " + sent + " recv: " + recv);