diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryHelper.java index e1f8150e9..f6746dfd4 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryHelper.java @@ -532,7 +532,7 @@ public class SummaryHelper extends HelperBase { if (_context == null) return "0"; long received = _context.bandwidthLimiter().getTotalAllocatedInboundBytes(); - return DataHelper.formatSize2(received) + 'B'; + return DataHelper.formatSize2Decimal(received) + 'B'; } /** @@ -544,7 +544,7 @@ public class SummaryHelper extends HelperBase { if (_context == null) return "0"; long sent = _context.bandwidthLimiter().getTotalAllocatedOutboundBytes(); - return DataHelper.formatSize2(sent) + 'B'; + return DataHelper.formatSize2Decimal(sent) + 'B'; } /** diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/TunnelRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/TunnelRenderer.java index 0d8bb9081..e875ddaf6 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/TunnelRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/TunnelRenderer.java @@ -142,7 +142,7 @@ class TunnelRenderer { out.write("" + DataHelper.formatDuration2(timeLeft) + ""); else out.write("(" + _t("grace period") + ")"); - out.write("" + count + " KB"); + out.write("" + (count * 1024 / 1000) + " KB"); int lifetime = (int) ((_context.clock().now() - cfg.getCreation()) / 1000); if (lifetime <= 0) lifetime = 1; @@ -166,7 +166,7 @@ class TunnelRenderer { out.write("
" + _t("Inactive participating tunnels") + ":  " + inactive + "
\n"); else if (displayed <= 0) out.write("
" + _t("none") + "
\n"); - out.write("
" + _t("Lifetime bandwidth usage") + ":  " + DataHelper.formatSize2(processed*1024) + "B
\n"); + out.write("
" + _t("Lifetime bandwidth usage") + ":  " + DataHelper.formatSize2Decimal(processed*1024) + "B
\n"); } else { out.write("
" + _t("Not enough shared bandwidth to build participating tunnels.") + " [" + _t("Configure") + "]
\n"); @@ -247,8 +247,8 @@ class TunnelRenderer { out.write("\"Outbound\""); out.write("" + DataHelper.formatDuration2(timeLeft) + "\n"); - int count = info.getProcessedMessagesCount(); - out.write("" + count + " KiB\n"); + int count = info.getProcessedMessagesCount() * 1024 / 1000; + out.write("" + count + " KB\n"); for (int j = 0; j < info.getLength(); j++) { Hash peer = info.getPeer(j); TunnelId id = (info.isInbound() ? info.getReceiveTunnelId(j) : info.getSendTunnelId(j)); @@ -297,8 +297,8 @@ class TunnelRenderer { if (live <= 0) out.write("
" + _t("No tunnels; waiting for the grace period to end.") + "
\n"); out.write("
" + _t("Lifetime bandwidth usage") + ":  " + - DataHelper.formatSize2(processedIn*1024) + "B " + _t("in") + ", " + - DataHelper.formatSize2(processedOut*1024) + "B " + _t("out") + "
"); + DataHelper.formatSize2Decimal(processedIn*1024) + "B " + _t("in") + ", " + + DataHelper.formatSize2Decimal(processedOut*1024) + "B " + _t("out") + ""); } /****