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 e1f8150e9815c44ebf5a464b24d55b8d35008764..f6746dfd48789bc22c7bfab1a472753b646c53e5 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 0d8bb9081fb01f33ab05e888eb95fde86d6df0fb..e875ddaf6cccc0831cce561e0bb8a3fc47604ebc 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("<td class=\"cells\" align=\"center\">" + DataHelper.formatDuration2(timeLeft) + "</td>"); else out.write("<td class=\"cells\" align=\"center\">(" + _t("grace period") + ")</td>"); - out.write("<td class=\"cells\" align=\"center\">" + count + " KB</td>"); + out.write("<td class=\"cells\" align=\"center\">" + (count * 1024 / 1000) + " KB</td>"); int lifetime = (int) ((_context.clock().now() - cfg.getCreation()) / 1000); if (lifetime <= 0) lifetime = 1; @@ -166,7 +166,7 @@ class TunnelRenderer { out.write("<div class=\"statusnotes\"><b>" + _t("Inactive participating tunnels") + ": " + inactive + "</b></div>\n"); else if (displayed <= 0) out.write("<div class=\"statusnotes\"><b>" + _t("none") + "</b></div>\n"); - out.write("<div class=\"statusnotes\"><b>" + _t("Lifetime bandwidth usage") + ": " + DataHelper.formatSize2(processed*1024) + "B</b></div>\n"); + out.write("<div class=\"statusnotes\"><b>" + _t("Lifetime bandwidth usage") + ": " + DataHelper.formatSize2Decimal(processed*1024) + "B</b></div>\n"); } else { out.write("<div class=\"statusnotes noparticipate\"><b>" + _t("Not enough shared bandwidth to build participating tunnels.") + "</b> <a href=\"config\">[" + _t("Configure") + "]</a></div>\n"); @@ -247,8 +247,8 @@ class TunnelRenderer { out.write("<tr><td class=\"cells\" align=\"center\"><img src=\"/themes/console/images/outbound.png\" alt=\"Outbound\" title=\"" + _t("Outbound") + "\"></td>"); out.write("<td class=\"cells\" align=\"center\">" + DataHelper.formatDuration2(timeLeft) + "</td>\n"); - int count = info.getProcessedMessagesCount(); - out.write("<td class=\"cells\" align=\"center\">" + count + " KiB</td>\n"); + int count = info.getProcessedMessagesCount() * 1024 / 1000; + out.write("<td class=\"cells\" align=\"center\">" + count + " KB</td>\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("<div class=\"statusnotes\"><center><b>" + _t("No tunnels; waiting for the grace period to end.") + "</b></center></div>\n"); out.write("<div class=\"statusnotes\"><center><b>" + _t("Lifetime bandwidth usage") + ": " + - DataHelper.formatSize2(processedIn*1024) + "B " + _t("in") + ", " + - DataHelper.formatSize2(processedOut*1024) + "B " + _t("out") + "</b></center></div>"); + DataHelper.formatSize2Decimal(processedIn*1024) + "B " + _t("in") + ", " + + DataHelper.formatSize2Decimal(processedOut*1024) + "B " + _t("out") + "</b></center></div>"); } /****