From 4de0b73cd83a4949e820926d854c2dd30596b129 Mon Sep 17 00:00:00 2001
From: z3d <z3d@mail.i2p>
Date: Thu, 30 Jul 2009 23:10:48 +0000
Subject: [PATCH] Ongoing UI enhancements; peers.jsp gets some love.
---
.../org/klomp/snark/web/I2PSnarkServlet.java | 4 +-
.../i2p/router/web/ConfigClientsHelper.java | 6 +-
.../net/i2p/router/web/ConfigUIHelper.java | 2 +-
.../i2p/router/web/ConfigUpdateHelper.java | 4 +-
.../src/net/i2p/router/web/GraphHelper.java | 4 +-
apps/routerconsole/jsp/config.jsp | 38 ++--
apps/routerconsole/jsp/configstats.jsp | 18 +-
.../src/src/i2p/susi/webmail/WebMail.java | 6 +-
.../crypto/TransientSessionKeyManager.java | 4 +-
.../themes/console/light/console.css | 22 +++
router/java/src/net/i2p/router/JobQueue.java | 2 +-
.../src/net/i2p/router/PersistentKeyRing.java | 2 +-
router/java/src/net/i2p/router/Router.java | 2 +-
.../transport/FIFOBandwidthLimiter.java | 6 +-
.../router/transport/TransportManager.java | 2 +-
.../router/transport/ntcp/NTCPTransport.java | 56 +++---
.../router/transport/udp/UDPTransport.java | 184 +++++++++---------
17 files changed, 192 insertions(+), 170 deletions(-)
diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
index 21d1edc279..9e1bf8f077 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -711,7 +711,7 @@ public class I2PSnarkServlet extends HttpServlet {
out.write("<span class=\"snarkConfigTitle\">Configuration:</span><br />\n");
out.write("Data directory: <input type=\"text\" size=\"40\" name=\"dataDir\" value=\"" + dataDir + "\" ");
out.write("title=\"Directory to store torrents and data\" disabled=\"true\" /> <i>(Edit i2psnark.config and restart to change)</i><br />\n");
- out.write("Auto start: <input type=\"checkbox\" name=\"autoStart\" value=\"true\" "
+ out.write("Auto start: <input type=\"checkbox\" class=\"optbox\" name=\"autoStart\" value=\"true\" "
+ (autoStart ? "checked " : "")
+ "title=\"If true, automatically start torrents that are added\" />");
//Auto add: <input type="checkbox" name="autoAdd" value="true" title="If true, automatically add torrents that are found in the data directory" />
@@ -738,7 +738,7 @@ public class I2PSnarkServlet extends HttpServlet {
out.write("Up bandwidth limit: <input type=\"text\" name=\"upBW\" value=\""
+ _manager.util().getMaxUpBW() + "\" size=\"3\" maxlength=\"3\" /> KBps <i>(Half <a href=\"/config.jsp\" target=\"blank\">available bandwidth</a> recommended.)</i><br />\n");
- out.write("Use open trackers also: <input type=\"checkbox\" name=\"useOpenTrackers\" value=\"true\" "
+ out.write("Use open trackers also: <input type=\"checkbox\" class=\"optbox\" name=\"useOpenTrackers\" value=\"true\" "
+ (useOpenTrackers ? "checked " : "")
+ "title=\"If true, uses open trackers in addition\" /> ");
out.write("Announce URLs: <input type=\"text\" name=\"openTrackers\" value=\""
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java
index 02b31e8842..3cdcbfa19e 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java
@@ -14,7 +14,7 @@ public class ConfigClientsHelper extends HelperBase {
public String getForm1() {
StringBuilder buf = new StringBuilder(1024);
- buf.append("<table border=\"1\">\n");
+ buf.append("<table>\n");
buf.append("<tr><th>Client</th><th>Run at Startup?</th><th>Start Now</th><th>Class and arguments</th></tr>\n");
List clients = ClientAppConfig.getClientApps(_context);
@@ -30,7 +30,7 @@ public class ConfigClientsHelper extends HelperBase {
public String getForm2() {
StringBuilder buf = new StringBuilder(1024);
- buf.append("<table border=\"1\">\n");
+ buf.append("<table>\n");
buf.append("<tr><th>WebApp</th><th>Run at Startup?</th><th>Start Now</th><th>Description</th></tr>\n");
Properties props = RouterConsoleRunner.webAppProperties();
Set keys = new TreeSet(props.keySet());
@@ -56,7 +56,7 @@ public class ConfigClientsHelper extends HelperBase {
} else {
buf.append(name);
}
- buf.append("</td><td align=\"center\"><input type=\"checkbox\" name=\"").append(index).append(".enabled\" value=\"true\" ");
+ buf.append("</td><td align=\"center\"><input type=\"checkbox\" class=\"optbox\" name=\"").append(index).append(".enabled\" value=\"true\" ");
if (enabled) {
buf.append("checked=\"true\" ");
if (ro)
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
index 9bfd22077d..11830975ba 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
@@ -9,7 +9,7 @@ public class ConfigUIHelper extends HelperBase {
StringBuilder buf = new StringBuilder(512);
String current = _context.getProperty(CSSHelper.PROP_THEME_NAME, CSSHelper.DEFAULT_THEME);
for (String theme : themes) {
- buf.append("<input type=\"radio\" name=\"theme\" ");
+ buf.append("<input type=\"radio\" class=\"optbox\" name=\"theme\" ");
if (theme.equals(current))
buf.append("checked=\"true\" ");
buf.append("value=\"").append(theme).append("\"/>").append(theme).append("<br />\n");
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java
index d67f63bfad..5d03d90249 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java
@@ -42,10 +42,10 @@ public class ConfigUpdateHelper extends HelperBase {
public String getUpdateThroughProxy() {
String proxy = _context.getProperty(ConfigUpdateHandler.PROP_SHOULD_PROXY, ConfigUpdateHandler.DEFAULT_SHOULD_PROXY);
if (Boolean.valueOf(proxy).booleanValue())
- return "<input type=\"checkbox\" value=\"true\" name=\"updateThroughProxy\" checked=\"true\" >";
+ return "<input type=\"checkbox\" class=\"optbox\" value=\"true\" name=\"updateThroughProxy\" checked=\"true\" >";
else
- return "<input type=\"checkbox\" value=\"true\" name=\"updateThroughProxy\" >";
+ return "<input type=\"checkbox\" class=\"optbox\" value=\"true\" name=\"updateThroughProxy\" >";
}
private static final long PERIODS[] = new long[] { 12*60*60*1000l, 24*60*60*1000l, 48*60*60*1000l, -1l };
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java
index 2ab03ed581..037ca17af5 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java
@@ -109,8 +109,8 @@ public class GraphHelper extends HelperBase {
_out.write("<p />[<a href=\"configstats.jsp\">Select Stats to Graph</a>]<p />");
_out.write("<form action=\"graphs.jsp\" method=\"GET\">");
_out.write("Periods: <input size=\"3\" type=\"text\" name=\"periodCount\" value=\"" + _periodCount + "\" /><br />\n");
- _out.write("Plot averages: <input type=\"radio\" name=\"showEvents\" value=\"false\" " + (_showEvents ? "" : "checked=\"true\" ") + " /> ");
- _out.write("or plot events: <input type=\"radio\" name=\"showEvents\" value=\"true\" "+ (_showEvents ? "checked=\"true\" " : "") + " /><br />\n");
+ _out.write("Plot averages: <input type=\"radio\" class=\"optbox\" name=\"showEvents\" value=\"false\" " + (_showEvents ? "" : "checked=\"true\" ") + " /> ");
+ _out.write("or plot events: <input type=\"radio\" class=\"optbox\" name=\"showEvents\" value=\"true\" "+ (_showEvents ? "checked=\"true\" " : "") + " /><br />\n");
_out.write("Image sizes: width: <input size=\"4\" type=\"text\" name=\"width\" value=\"" + _width
+ "\" /> pixels, height: <input size=\"4\" type=\"text\" name=\"height\" value=\"" + _height
+ "\" /><br />\n");
diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp
index 1cf5da92c0..d19742e140 100644
--- a/apps/routerconsole/jsp/config.jsp
+++ b/apps/routerconsole/jsp/config.jsp
@@ -59,7 +59,7 @@
out.print("It improves your anonymity by creating cover traffic, and helps the network.<br />");
} else {
out.print("You have configured I2P to share<b> " + share + "KBps</b>. ");
- out.print("The higher the share bandwidth the more you improve your anonymity and help the network.<br />");
+ out.print("The higher the share bandwidth the more you improve your anonymity and help the network.<hr />");
}
%>
</p><p>
@@ -67,7 +67,7 @@
</p>
<!--
<b>Enable load testing: </b>
-<input type="checkbox" name="enableloadtesting" value="true" <jsp:getProperty name="nethelper" property="enableLoadTesting" /> />
+<input type="checkbox" class="optbox" name="enableloadtesting" value="true" <jsp:getProperty name="nethelper" property="enableLoadTesting" /> />
<p>If enabled, your router will periodically anonymously probe some of your peers
to see what sort of throughput they can handle. This improves your router's ability
to pick faster peers, but can cost substantial bandwidth. Relevant data from the
@@ -80,20 +80,20 @@
<b>The default settings will work for most people. There is <a href="#chelp">help below</a>.</b>
</p><p>
<b>UPnP Configuration:</b><br />
- <input type="checkbox" name="upnp" value="true" <jsp:getProperty name="nethelper" property="upnpChecked" /> />
+ <input type="checkbox" class="optbox" name="upnp" value="true" <jsp:getProperty name="nethelper" property="upnpChecked" /> />
Enable UPnP to open firewall ports - <a href="peers.jsp#upnp">UPnP status</a>
</p><p>
<b>IP Configuration:</b><br />
Externally reachable hostname or IP address:<br />
- <input type="radio" name="udpAutoIP" value="local,upnp,ssu" <%=nethelper.getUdpAutoIPChecked(3) %> />
+ <input type="radio" class="optbox" name="udpAutoIP" value="local,upnp,ssu" <%=nethelper.getUdpAutoIPChecked(3) %> />
Use all auto-detect methods<br />
- <input type="radio" name="udpAutoIP" value="local,ssu" <%=nethelper.getUdpAutoIPChecked(4) %> />
+ <input type="radio" class="optbox" name="udpAutoIP" value="local,ssu" <%=nethelper.getUdpAutoIPChecked(4) %> />
Disable UPnP IP address detection<br />
- <input type="radio" name="udpAutoIP" value="upnp,ssu" <%=nethelper.getUdpAutoIPChecked(5) %> />
+ <input type="radio" class="optbox" name="udpAutoIP" value="upnp,ssu" <%=nethelper.getUdpAutoIPChecked(5) %> />
Ignore local interface IP address<br />
- <input type="radio" name="udpAutoIP" value="ssu" <%=nethelper.getUdpAutoIPChecked(0) %> />
+ <input type="radio" class="optbox" name="udpAutoIP" value="ssu" <%=nethelper.getUdpAutoIPChecked(0) %> />
Use SSU IP address detection only<br />
- <input type="radio" name="udpAutoIP" value="fixed" <%=nethelper.getUdpAutoIPChecked(1) %> />
+ <input type="radio" class="optbox" name="udpAutoIP" value="fixed" <%=nethelper.getUdpAutoIPChecked(1) %> />
Specify hostname or IP:
<input name ="udpHost1" type="text" size="16" value="<jsp:getProperty name="nethelper" property="udphostname" />" />
<% String[] ips = nethelper.getAddresses();
@@ -110,14 +110,14 @@
}
%>
<br />
- <input type="radio" name="udpAutoIP" value="hidden" <%=nethelper.getUdpAutoIPChecked(2) %> />
+ <input type="radio" class="optbox" name="udpAutoIP" value="hidden" <%=nethelper.getUdpAutoIPChecked(2) %> />
Hidden mode - do not publish IP <i>(prevents participating traffic)</i><br />
</p><p>
<b>UDP Configuration:</b><br />
UDP port:
<input name ="udpPort" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="configuredUdpPort" />" /><br />
<!-- let's keep this simple...
-<input type="checkbox" name="requireIntroductions" value="true" <jsp:getProperty name="nethelper" property="requireIntroductionsChecked" /> />
+<input type="checkbox" class="optbox" name="requireIntroductions" value="true" <jsp:getProperty name="nethelper" property="requireIntroductionsChecked" /> />
Require SSU introductions
<i>(Enable if you cannot open your firewall)</i>
</p><p>
@@ -126,29 +126,29 @@
</p><p>
<b>TCP Configuration:</b><br />
Externally reachable hostname or IP address:<br />
- <input type="radio" name="ntcpAutoIP" value="true" <%=nethelper.getTcpAutoIPChecked(2) %> />
+ <input type="radio" class="optbox" name="ntcpAutoIP" value="true" <%=nethelper.getTcpAutoIPChecked(2) %> />
Use auto-detected IP address
<i>(currently <jsp:getProperty name="nethelper" property="udpIP" />)</i>
if we are not firewalled<br />
- <input type="radio" name="ntcpAutoIP" value="always" <%=nethelper.getTcpAutoIPChecked(3) %> />
+ <input type="radio" class="optbox" name="ntcpAutoIP" value="always" <%=nethelper.getTcpAutoIPChecked(3) %> />
Always use auto-detected IP address (Not firewalled)<br />
- <input type="radio" name="ntcpAutoIP" value="false" <%=nethelper.getTcpAutoIPChecked(1) %> />
+ <input type="radio" class="optbox" name="ntcpAutoIP" value="false" <%=nethelper.getTcpAutoIPChecked(1) %> />
Specify hostname or IP:
<input name ="ntcphost" type="text" size="16" value="<jsp:getProperty name="nethelper" property="ntcphostname" />" /><br />
- <input type="radio" name="ntcpAutoIP" value="false" <%=nethelper.getTcpAutoIPChecked(0) %> />
+ <input type="radio" class="optbox" name="ntcpAutoIP" value="false" <%=nethelper.getTcpAutoIPChecked(0) %> />
Disable inbound (Firewalled)<br />
- <input type="radio" name="ntcpAutoIP" value="disabled" <%=nethelper.getTcpAutoIPChecked(4) %> />
+ <input type="radio" class="optbox" name="ntcpAutoIP" value="disabled" <%=nethelper.getTcpAutoIPChecked(4) %> />
Completely disable <i>(select only if behind a firewall that throttles or blocks outbound TCP)</i><br />
</p><p>
Externally reachable TCP port:<br />
- <input type="radio" name="ntcpAutoPort" value="2" <%=nethelper.getTcpAutoPortChecked(2) %> />
+ <input type="radio" class="optbox" name="ntcpAutoPort" value="2" <%=nethelper.getTcpAutoPortChecked(2) %> />
Use the same port configured for UDP
<i>(currently <jsp:getProperty name="nethelper" property="udpPort" />)</i><br />
- <input type="radio" name="ntcpAutoPort" value="1" <%=nethelper.getTcpAutoPortChecked(1) %> />
+ <input type="radio" class="optbox" name="ntcpAutoPort" value="1" <%=nethelper.getTcpAutoPortChecked(1) %> />
Specify Port:
<input name ="ntcpport" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="ntcpport" />" /><br />
</p><p><b>Note: Changing these settings will restart your router.</b>
- </p>
+ </p><hr>
<input type="submit" name="save" value="Save changes" /> <input type="reset" value="Cancel" />
</div>
<h3><a name="chelp">Configuration Help:</a></h3>
@@ -248,7 +248,7 @@
<hr />
<!--
<b>Dynamic Router Keys: </b>
- <input type="checkbox" name="dynamicKeys" value="true" <jsp:getProperty name="nethelper" property="dynamicKeysChecked" /> /><br />
+ <input type="checkbox" class="optbox" name="dynamicKeys" value="true" <jsp:getProperty name="nethelper" property="dynamicKeysChecked" /> /><br />
<p>
This setting causes your router identity to be regenerated every time your IP address
changes. If you have a dynamic IP this option can speed up your reintegration into
diff --git a/apps/routerconsole/jsp/configstats.jsp b/apps/routerconsole/jsp/configstats.jsp
index 9e59efe605..9cab909afc 100644
--- a/apps/routerconsole/jsp/configstats.jsp
+++ b/apps/routerconsole/jsp/configstats.jsp
@@ -73,7 +73,7 @@ function toggleAll(category)
<input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigStatsHandler.nonce")%>" />
<h3>Configure I2P Stat Collection</h3>
Enable full stats?
- <input type="checkbox" name="isFull" value="true" <%
+ <input type="checkbox" class="optbox" name="isFull" value="true" <%
if (statshelper.getIsFull()) { %>checked="true" <% } %>/>
(change requires restart to take effect)<br />
Stat file: <input type="text" name="filename" value="<%=statshelper.getFilename()%>" /><br />
@@ -81,24 +81,24 @@ function toggleAll(category)
<table>
<% while (statshelper.hasMoreStats()) {
while (statshelper.groupRequired()) { %>
- <tr><td valign="top" align="left" colspan="3">
+ <tr><td align="left" colspan="3">
<b><%=statshelper.getCurrentGroupName()%></b>
(<a href="javascript: void(null);" onclick="toggleAll('<%=statshelper.getCurrentGroupName()%>')">toggle all</a>)
- </td></tr><tr><td>Log</td><td>Graph</td><td></td></tr><%
+ </td></tr><tr><td><b>Log</b></td><td><b>Graph</b></td><td></td></tr><%
} // end iterating over required groups for the current stat %>
- <tr><td valign="top" align="left">
+ <tr><td align="left">
<a name="<%=statshelper.getCurrentStatName()%>"></a>
- <input id="<%=statshelper.getCurrentGroupName()%>" type="checkbox" name="statList" value="<%=statshelper.getCurrentStatName()%>" <%
+ <input id="<%=statshelper.getCurrentGroupName()%>" type="checkbox" class="optbox" name="statList" value="<%=statshelper.getCurrentStatName()%>" <%
if (statshelper.getCurrentIsLogged()) { %>checked="true" <% } %>/></td>
- <td valign="top" align="left">
+ <td align="left">
<% if (statshelper.getCurrentCanBeGraphed()) { %>
- <input id="<%=statshelper.getCurrentGroupName()%>" type="checkbox" name="graphList" value="<%=statshelper.getCurrentGraphName()%>" <%
+ <input id="<%=statshelper.getCurrentGroupName()%>" type="checkbox" class="optbox" name="graphList" value="<%=statshelper.getCurrentGraphName()%>" <%
if (statshelper.getCurrentIsGraphed()) { %>checked="true" <% } %>/><% } %></td>
- <td valign="top" align="left"><b><%=statshelper.getCurrentStatName()%>:</b><br />
+ <td align="left"><b><%=statshelper.getCurrentStatName()%>:</b><br />
<%=statshelper.getCurrentStatDescription()%></td></tr><%
} // end iterating over all stats %>
<tr><td colspan="3"><hr /></td></tr>
- <tr><td><input type="checkbox" name="explicitFilter" /></td>
+ <tr><td><input type="checkbox" class="optbox" name="explicitFilter" /></td>
<td colspan="2">Advanced filter:
<input type="text" name="explicitFilterValue" value="<%=statshelper.getExplicitFilter()%>" size="40" /></td></tr>
<tr><td colspan="3"><hr /></td></tr>
diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
index 12d48e7344..e871dfe817 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
@@ -1545,7 +1545,7 @@ public class WebMail extends HttpServlet
"<tr><td align=\"right\">Cc:</td><td align=\"left\"><input type=\"text\" size=\"80\" name=\"" + NEW_CC + "\" value=\"" + cc + "\"></td></tr>\n" +
"<tr><td align=\"right\">Bcc:</td><td align=\"left\"><input type=\"text\" size=\"80\" name=\"" + NEW_BCC + "\" value=\"" + bcc + "\"></td></tr>\n" +
"<tr><td align=\"right\">Subject:</td><td align=\"left\"><input type=\"text\" size=\"80\" name=\"" + NEW_SUBJECT + "\" value=\"" + subject + "\"></td></tr>\n" +
- "<tr><td> </td><td align=\"left\"><input type=\"checkbox\" name=\"" + NEW_BCC_TO_SELF + "\" value=\"1\"" + ( bccToSelf.compareToIgnoreCase( "false" ) != 0 ? "checked" : "" )+ ">Bcc to self</td></tr>\n" +
+ "<tr><td> </td><td align=\"left\"><input type=\"checkbox\" class=\"optbox\" name=\"" + NEW_BCC_TO_SELF + "\" value=\"1\"" + ( bccToSelf.compareToIgnoreCase( "false" ) != 0 ? "checked" : "" )+ ">Bcc to self</td></tr>\n" +
"<tr><td colspan=\"2\" align=\"center\"><textarea cols=\"" + Config.getProperty( CONFIG_COMPOSER_COLS, 80 )+ "\" rows=\"" + Config.getProperty( CONFIG_COMPOSER_ROWS, 10 )+ "\" name=\"" + NEW_TEXT + "\">" + text + "</textarea>" +
"<tr><td colspan=\"2\" align=\"center\"><hr></td></tr>\n" +
"<tr><td align=\"right\">New Attachment:</td><td align=\"left\"><input type=\"file\" size=\"50%\" name=\"" + NEW_FILENAME + "\" value=\"\"><input type=\"submit\" name=\"" + NEW_UPLOAD + "\" value=\"Upload File\"></td></tr>" );
@@ -1558,7 +1558,7 @@ public class WebMail extends HttpServlet
wroteHeader = true;
}
Attachment attachment = (Attachment)it.next();
- out.println( "<tr><td colspan=\"2\" align=\"center\"><input type=\"checkbox\" name=\"check" + attachment.hashCode() + "\" value=\"1\"> " + attachment.getFileName() + "</td></tr>");
+ out.println( "<tr><td colspan=\"2\" align=\"center\"><input type=\"checkbox\" class=\"optbox\" name=\"check" + attachment.hashCode() + "\" value=\"1\"> " + attachment.getFileName() + "</td></tr>");
}
}
out.println( "</table>" );
@@ -1632,7 +1632,7 @@ public class WebMail extends HttpServlet
", markAll=" + sessionObject.markAll +
", invert=" + sessionObject.invert +
", clear=" + sessionObject.clear );
- out.println( "<tr class=\"list" + bg + "\"><td><input type=\"checkbox\" name=\"check" + i + "\" value=\"1\"" +
+ out.println( "<tr class=\"list" + bg + "\"><td><input type=\"checkbox\" class=\"optbox\" name=\"check" + i + "\" value=\"1\"" +
( idChecked ? "checked" : "" ) + ">" + ( RELEASE ? "" : "" + i ) + "</td><td>" + link + mail.shortSender + "</a></td><td> </td><td>" + link + mail.shortSubject + "</a></td><td> </td><td>" + mail.formattedDate + "</a></td><td> </td><td>" + mail.size + " Bytes</a></td></tr>" );
bg = 1 - bg;
i++;
diff --git a/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java b/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java
index f9661240b9..15c1491685 100644
--- a/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java
+++ b/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java
@@ -502,7 +502,7 @@ public class TransientSessionKeyManager extends SessionKeyManager {
public String renderStatusHTML() {
StringBuilder buf = new StringBuilder(1024);
buf.append("<h2>Inbound sessions</h2>");
- buf.append("<table border=\"1\">");
+ buf.append("<table>");
Set<TagSet> inbound = getInboundTagSets();
Map<SessionKey, Set<TagSet>> inboundSets = new HashMap(inbound.size());
for (Iterator<TagSet> iter = inbound.iterator(); iter.hasNext();) {
@@ -528,7 +528,7 @@ public class TransientSessionKeyManager extends SessionKeyManager {
buf.append("<h2><b>Outbound sessions</b></h2>");
- buf.append("<table border=\"1\">");
+ buf.append("<table>");
Set<OutboundSession> outbound = getOutboundSessions();
for (Iterator<OutboundSession> iter = outbound.iterator(); iter.hasNext();) {
OutboundSession sess = iter.next();
diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css
index f7d457c2a2..e2f407e419 100644
--- a/installer/resources/themes/console/light/console.css
+++ b/installer/resources/themes/console/light/console.css
@@ -641,4 +641,26 @@ form {}
font-size: 8pt;
font-style: italic;
font-weight: bold;
+}
+
+.optbox {
+ min-width: 16px !important;
+ max-width: 16px !important;
+ width: 16px !important;
+ min-height: 16px;
+ max-height: 16px;
+ height: 16px;
+ opacity: 1.0;
+ border: 0;
+}
+
+.optbox:hover {
+ min-width: 16px !important;
+ max-width: 16px !important;
+ width: 16px !important;
+ min-height: 16px;
+ max-height: 16px;
+ height: 16px;
+ opacity: 1.0;
+ border: 0;
}
\ No newline at end of file
diff --git a/router/java/src/net/i2p/router/JobQueue.java b/router/java/src/net/i2p/router/JobQueue.java
index 557a47b918..6adcc4b3ec 100644
--- a/router/java/src/net/i2p/router/JobQueue.java
+++ b/router/java/src/net/i2p/router/JobQueue.java
@@ -667,7 +667,7 @@ public class JobQueue {
/** render the HTML for the job stats */
private void getJobStats(StringBuilder buf) {
- buf.append("<table border=\"1\">\n");
+ buf.append("<table>\n");
buf.append("<tr><th>Job</th><th>Runs</th>");
buf.append("<th>Time</th><th><i>Avg</i></th><th><i>Max</i></th><th><i>Min</i></th>");
buf.append("<th>Pending</th><th><i>Avg</i></th><th><i>Max</i></th><th><i>Min</i></th></tr>\n");
diff --git a/router/java/src/net/i2p/router/PersistentKeyRing.java b/router/java/src/net/i2p/router/PersistentKeyRing.java
index 9b7ffe0f38..f9b24ce9f9 100644
--- a/router/java/src/net/i2p/router/PersistentKeyRing.java
+++ b/router/java/src/net/i2p/router/PersistentKeyRing.java
@@ -67,7 +67,7 @@ public class PersistentKeyRing extends KeyRing {
@Override
public void renderStatusHTML(Writer out) throws IOException {
StringBuilder buf = new StringBuilder(1024);
- buf.append("\n<table border=\"1\"><tr><th align=\"left\">Destination Hash<th align=\"left\">Name or Dest.<th align=\"left\">Session Key</tr>");
+ buf.append("\n<table><tr><th align=\"left\">Destination Hash<th align=\"left\">Name or Dest.<th align=\"left\">Session Key</tr>");
for (Entry<Hash, SessionKey> e : entrySet()) {
buf.append("\n<tr><td>");
Hash h = e.getKey();
diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java
index a79e2242a2..5f7512958e 100644
--- a/router/java/src/net/i2p/router/Router.java
+++ b/router/java/src/net/i2p/router/Router.java
@@ -759,7 +759,7 @@ public class Router {
buf.setLength(0);
buf.append("\n<hr /><a name=\"logs\"> </a>\n");
List msgs = _context.logManager().getBuffer().getMostRecentMessages();
- buf.append("\n<h2>Most recent console messages:</h2><table border=\"1\">\n");
+ buf.append("\n<h2>Most recent console messages:</h2><table>\n");
for (Iterator iter = msgs.iterator(); iter.hasNext(); ) {
String msg = (String)iter.next();
buf.append("<tr><td align=\"left\"><pre>");
diff --git a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java
index a4ded13edd..11d3641916 100644
--- a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java
+++ b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java
@@ -619,8 +619,8 @@ public class FIFOBandwidthLimiter {
public void renderStatusHTML(Writer out) throws IOException {
long now = now();
StringBuilder buf = new StringBuilder(4096);
- buf.append("<p><b id=\"bwlim\">Limiter Status:</b><br />").append(getStatus().toString()).append("</p>\n");
- buf.append("<p><b>Pending bandwidth requests:</b><ul>");
+ buf.append("<h3><b id=\"bwlim\">Limiter Status:</b></h3>").append(getStatus().toString()).append("\n");
+ buf.append("<h3>Pending bandwidth requests:</h3><ul>");
buf.append("<li>Inbound requests: <ol>");
synchronized (_pendingInboundRequests) {
for (int i = 0; i < _pendingInboundRequests.size(); i++) {
@@ -643,7 +643,7 @@ public class FIFOBandwidthLimiter {
buf.append("ms ago</li>\n");
}
}
- buf.append("</ol></li></ul></p>\n");
+ buf.append("</ol></li></ul></p><hr>\n");
out.write(buf.toString());
out.flush();
}
diff --git a/router/java/src/net/i2p/router/transport/TransportManager.java b/router/java/src/net/i2p/router/transport/TransportManager.java
index f9d495cea1..98158054fa 100644
--- a/router/java/src/net/i2p/router/transport/TransportManager.java
+++ b/router/java/src/net/i2p/router/transport/TransportManager.java
@@ -492,7 +492,7 @@ public class TransportManager implements TransportEventListener {
t.renderStatusHTML(out, urlBase, sortFlags);
}
StringBuilder buf = new StringBuilder(4*1024);
- buf.append("<p><b>Router Transport Addresses:</b><br /><pre>\n");
+ buf.append("<h3>Router Transport Addresses:</h3><pre>\n");
for (int i = 0; i < _transports.size(); i++) {
Transport t = (Transport)_transports.get(i);
if (t.getCurrentAddress() != null)
diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java
index 910db5e780..4dbb588567 100644
--- a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java
+++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java
@@ -639,10 +639,10 @@ public class NTCPTransport extends TransportImpl {
long totalRecv = 0;
StringBuilder buf = new StringBuilder(512);
- buf.append("<p><b id=\"ntcpcon\">NTCP connections: ").append(peers.size());
- buf.append(" limit: ").append(getMaxConnections());
- buf.append(" timeout: ").append(DataHelper.formatDuration(_pumper.getIdleTimeout()));
- buf.append("</b><br />\n");
+ buf.append("<p><b id=\"ntcpcon\"><h3>NTCP connections: ").append(peers.size());
+ buf.append(". Limit: ").append(getMaxConnections());
+ buf.append(". Timeout: ").append(DataHelper.formatDuration(_pumper.getIdleTimeout()));
+ buf.append(".</b></h3>\n");
buf.append("<table>\n");
buf.append("<tr><th><a href=\"#def.peer\">Peer</a></th>");
buf.append("<th>Dir</th>");
@@ -650,8 +650,8 @@ public class NTCPTransport extends TransportImpl {
buf.append("<th align=\"right\"><a href=\"#def.rate\">In/Out</a></th>");
buf.append("<th align=\"right\"><a href=\"#def.up\">Up</a></th>");
buf.append("<th align=\"right\"><a href=\"#def.skew\">Skew</a></th>");
- buf.append("<th align=\"right\"><a href=\"#def.send\">Send</a></th>");
- buf.append("<th align=\"right\"><a href=\"#def.recv\">Recv</a></th>");
+ buf.append("<th align=\"right\"><a href=\"#def.send\">TX</a></th>");
+ buf.append("<th align=\"right\"><a href=\"#def.recv\">RX</a></th>");
buf.append("<th>Out queue</th>");
buf.append("<th>Backlogged?</th>");
buf.append("<th>Reading?</th>");
@@ -665,15 +665,15 @@ public class NTCPTransport extends TransportImpl {
//byte[] ip = getIP(con.getRemotePeer().calculateHash());
//if (ip != null)
// buf.append(' ').append(_context.blocklist().toStr(ip));
- buf.append("</td><td align=\"center\"><code>");
+ buf.append("</td><td align=\"center\">");
if (con.isInbound())
- buf.append("in");
+ buf.append("<img src=\"/themes/console/images/inbound.png\" alt=\"Inbound\" title=\"Inbound\"/>");
else
- buf.append("out");
- buf.append("</code></td><td align=\"right\"><code>");
+ buf.append("<img src=\"/themes/console/images/outbound.png\" alt=\"Outbound\" title=\"Outbound\"/>");
+ buf.append("</td><td align=\"right\">");
buf.append(con.getTimeSinceReceive()/1000);
buf.append("s/").append(con.getTimeSinceSend()/1000);
- buf.append("s</code></td><td align=\"right\"><code>");
+ buf.append("s</td><td align=\"right\">");
if (con.getTimeSinceReceive() < 10*1000) {
buf.append(formatRate(con.getRecvRate()/1024));
bpsRecv += con.getRecvRate();
@@ -687,43 +687,43 @@ public class NTCPTransport extends TransportImpl {
} else {
buf.append(formatRate(0));
}
- buf.append("KBps");
- buf.append("</code></td><td align=\"right\"><code>").append(DataHelper.formatDuration(con.getUptime()));
+ buf.append("K/s");
+ buf.append("</td><td align=\"right\">").append(DataHelper.formatDuration(con.getUptime()));
totalUptime += con.getUptime();
offsetTotal = offsetTotal + con.getClockSkew();
- buf.append("</code></td><td align=\"right\"><code>").append(con.getClockSkew());
- buf.append("s</code></td><td align=\"right\"><code>").append(con.getMessagesSent());
+ buf.append("</td><td align=\"right\">").append(con.getClockSkew());
+ buf.append("s</td><td align=\"right\">").append(con.getMessagesSent());
totalSend += con.getMessagesSent();
- buf.append("</code></td><td align=\"right\"><code>").append(con.getMessagesReceived());
+ buf.append("</td><td align=\"right\">").append(con.getMessagesReceived());
totalRecv += con.getMessagesReceived();
long outQueue = con.getOutboundQueueSize();
if (outQueue <= 0) {
- buf.append("</code></td><td align=\"right\"><code>No messages");
+ buf.append("</td><td align=\"right\">No messages");
} else {
- buf.append("</code></td><td align=\"right\"><code>").append(outQueue).append(" message");
+ buf.append("</td><td align=\"right\">").append(outQueue).append(" message");
if (outQueue > 1)
buf.append("s");
}
- buf.append("</code></td><td align=\"center\"><code>").append(con.getConsecutiveBacklog() > 0 ? "true" : "false");
+ buf.append("</td><td align=\"center\">").append(con.getConsecutiveBacklog() > 0 ? "true" : "false");
long readTime = con.getReadTime();
if (readTime <= 0) {
- buf.append("</code></td><td align=\"center\"><code>No");
+ buf.append("</td><td align=\"center\">No");
} else {
- buf.append("</code></td><td><code>For ").append(DataHelper.formatDuration(readTime));
+ buf.append("</td><td>For ").append(DataHelper.formatDuration(readTime));
}
- buf.append("</code></td></tr>\n");
+ buf.append("</td></tr>\n");
out.write(buf.toString());
buf.setLength(0);
}
if (peers.size() > 0) {
buf.append("<tr><td colspan=\"11\"><hr /></td></tr>\n");
- buf.append("<tr><td>").append(peers.size()).append(" peers</td><td> </td><td> ");
- buf.append("</td><td align=\"right\">").append(formatRate(bpsRecv/1024)).append("/").append(formatRate(bpsSend/1024)).append("KBps");
- buf.append("</td><td align=\"right\">").append(DataHelper.formatDuration(totalUptime/peers.size()));
- buf.append("</td><td align=\"right\">").append(peers.size() > 0 ? DataHelper.formatDuration(offsetTotal*1000/peers.size()) : "0ms");
- buf.append("</td><td align=\"right\">").append(totalSend).append("</td><td align=\"right\">").append(totalRecv);
- buf.append("</td><td> </td><td> </td><td> ");
+ buf.append("<tr><td align=\"center\"><b>").append(peers.size()).append(" peers</b></td><td> </td><td> ");
+ buf.append("</td><td align=\"right\"><b>").append(formatRate(bpsRecv/1024)).append("/").append(formatRate(bpsSend/1024)).append("K/s</b>");
+ buf.append("</td><td align=\"right\"><b>").append(DataHelper.formatDuration(totalUptime/peers.size()));
+ buf.append("</b></td><td align=\"right\"><b>").append(peers.size() > 0 ? DataHelper.formatDuration(offsetTotal*1000/peers.size()) : "0ms");
+ buf.append("</b></td><td align=\"right\"><b>").append(totalSend).append("</b></td><td align=\"right\"><b>").append(totalRecv);
+ buf.append("</b></td><td> </td><td> </td><td> ");
buf.append("</td></tr>\n");
}
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
index eae5b9c119..d4b4a763be 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
@@ -1763,51 +1763,51 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
int numPeers = 0;
StringBuilder buf = new StringBuilder(512);
- buf.append("<p><b id=\"udpcon\">UDP connections: ").append(peers.size());
- buf.append(" limit: ").append(getMaxConnections());
- buf.append(" timeout: ").append(DataHelper.formatDuration(_expireTimeout));
- buf.append("</b><br />\n");
+ buf.append("<p><b id=\"udpcon\"><h3>UDP connections: ").append(peers.size());
+ buf.append(". Limit: ").append(getMaxConnections());
+ buf.append(". Timeout: ").append(DataHelper.formatDuration(_expireTimeout));
+ buf.append(".</b></h3>\n");
buf.append("<table>\n");
- buf.append("<tr><th><a href=\"#def.peer\">Peer</a>");
+ buf.append("<tr><th class=\"smallhead\" nowrap><a href=\"#def.peer\">Peer</a>");
if (sortFlags != FLAG_ALPHA)
buf.append(" <a href=\"").append(urlBase).append("?sort=0\">V</a> ");
- buf.append("</th><th><a href=\"#def.dir\">Dir/Intro</a></th><th><a href=\"#def.idle\">Idle</a>");
+ buf.append("</th><th class=\"smallhead\" nowrap><a href=\"#def.dir\">Dir/Intro</a></th><th class=\"smallhead\" nowrap><a href=\"#def.idle\">Idle</a><br>");
appendSortLinks(buf, urlBase, sortFlags, "Sort by idle inbound", FLAG_IDLE_IN);
buf.append("/");
appendSortLinks(buf, urlBase, sortFlags, "Sort by idle outbound", FLAG_IDLE_OUT);
buf.append("</th>");
- buf.append("<th><a href=\"#def.rate\">In/Out</a>");
+ buf.append("<th class=\"smallhead\" nowrap><a href=\"#def.rate\">In/Out</a><br>");
appendSortLinks(buf, urlBase, sortFlags, "Sort by inbound rate", FLAG_RATE_IN);
buf.append("/");
appendSortLinks(buf, urlBase, sortFlags, "Sort by outbound rate", FLAG_RATE_OUT);
buf.append("</th>\n");
- buf.append("<th><a href=\"#def.up\">Up</a>");
+ buf.append("<th class=\"smallhead\" nowrap><a href=\"#def.up\">Up</a><br>");
appendSortLinks(buf, urlBase, sortFlags, "Sort by connection uptime", FLAG_UPTIME);
- buf.append("</th><th><a href=\"#def.skew\">skew</a>");
+ buf.append("</th><th class=\"smallhead\" nowrap><a href=\"#def.skew\">Skew</a><br>");
appendSortLinks(buf, urlBase, sortFlags, "Sort by clock skew", FLAG_SKEW);
buf.append("</th>\n");
- buf.append("<th><a href=\"#def.cwnd\">Cwnd</a>");
+ buf.append("<th class=\"smallhead\" nowrap><a href=\"#def.cwnd\">Cwnd</a><br>");
appendSortLinks(buf, urlBase, sortFlags, "Sort by congestion window", FLAG_CWND);
- buf.append("</th><th><a href=\"#def.ssthresh\">Ssthresh</a>");
+ buf.append("</th><th class=\"smallhead\" nowrap><a href=\"#def.ssthresh\">Sst</a><br>");
appendSortLinks(buf, urlBase, sortFlags, "Sort by slow start threshold", FLAG_SSTHRESH);
buf.append("</th>\n");
- buf.append("<th><a href=\"#def.rtt\">Rtt</a>");
+ buf.append("<th class=\"smallhead\" nowrap><a href=\"#def.rtt\">Rtt</a><br>");
appendSortLinks(buf, urlBase, sortFlags, "Sort by round trip time", FLAG_RTT);
- buf.append("</th><th><a href=\"#def.dev\">Dev</a>");
+ buf.append("</th><th class=\"smallhead\" nowrap><a href=\"#def.dev\">Dev</a><br>");
appendSortLinks(buf, urlBase, sortFlags, "Sort by round trip time deviation", FLAG_DEV);
- buf.append("</th><th><a href=\"#def.rto\">Rto</a>");
+ buf.append("</th><th class=\"smallhead\" nowrap><a href=\"#def.rto\">Rto</a><br>");
appendSortLinks(buf, urlBase, sortFlags, "Sort by retransmission timeout", FLAG_RTO);
buf.append("</th>\n");
- buf.append("<th><a href=\"#def.mtu\">Mtu</a>");
+ buf.append("<th class=\"smallhead\" nowrap><a href=\"#def.mtu\">Mtu</a><br>");
appendSortLinks(buf, urlBase, sortFlags, "Sort by maximum transmit unit", FLAG_MTU);
- buf.append("</th><th><a href=\"#def.send\">Send</a>");
+ buf.append("</th><th class=\"smallhead\" nowrap><a href=\"#def.send\">TX</a><br>");
appendSortLinks(buf, urlBase, sortFlags, "Sort by packets sent", FLAG_SEND);
- buf.append("</th><th><a href=\"#def.recv\">Recv</a>");
+ buf.append("</th><th class=\"smallhead\" nowrap><a href=\"#def.recv\">RX</a><br>");
appendSortLinks(buf, urlBase, sortFlags, "Sort by packets received", FLAG_RECV);
buf.append("</th>\n");
- buf.append("<th><a href=\"#def.resent\">Resent</a>");
+ buf.append("<th class=\"smallhead\" nowrap><a href=\"#def.resent\">ReTX</a><br>");
appendSortLinks(buf, urlBase, sortFlags, "Sort by packets retransmitted", FLAG_RESEND);
- buf.append("</th><th><a href=\"#def.dupRecv\">DupRecv</a>");
+ buf.append("</th><th class=\"smallhead\" nowrap><a href=\"#def.dupRecv\">DupRX</a><br>");
appendSortLinks(buf, urlBase, sortFlags, "Sort by packets received more than once", FLAG_DUP);
buf.append("</th>\n");
buf.append("</tr>\n");
@@ -1824,11 +1824,11 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
//byte ip[] = peer.getRemoteIP();
//if (ip != null)
// buf.append(' ').append(_context.blocklist().toStr(ip));
- buf.append("</td><td><code>");
+ buf.append("</td><td nowrap>");
if (peer.isInbound())
- buf.append("in ");
+ buf.append("<img src=\"/themes/console/images/inbound.png\" alt=\"Inbound\" title=\"Inbound\"/> ");
else
- buf.append("out ");
+ buf.append("<img src=\"/themes/console/images/outbound.png\" alt=\"Outbound\" title=\"Outbound\"/> ");
if (peer.getWeRelayToThemAs() > 0)
buf.append("^");
else
@@ -1839,107 +1839,107 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
boolean appended = false;
if (_activeThrottle.isChoked(peer.getRemotePeer())) {
if (!appended) buf.append("<br />");
- buf.append(" [choked]");
+ buf.append(" <i>Choked</i>");
appended = true;
}
if (peer.getConsecutiveFailedSends() > 0) {
if (!appended) buf.append("<br />");
- buf.append(" [").append(peer.getConsecutiveFailedSends()).append(" failures]");
+ buf.append(" <i>").append(peer.getConsecutiveFailedSends()).append(" fail(s)</i>");
appended = true;
}
if (_context.shitlist().isShitlisted(peer.getRemotePeer(), STYLE)) {
if (!appended) buf.append("<br />");
- buf.append(" [shitlisted]");
+ buf.append(" <i>Shitlist</i>");
appended = true;
}
//byte[] ip = getIP(peer.getRemotePeer());
//if (ip != null)
// buf.append(' ').append(_context.blocklist().toStr(ip));
- buf.append("</code></td>");
+ buf.append("</td>");
long idleIn = (now-peer.getLastReceiveTime())/1000;
long idleOut = (now-peer.getLastSendTime())/1000;
if (idleIn < 0) idleIn = 0;
if (idleOut < 0) idleOut = 0;
- buf.append("<td align=\"right\" ><code>");
+ buf.append("<td align=\"right\" >");
buf.append(idleIn);
buf.append("s/");
buf.append(idleOut);
- buf.append("s</code></td>");
+ buf.append("s</td>");
int recvBps = (idleIn > 2 ? 0 : peer.getReceiveBps());
int sendBps = (idleOut > 2 ? 0 : peer.getSendBps());
- buf.append("<td align=\"right\" ><code>");
+ buf.append("<td align=\"right\" nowrap>");
buf.append(formatKBps(recvBps));
buf.append("/");
buf.append(formatKBps(sendBps));
- buf.append("KBps ");
+ buf.append("K/s ");
//buf.append(formatKBps(peer.getReceiveACKBps()));
- //buf.append("KBps/");
+ //buf.append("K/s/");
//buf.append(formatKBps(peer.getSendACKBps()));
- //buf.append("KBps ");
- buf.append("</code></td>");
+ //buf.append("K/s ");
+ buf.append("</td>");
long uptime = now - peer.getKeyEstablishedTime();
- buf.append("<td align=\"right\" ><code>");
+ buf.append("<td align=\"right\" >");
buf.append(DataHelper.formatDuration(uptime));
- buf.append("</code></td>");
+ buf.append("</td>");
- buf.append("<td align=\"right\" ><code>");
+ buf.append("<td align=\"right\" >");
buf.append(peer.getClockSkew());
- buf.append("s</code></td>");
+ buf.append("s</td>");
offsetTotal = offsetTotal + peer.getClockSkew();
long sendWindow = peer.getSendWindowBytes();
- buf.append("<td align=\"right\" ><code>");
+ buf.append("<td align=\"right\" >");
buf.append(sendWindow/1024);
buf.append("K");
buf.append("/").append(peer.getConcurrentSends());
buf.append("/").append(peer.getConcurrentSendWindow());
buf.append("/").append(peer.getConsecutiveSendRejections());
- buf.append("</code></td>");
+ buf.append("</td>");
- buf.append("<td align=\"right\" ><code>");
+ buf.append("<td align=\"right\" >");
buf.append(peer.getSlowStartThreshold()/1024);
- buf.append("K</code></td>");
+ buf.append("K</td>");
int rtt = peer.getRTT();
int rto = peer.getRTO();
- buf.append("<td align=\"right\" ><code>");
+ buf.append("<td align=\"right\" >");
buf.append(rtt);
- buf.append("</code></td>");
+ buf.append("</td>");
- buf.append("<td align=\"right\" ><code>");
+ buf.append("<td align=\"right\" >");
buf.append(peer.getRTTDeviation());
- buf.append("</code></td>");
+ buf.append("</td>");
- buf.append("<td align=\"right\" ><code>");
+ buf.append("<td align=\"right\" >");
buf.append(rto);
- buf.append("</code></td>");
+ buf.append("</td>");
- buf.append("<td align=\"right\" ><code>");
+ buf.append("<td align=\"right\" >");
buf.append(peer.getMTU()).append("/").append(peer.getReceiveMTU());
//.append('/');
//buf.append(peer.getMTUIncreases()).append('/');
//buf.append(peer.getMTUDecreases());
- buf.append("</code></td>");
+ buf.append("</td>");
long sent = peer.getPacketsTransmitted();
long recv = peer.getPacketsReceived();
- buf.append("<td align=\"right\" ><code>");
+ buf.append("<td align=\"right\" >");
buf.append(sent);
- buf.append("</code></td>");
+ buf.append("</td>");
- buf.append("<td align=\"right\" ><code>");
+ buf.append("<td align=\"right\" >");
buf.append(recv);
- buf.append("</code></td>");
+ buf.append("</td>");
//double sent = (double)peer.getPacketsPeriodTransmitted();
//double sendLostPct = 0;
@@ -1949,16 +1949,16 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
long resent = peer.getPacketsRetransmitted();
long dupRecv = peer.getPacketsReceivedDuplicate();
- buf.append("<td align=\"right\" ><code>");
+ buf.append("<td align=\"right\" >");
//buf.append(formatPct(sendLostPct));
buf.append(resent); // + "/" + peer.getPacketsPeriodRetransmitted() + "/" + sent);
//buf.append(peer.getPacketRetransmissionRate());
- buf.append("</code></td>");
+ buf.append("</td>");
double recvDupPct = (double)peer.getPacketsReceivedDuplicate()/(double)peer.getPacketsReceived();
- buf.append("<td align=\"right\" ><code>");
+ buf.append("<td align=\"right\" >");
buf.append(dupRecv); //formatPct(recvDupPct));
- buf.append("</code></td>");
+ buf.append("</td>");
buf.append("</tr>\n");
out.write(buf.toString());
@@ -1982,22 +1982,22 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
buf.append("<tr><td colspan=\"16\"><hr /></td></tr>\n");
buf.append(" <tr><td colspan=\"3\"><b>Total</b></td>");
- buf.append(" <td align=\"right\">");
+ buf.append(" <td align=\"right\" nowrap><b>");
buf.append(formatKBps(bpsIn)).append("/").append(formatKBps(bpsOut));
- buf.append("KBps</td>");
- buf.append(" <td align=\"right\">").append(numPeers > 0 ? DataHelper.formatDuration(uptimeMsTotal/numPeers) : "0s");
- buf.append("</td><td align=\"right\">").append(numPeers > 0 ? DataHelper.formatDuration(offsetTotal*1000/numPeers) : "0ms").append("</td>\n");
- buf.append(" <td align=\"right\">");
+ buf.append("K/s</b></td>");
+ buf.append(" <td align=\"right\"><b>").append(numPeers > 0 ? DataHelper.formatDuration(uptimeMsTotal/numPeers) : "0s");
+ buf.append("</b></td><td align=\"right\"><b>").append(numPeers > 0 ? DataHelper.formatDuration(offsetTotal*1000/numPeers) : "0ms").append("</b></td>\n");
+ buf.append(" <td align=\"right\"><b>");
buf.append(numPeers > 0 ? cwinTotal/(numPeers*1024) + "K" : "0K");
- buf.append("</td><td> </td>\n");
- buf.append(" <td align=\"right\">");
+ buf.append("</b></td><td> </td>\n");
+ buf.append(" <td align=\"right\"><b>");
buf.append(numPeers > 0 ? rttTotal/numPeers : 0);
- buf.append("</td><td align=\"right\"> </td><td align=\"right\">");
+ buf.append("</b></td><td align=\"right\"> </td><td align=\"right\"><b>");
buf.append(numPeers > 0 ? rtoTotal/numPeers : 0);
- buf.append("</td>\n <td> </td><td align=\"right\">");
- buf.append(sendTotal).append("</td><td align=\"right\">").append(recvTotal).append("</td>\n");
- buf.append(" <td align=\"right\">").append(resentTotal);
- buf.append("</td><td align=\"right\">").append(dupRecvTotal).append("</td>\n");
+ buf.append("</b></td>\n <td> </td><td align=\"right\"><b>");
+ buf.append(sendTotal).append("</td></b><td align=\"right\"><b>").append(recvTotal).append("</b></td>\n");
+ buf.append(" <td align=\"right\"><b>").append(resentTotal);
+ buf.append("</b></td><td align=\"right\"><b>").append(dupRecvTotal).append("</b></td>\n");
buf.append(" </tr></table></p><p>\n");
long bytesTransmitted = _context.bandwidthLimiter().getTotalAllocatedOutboundBytes();
// NPE here early
@@ -2006,8 +2006,8 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
resentTotal = (long)_context.statManager().getRate("udp.packetsRetransmitted").getLifetimeEventCount();
double nondupSent = ((double)bytesTransmitted - ((double)resentTotal)*averagePacketSize);
double bwResent = (nondupSent <= 0 ? 0d : ((((double)resentTotal)*averagePacketSize) / nondupSent));
- buf.append("Percentage of bytes retransmitted (lifetime): ").append(formatPct(bwResent));
- buf.append(" <i>(includes retransmission required by packet loss)</i><br /></p>\n");
+ buf.append("<h3>Percentage of bytes retransmitted (lifetime): ").append(formatPct(bwResent));
+ buf.append("</h3><i>(Includes retransmission required by packet loss)</i><br /></p>\n");
out.write(buf.toString());
buf.setLength(0);
out.write(KEY);
@@ -2026,27 +2026,27 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
}
}
- private static final String KEY = "<p>" +
- "<b id=\"def.peer\">peer</b>: the remote peer<br />\n" +
- "<b id=\"def.dir\">dir</b>: v means they offer to introduce us, ^ means we offer to introduce them<br />\n" +
- "<b id=\"def.idle\">idle</b>: the idle time is how long since a packet has been received or sent<br />\n" +
- "<b id=\"def.rate\">in/out</b>: the rates show a smoothed inbound and outbound transfer rate (KBytes per second)<br />\n" +
- "<b id=\"def.up\">up</b>: the uptime is how long ago this session was established<br />\n" +
- "<b id=\"def.skew\">skew</b>: the skew says how far off the other user's clock is, relative to your own<br />\n" +
- "<b id=\"def.cwnd\">cwnd</b>: the congestion window is how many bytes in 'in flight' you can send w/out an acknowledgement / <br />\n" +
- " the number of currently active messages being sent /<br />\n" +
- " the maximum number of concurrent messages to send /<br />\n"+
- " the number of consecutive sends which were blocked due to throws message window size<br />\n" +
- "<b id=\"def.ssthresh\">ssthresh</b>: the slow start threshold help make sure the cwnd doesn't grow too fast<br />\n" +
- "<b id=\"def.rtt\">rtt</b>: the round trip time is how long it takes to get an acknowledgement of a packet<br />\n" +
- "<b id=\"def.dev\">dev</b>: the standard deviation of the round trip time, to help control the retransmit timeout<br />\n" +
- "<b id=\"def.rto\">rto</b>: the retransmit timeout controls how frequently an unacknowledged packet will be retransmitted<br />\n" +
- "<b id=\"def.mtu\">mtu</b>: current sending packet size / estimated receiving packet size<br />\n" +
- "<b id=\"def.send\">send</b>: the number of packets sent to the peer<br />\n" +
- "<b id=\"def.recv\">recv</b>: the number of packets received from the peer<br />\n" +
- "<b id=\"def.resent\">resent</b>: the number of packets retransmitted to the peer<br />\n" +
- "<b id=\"def.dupRecv\">dupRecv</b>: the number of duplicate packets received from the peer" +
- "</p>\n";
+ private static final String KEY = "<h3>Explanation of abbreviated terms used.</h3><div class=\"configure\">" +
+ "<br><b id=\"def.peer\">Peer</b>: the remote peer.<br />\n" +
+ "<b id=\"def.dir\">Dir</b>: v means they offer to introduce us, ^ means we offer to introduce them.<br />\n" +
+ "<b id=\"def.idle\">Idle</b>: the idle time is how long since a packet has been received or sent.<br />\n" +
+ "<b id=\"def.rate\">In/out</b>: the rates show a smoothed inbound and outbound transfer rate (KBytes per second).<br />\n" +
+ "<b id=\"def.up\">Up</b>: the uptime is how long ago this session was established.<br />\n" +
+ "<b id=\"def.skew\">Skew</b>: the skew says how far off the other user's clock is, relative to your own.<br />\n" +
+ "<b id=\"def.cwnd\">Cwnd</b>: the congestion window is how many bytes in 'in flight' you can send w/out an acknowledgement, / <br />\n" +
+ " the number of currently active messages being sent, /<br />\n" +
+ " the maximum number of concurrent messages to send, /<br />\n"+
+ " the number of consecutive sends which were blocked due to throws message window size.<br />\n" +
+ "<b id=\"def.ssthresh\">Sst</b>: the slow start threshold helps make sure the cwnd doesn't grow too fast.<br />\n" +
+ "<b id=\"def.rtt\">Rtt</b>: the round trip time is how long it takes to get an acknowledgement of a packet.<br />\n" +
+ "<b id=\"def.dev\">Dev</b>: the standard deviation of the round trip time, to help control the retransmit timeout.<br />\n" +
+ "<b id=\"def.rto\">Rto</b>: the retransmit timeout controls how frequently an unacknowledged packet will be retransmitted.<br />\n" +
+ "<b id=\"def.mtu\">Mtu</b>: current sending packet size / estimated receiving packet size.<br />\n" +
+ "<b id=\"def.send\">TX</b>: the number of packets sent to the peer.<br />\n" +
+ "<b id=\"def.recv\">RX</b>: the number of packets received from the peer.<br />\n" +
+ "<b id=\"def.resent\">ReTX</b>: the number of packets retransmitted to the peer.<br />\n" +
+ "<b id=\"def.dupRecv\">DupRX</b>: the number of duplicate packets received from the peer." +
+ "</div>\n";
/**
* Cache the bid to reduce object churn
--
GitLab