echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

/tunnels: Right-justify zero-hop IB

Browse Source 
minor cleanups
This commit is contained in:
zzz
2018-03-11 15:14:08 +00:00
parent eb321445d9
commit 2deed13484
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
apps/routerconsole/java/src/net/i2p/router/web/helpers/TunnelRenderer.java
View File

@ -218,8 +218,9 @@ class TunnelRenderer {
int maxLength = 1; int maxLength = 1;
for (int i = 0; i < tunnels.size(); i++) { for (int i = 0; i < tunnels.size(); i++) {
TunnelInfo info = tunnels.get(i); TunnelInfo info = tunnels.get(i);
if (info.getLength() > maxLength) int length = info.getLength();
maxLength = info.getLength(); if (length > maxLength)
maxLength = length;
} }
out.write("<table class=\"tunneldisplay tunnels_client\"><tr><th title=\"" + _t("Inbound or outbound?") + ("\">") + _t("In/Out") out.write("<table class=\"tunneldisplay tunnels_client\"><tr><th title=\"" + _t("Inbound or outbound?") + ("\">") + _t("In/Out")
+ "</th><th>" + _t("Expiry") + "</th><th>" + _t("Usage") + "</th><th>" + _t("Gateway") + "</th>"); + "</th><th>" + _t("Expiry") + "</th><th>" + _t("Usage") + "</th><th>" + _t("Gateway") + "</th>");
@ -240,7 +241,8 @@ class TunnelRenderer {
if (timeLeft <= 0) if (timeLeft <= 0)
continue; // don't display tunnels in their grace period continue; // don't display tunnels in their grace period
live++; live++;
if (info.isInbound()) boolean isInbound = info.isInbound();
if (isInbound)
out.write("<tr><td class=\"cells\" align=\"center\"><img src=\"/themes/console/images/inbound.png\" alt=\"Inbound\" title=\"" + out.write("<tr><td class=\"cells\" align=\"center\"><img src=\"/themes/console/images/inbound.png\" alt=\"Inbound\" title=\"" +
_t("Inbound") + "\"></td>"); _t("Inbound") + "\"></td>");
else else
@ -249,10 +251,17 @@ class TunnelRenderer {
out.write("<td class=\"cells\" align=\"center\">" + DataHelper.formatDuration2(timeLeft) + "</td>\n"); out.write("<td class=\"cells\" align=\"center\">" + DataHelper.formatDuration2(timeLeft) + "</td>\n");
int count = info.getProcessedMessagesCount() * 1024 / 1000; int count = info.getProcessedMessagesCount() * 1024 / 1000;
out.write("<td class=\"cells\" align=\"center\">" + count + " KB</td>\n"); out.write("<td class=\"cells\" align=\"center\">" + count + " KB</td>\n");
for (int j = 0; j < info.getLength(); j++) { int length = info.getLength();
for (int j = 0; j < length; j++) {
Hash peer = info.getPeer(j); Hash peer = info.getPeer(j);
TunnelId id = (info.isInbound() ? info.getReceiveTunnelId(j) : info.getSendTunnelId(j)); TunnelId id = (isInbound ? info.getReceiveTunnelId(j) : info.getSendTunnelId(j));
if (_context.routerHash().equals(peer)) { if (_context.routerHash().equals(peer)) {
if (length < maxLength && length == 1 && isInbound) {
// pad before inbound zero hop
for (int k = 1; k < maxLength; k++) {
out.write("<td class=\"cells\" align=\"center\">&nbsp;</td>");
}
}
// Add empty content placeholders to force alignment. // Add empty content placeholders to force alignment.
out.write(" <td class=\"cells\" align=\"center\"><span class=\"tunnel_peer tunnel_local\" title=\"" + out.write(" <td class=\"cells\" align=\"center\"><span class=\"tunnel_peer tunnel_local\" title=\"" +
_t("Locally hosted tunnel") + "\">" + _t("Local") + "</span>&nbsp;<span class=\"tunnel_id\" title=\"" + _t("Locally hosted tunnel") + "\">" + _t("Local") + "</span>&nbsp;<span class=\"tunnel_id\" title=\"" +
@ -265,9 +274,11 @@ class TunnelRenderer {
(id == null ? "" : " " + id) + "</span><b class=\"tunnel_cap\" title=\"" + _t("Bandwidth tier") + "\">" + (id == null ? "" : " " + id) + "</span><b class=\"tunnel_cap\" title=\"" + _t("Bandwidth tier") + "\">" +
cap + "</b></span></td>"); cap + "</b></span></td>");
} }
if (info.getLength() < maxLength && (info.getLength() == 1 || j == info.getLength() - 2)) { if (length < maxLength && ((length == 1 && !isInbound) || j == length - 2)) {
for (int k = info.getLength(); k < maxLength; k++) // pad out outbound zero hop; non-zero-hop pads in middle
for (int k = length; k < maxLength; k++) {
out.write("<td class=\"cells\" align=\"center\">&nbsp;</td>"); out.write("<td class=\"cells\" align=\"center\">&nbsp;</td>");
}
} }
} }
out.write("</tr>\n"); out.write("</tr>\n");