diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
index 075483529b6ec4a833810b28b8e8a759c18a64f9..fc428bc26515d9df756fd7c29ccbb99cad80c7ff 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
@@ -843,6 +843,8 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
String type;
if (filename.endsWith(".css"))
type = "text/css";
+ else if (filename.endsWith(".ico"))
+ type = "image/x-icon";
else if (filename.endsWith(".png"))
type = "image/png";
else if (filename.endsWith(".jpg"))
diff --git a/apps/i2ptunnel/jsp/edit.jsp b/apps/i2ptunnel/jsp/edit.jsp
index b58798b20296eaedcffbae70791a2f2f162352c8..2da356e9cdc95435eb61ad047eaedd957023dd0a 100644
--- a/apps/i2ptunnel/jsp/edit.jsp
+++ b/apps/i2ptunnel/jsp/edit.jsp
@@ -1,3 +1,4 @@
+<%@page pageEncoding="UTF-8"%>
<%@page contentType="text/html" import="net.i2p.i2ptunnel.web.EditBean" %><%
String tun = request.getParameter("tunnel");
if (tun != null) {
diff --git a/apps/i2ptunnel/jsp/index.jsp b/apps/i2ptunnel/jsp/index.jsp
index 45a3da56a532528952a06f5d704ef969273bb9f5..87a006f6db8f3bd2ce146d614f3611f885ce55fe 100644
--- a/apps/i2ptunnel/jsp/index.jsp
+++ b/apps/i2ptunnel/jsp/index.jsp
@@ -1,3 +1,9 @@
+<%
+ // http://www.crazysquirrel.com/computing/general/form-encoding.jspx
+ if (request.getCharacterEncoding() == null)
+ request.setCharacterEncoding("UTF-8");
+%>
+<%@page pageEncoding="UTF-8"%>
<%@page contentType="text/html" import="net.i2p.i2ptunnel.web.IndexBean"%><?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<jsp:useBean class="net.i2p.i2ptunnel.web.IndexBean" id="indexBean" scope="request" />
@@ -6,13 +12,12 @@
<head>
<title>I2P Tunnel Manager - List</title>
- <meta htt
-p-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
+ <link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
<% if (indexBean.allowCSS()) {
- %><link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
- <link href="<%=indexBean.getTheme()%>default.css" rel="stylesheet" type="text/css" />
+ %><link href="<%=indexBean.getTheme()%>default.css" rel="stylesheet" type="text/css" />
<link href="<%=indexBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" />
<% }
%>
diff --git a/apps/ministreaming/java/build.xml b/apps/ministreaming/java/build.xml
index 1f83b640ddbe78e3ff8c8395f0372a56bdf31714..ca0889042cda1bd90f0e47ad3b6d5b05b95a0951 100644
--- a/apps/ministreaming/java/build.xml
+++ b/apps/ministreaming/java/build.xml
@@ -23,7 +23,8 @@
<target name="compile" depends="depend">
<mkdir dir="./build" />
<mkdir dir="./build/obj" />
- <javac srcdir="./src" debug="true" deprecation="on" source="1.5" target="1.5" destdir="./build/obj" classpath="../../../core/java/build/i2p.jar" >
+ <!-- half of this is deprecated classes so turn deprecation off -->
+ <javac srcdir="./src" debug="true" deprecation="off" source="1.5" target="1.5" destdir="./build/obj" classpath="../../../core/java/build/i2p.jar" >
<compilerarg line="${javac.compilerargs}" />
</javac>
</target>
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java
index 0a7bc1b0a8bc2190d110ccfe4f496195d1fec3c7..393476f061b64ef16bda30f262282554ec111d4e 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java
@@ -154,28 +154,35 @@ buf.append("<tr><th></th><th><img src=\"/themes/console/images/inbound.png\" alt
buf.append("</tr>\n");
// custom options
- buf.append("<tr><td align=\"right\" class=\"mediumtags\">Inbound options:</td>\n");
- buf.append("<td colspan=\"2\" align=\"center\"><input name=\"").append(index);
- buf.append(".inboundOptions\" type=\"text\" size=\"32\" ");
- buf.append("value=\"");
+ // There is no facility to set these, either in ConfigTunnelsHandler or
+ // TunnelPoolOptions, so make the boxes readonly.
+ // And let's not display them at all unless they have contents, which should be rare.
Properties props = in.getUnknownOptions();
- for (Iterator iter = props.keySet().iterator(); iter.hasNext(); ) {
- String prop = (String)iter.next();
- String val = (String)props.getProperty(prop);
- buf.append(prop).append("=").append(val).append(" ");
+ if (props.size() > 0) {
+ buf.append("<tr><td align=\"right\" class=\"mediumtags\">Inbound options:</td>\n" +
+ "<td colspan=\"2\" align=\"center\"><input name=\"").append(index);
+ buf.append(".inboundOptions\" type=\"text\" size=\"32\" disabled=\"true\" " +
+ "value=\"");
+ for (Iterator iter = props.keySet().iterator(); iter.hasNext(); ) {
+ String prop = (String)iter.next();
+ String val = (String)props.getProperty(prop);
+ buf.append(prop).append('=').append(val).append(' ');
+ }
+ buf.append("\"></td></tr>\n");
}
- buf.append("\"/></td></tr>\n");
- buf.append("<tr><td align=\"right\" class=\"mediumtags\">Outbound options:</td>\n");
- buf.append("<td colspan=\"2\" align=\"center\"><input name=\"").append(index);
- buf.append(".outboundOptions\" type=\"text\" size=\"32\" ");
- buf.append("value=\"");
- props = in.getUnknownOptions();
- for (Iterator iter = props.keySet().iterator(); iter.hasNext(); ) {
- String prop = (String)iter.next();
- String val = (String)props.getProperty(prop);
- buf.append(prop).append("=").append(val).append(" ");
+ props = out.getUnknownOptions();
+ if (props.size() > 0) {
+ buf.append("<tr><td align=\"right\" class=\"mediumtags\">Outbound options:</td>\n" +
+ "<td colspan=\"2\" align=\"center\"><input name=\"").append(index);
+ buf.append(".outboundOptions\" type=\"text\" size=\"32\" disabled=\"true\" " +
+ "value=\"");
+ for (Iterator iter = props.keySet().iterator(); iter.hasNext(); ) {
+ String prop = (String)iter.next();
+ String val = (String)props.getProperty(prop);
+ buf.append(prop).append('=').append(val).append(' ');
+ }
+ buf.append("\"></td></tr>\n");
}
- buf.append("\"/></td></tr>\n");
// buf.append("<tr><td colspan=\"3\"><br></td></tr>\n");
}
diff --git a/apps/routerconsole/jsp/css.jsp b/apps/routerconsole/jsp/css.jsp
index affe83099f427eb31f6ca94fc94ee17bfb6444aa..422d1329ce6faa5bb40c54caf98f845a8d3a8c7b 100644
--- a/apps/routerconsole/jsp/css.jsp
+++ b/apps/routerconsole/jsp/css.jsp
@@ -2,8 +2,14 @@
/*
* This should be included inside <head>...</head>,
* as it sets the stylesheet.
+ *
+ * This is included almost 30 times, so keep whitespace etc. to a minimum.
*/
+ // http://www.crazysquirrel.com/computing/general/form-encoding.jspx
+ if (request.getCharacterEncoding() == null)
+ request.setCharacterEncoding("UTF-8");
+
response.setHeader("Pragma", "no-cache");
response.setHeader("Cache-Control","no-cache");
response.setDateHeader("Expires", 0);
@@ -15,7 +21,9 @@
session.setAttribute("i2p.contextId", request.getParameter("i2p.contextId"));
}
%>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="shortcut icon" href="favicon.ico">
<jsp:useBean class="net.i2p.router.web.CSSHelper" id="cssHelper" scope="request" />
<jsp:setProperty name="cssHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
<link href="<%=cssHelper.getTheme(request.getHeader("User-Agent"))%>console.css" rel="stylesheet" type="text/css">
-<!--[if IE]><link href="/themes/console/classic/ieshim.css" rel="stylesheet" type="text/css" /><![endif]-->
\ No newline at end of file
+<!--[if IE]><link href="/themes/console/classic/ieshim.css" rel="stylesheet" type="text/css" /><![endif]-->
diff --git a/apps/routerconsole/jsp/error.jsp b/apps/routerconsole/jsp/error.jsp
index b900d29a124a32fad633f0b4617fcb57723fcfbc..8b057046a71b49af972cdff140c3866ef38844f9 100644
--- a/apps/routerconsole/jsp/error.jsp
+++ b/apps/routerconsole/jsp/error.jsp
@@ -13,7 +13,6 @@
// If it can't find the iframe or viewtheme.jsp I wonder if the whole thing blows up...
%>
<html><head><title>I2P Router Console - Page Not Found</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<%@include file="css.jsp" %>
<link rel="shortcut icon" href="favicon.ico" /></head><body>
<%
diff --git a/apps/routerconsole/jsp/flags.jsp b/apps/routerconsole/jsp/flags.jsp
index fc93fcea7b9e25fc40cb60507be51cf402f97857..00ce370fb61eb2dc72e6bc93355128fb041ae30e 100644
--- a/apps/routerconsole/jsp/flags.jsp
+++ b/apps/routerconsole/jsp/flags.jsp
@@ -25,6 +25,12 @@ if (c != null && c.length() > 0) {
if (rendered)
cout.close();
}
+/*
+ * Send a 403 instead of a 404, because the server sends error.jsp
+ * for 404 errors, complete with the summary bar, which would be
+ * a huge load for a page full of flags if the user didn't have the
+ * flags directory for some reason.
+ */
if (!rendered)
- response.sendError(404, "Not found");
+ response.sendError(403, "Flag not found");
%>
\ No newline at end of file
diff --git a/apps/routerconsole/jsp/index.jsp b/apps/routerconsole/jsp/index.jsp
index 2bef637521bb9f1a6a9ac285cd0d4043929bb71d..b14f8e352549d39646ce4a35bb0ecc5737e8e9c7 100644
--- a/apps/routerconsole/jsp/index.jsp
+++ b/apps/routerconsole/jsp/index.jsp
@@ -5,8 +5,6 @@
<html><head>
<%@include file="css.jsp" %>
<title>I2P Router Console - home</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="shortcut icon" href="/themes/console/images/favicon.ico" />
</head><body>
<%
if (System.getProperty("router.consoleNonce") == null) {
diff --git a/apps/routerconsole/jsp/summaryframe.jsp b/apps/routerconsole/jsp/summaryframe.jsp
index 05ad49ad7d89646fd48383d06c0cf7b6fd79170b..5d1d9eb2b95290d5b670535b26738c8c5972e72a 100644
--- a/apps/routerconsole/jsp/summaryframe.jsp
+++ b/apps/routerconsole/jsp/summaryframe.jsp
@@ -10,7 +10,6 @@
<html><head>
<%@include file="css.jsp" %>
<title>Summary Bar</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<%
// try hard to avoid an error page in the iframe after shutdown
String action = request.getParameter("action");
diff --git a/apps/routerconsole/jsp/viewstat.jsp b/apps/routerconsole/jsp/viewstat.jsp
index aee42b9585436ed04602b05c2486044a21526b2b..392a37b89c353d5fb39ca7b5cc061e402fb00774 100644
--- a/apps/routerconsole/jsp/viewstat.jsp
+++ b/apps/routerconsole/jsp/viewstat.jsp
@@ -63,7 +63,12 @@ if ( !rendered && ((rs != null) || fakeBw) ) {
}
} catch (NumberFormatException nfe) {}
}
+/*
+ * Send a 403 instead of a 404, because the server sends error.jsp
+ * for 404 errors, complete with the summary bar, which would be
+ * a huge load for a page full of graphs if there's a problem
+ */
if (!rendered) {
- response.sendError(404, "That stat is not available");
+ response.sendError(403, "That stat is not available");
}
%>
\ No newline at end of file
diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java
index 0f48efef2d227abd5e5a8d98e6e7abde159c7343..fdd560243f44292def0abf20cc4bf354d88eca68 100644
--- a/core/java/src/net/i2p/data/DataHelper.java
+++ b/core/java/src/net/i2p/data/DataHelper.java
@@ -105,6 +105,19 @@ public class DataHelper {
*/
public static void writeProperties(OutputStream rawStream, Properties props)
throws DataFormatException, IOException {
+ writeProperties(rawStream, props, false);
+ }
+
+ /**
+ * jrandom disabled UTF-8 in mid-2004, for performance reasons,
+ * i.e. slow foo.getBytes("UTF-8")
+ * Re-enable it so we can pass UTF-8 tunnel names through the I2CP SessionConfig.
+ *
+ * Use utf8 = false for RouterAddress (fast, non UTF-8)
+ * Use utf8 = true for SessionConfig (slow, UTF-8)
+ */
+ public static void writeProperties(OutputStream rawStream, Properties props, boolean utf8)
+ throws DataFormatException, IOException {
if (props != null) {
OrderedProperties p = new OrderedProperties();
p.putAll(props);
@@ -112,12 +125,15 @@ public class DataHelper {
for (Iterator iter = p.keySet().iterator(); iter.hasNext();) {
String key = (String) iter.next();
String val = p.getProperty(key);
- // now make sure they're in UTF-8
- //key = new String(key.getBytes(), "UTF-8");
- //val = new String(val.getBytes(), "UTF-8");
- writeString(baos, key);
+ if (utf8)
+ writeStringUTF8(baos, key);
+ else
+ writeString(baos, key);
baos.write(_equalBytes);
- writeString(baos, val);
+ if (utf8)
+ writeStringUTF8(baos, val);
+ else
+ writeString(baos, val);
baos.write(_semicolonBytes);
}
baos.close();
@@ -486,6 +502,7 @@ public class DataHelper {
/** Read in a string from the stream as specified by the I2P data structure spec.
* A string is 1 or more bytes where the first byte is the number of bytes (not characters!)
* in the string and the remaining 0-255 bytes are the non-null terminated UTF-8 encoded character array.
+ *
* @param in stream to read from
* @throws DataFormatException if the stream doesn't contain a validly formatted string
* @throws IOException if there is an IO error reading the string
@@ -496,12 +513,17 @@ public class DataHelper {
byte raw[] = new byte[size];
int read = read(in, raw);
if (read != size) throw new DataFormatException("Not enough bytes to read the string");
- return new String(raw);
+ // the following constructor throws an UnsupportedEncodingException which is an IOException,
+ // but that's only if UTF-8 is not supported. Other encoding errors are not thrown.
+ return new String(raw, "UTF-8");
}
/** Write out a string to the stream as specified by the I2P data structure spec. Note that the max
* size for a string allowed by the spec is 255 bytes.
*
+ * WARNING - this method destroys the encoding, and therefore violates
+ * the data structure spec.
+ *
* @param out stream to write string
* @param string string to write out: null strings are perfectly valid, but strings of excess length will
* cause a DataFormatException to be thrown
@@ -516,13 +538,41 @@ public class DataHelper {
int len = string.length();
if (len > 255)
throw new DataFormatException("The I2P data spec limits strings to 255 bytes or less, but this is "
- + string.length() + " [" + string + "]");
+ + len + " [" + string + "]");
writeLong(out, 1, len);
for (int i = 0; i < len; i++)
out.write((byte)(string.charAt(i) & 0xFF));
}
}
+ /** Write out a string to the stream as specified by the I2P data structure spec. Note that the max
+ * size for a string allowed by the spec is 255 bytes.
+ *
+ * This method correctly uses UTF-8
+ *
+ * @param out stream to write string
+ * @param string UTF-8 string to write out: null strings are perfectly valid, but strings of excess length will
+ * cause a DataFormatException to be thrown
+ * @throws DataFormatException if the string is not valid
+ * @throws IOException if there is an IO error writing the string
+ */
+ private static void writeStringUTF8(OutputStream out, String string)
+ throws DataFormatException, IOException {
+ if (string == null) {
+ writeLong(out, 1, 0);
+ } else {
+ // the following method throws an UnsupportedEncodingException which is an IOException,
+ // but that's only if UTF-8 is not supported. Other encoding errors are not thrown.
+ byte[] raw = string.getBytes("UTF-8");
+ int len = raw.length;
+ if (len > 255)
+ throw new DataFormatException("The I2P data spec limits strings to 255 bytes or less, but this is "
+ + len + " [" + string + "]");
+ writeLong(out, 1, len);
+ out.write(raw);
+ }
+ }
+
/** Read in a boolean as specified by the I2P data structure spec.
* A boolean is 1 byte that is either 0 (false), 1 (true), or 2 (null)
* @param in stream to read from
diff --git a/core/java/src/net/i2p/data/i2cp/SessionConfig.java b/core/java/src/net/i2p/data/i2cp/SessionConfig.java
index 5b1eb6b164f8b278a6dca528baf6d017e787d380..520413620d35ce9a5b483868d4a43b9d0eacfc78 100644
--- a/core/java/src/net/i2p/data/i2cp/SessionConfig.java
+++ b/core/java/src/net/i2p/data/i2cp/SessionConfig.java
@@ -173,7 +173,7 @@ public class SessionConfig extends DataStructureImpl {
_log.debug("PubKey size for destination: " + _destination.getPublicKey().getData().length);
_log.debug("SigningKey size for destination: " + _destination.getSigningPublicKey().getData().length);
_destination.writeBytes(out);
- DataHelper.writeProperties(out, _options);
+ DataHelper.writeProperties(out, _options, true); // UTF-8
DataHelper.writeDate(out, _creationDate);
} catch (IOException ioe) {
_log.error("IOError signing", ioe);
@@ -198,7 +198,7 @@ public class SessionConfig extends DataStructureImpl {
if ((_destination == null) || (_options == null) || (_signature == null) || (_creationDate == null))
throw new DataFormatException("Not enough data to create the session config");
_destination.writeBytes(out);
- DataHelper.writeProperties(out, _options);
+ DataHelper.writeProperties(out, _options, true); // UTF-8
DataHelper.writeDate(out, _creationDate);
_signature.writeBytes(out);
}
@@ -232,4 +232,4 @@ public class SessionConfig extends DataStructureImpl {
buf.append("]");
return buf.toString();
}
-}
\ No newline at end of file
+}
diff --git a/installer/resources/wrapper.config b/installer/resources/wrapper.config
index 3f07e7c85846708cd288feee7e593b648214d50b..3fbe0375e8f682301cfe738023c3392ff23158e5 100644
--- a/installer/resources/wrapper.config
+++ b/installer/resources/wrapper.config
@@ -117,8 +117,12 @@ wrapper.logfile=$SYSTEM_java_io_tmpdir/wrapper.log
# no need for a wrapper.java.additional line too.
#wrapper.logfile=$INSTALL_PATH/wrapper.log
-# Format of output for the log file. (See docs for formats)
-wrapper.logfile.format=LPTM
+# Format of output for the log file.
+# The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread,
+# 'T' for time, 'Z' for millisecond time, and 'M' for message
+# Unfortunately the log timezone cannot be changed, see
+# http://www.nabble.com/Log-message-timezone-td23651317.html
+wrapper.logfile.format=TM
# Log Level for log file output. (See docs for log levels)
wrapper.logfile.loglevel=INFO
diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java
index f49a3814631cf0dcfd629437e49599b720ca86de..1b20bda9d5e7985d85eb294930852376ffed11c6 100644
--- a/router/java/src/net/i2p/router/Router.java
+++ b/router/java/src/net/i2p/router/Router.java
@@ -1109,7 +1109,11 @@ public class Router {
return;
}
System.out.println("INFO: Update file exists [" + UPDATE_FILE + "] - installing");
- boolean ok = FileUtil.extractZip(updateFile, _context.getBaseDir());
+ // verify the whole thing first
+ // we could remember this fails, and not bother restarting, but who cares...
+ boolean ok = FileUtil.verifyZip(updateFile);
+ if (ok)
+ ok = FileUtil.extractZip(updateFile, _context.getBaseDir());
if (ok)
System.out.println("INFO: Update installed");
else
@@ -1132,6 +1136,7 @@ public class Router {
updateFile.deleteOnExit();
}
}
+ // exit whether ok or not
if (System.getProperty("wrapper.version") != null)
System.out.println("INFO: Restarting after update");
else
diff --git a/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java b/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java
index 1e3d71fc8774b878ccf52cc1d9aa82aafa7b689f..870e647c9a2f46b8bb0cfd1948b52c92be0c8cac 100644
--- a/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java
+++ b/router/java/src/net/i2p/router/peermanager/ProfileOrganizerRenderer.java
@@ -111,10 +111,11 @@ class ProfileOrganizerRenderer {
if (isIntegrated) buf.append(", Integrated");
RouterInfo info = _context.netDb().lookupRouterInfoLocally(peer);
if (info != null) {
- buf.append(" (").append(info.getCapabilities());
+ // prevent HTML injection in the caps and version
+ buf.append(" (").append(DataHelper.stripHTML(info.getCapabilities()));
String v = info.getOption("router.version");
if (v != null)
- buf.append(' ').append(v);
+ buf.append(' ').append(DataHelper.stripHTML(v));
buf.append(')');
}
@@ -153,6 +154,9 @@ class ProfileOrganizerRenderer {
buf.append("<td nowrap align=\"center\"><a target=\"_blank\" href=\"dumpprofile.jsp?peer=").append(peer.toBase64().substring(0,6)).append("\">profile</a>");
buf.append(" <a href=\"configpeer.jsp?peer=").append(peer.toBase64()).append("\">+-</a></td>\n");
buf.append("</tr>");
+ // let's not build the whole page in memory (~500 bytes per peer)
+ out.write(buf.toString());
+ buf.setLength(0);
}
buf.append("</table>");
@@ -189,7 +193,7 @@ class ProfileOrganizerRenderer {
buf.append("</td>");
RouterInfo info = _context.netDb().lookupRouterInfoLocally(peer);
if (info != null)
- buf.append("<td align=\"center\">" + info.getCapabilities() + "</td>");
+ buf.append("<td align=\"center\">").append(DataHelper.stripHTML(info.getCapabilities())).append("</td>");
else
buf.append("<td> </td>");
buf.append("</code></td>");
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 ade88566a236b48be141d67dd3d2d1b42dd8bc02..c991830d7a508c268b8f865421e2612d56f951fe 100644
--- a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java
+++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java
@@ -645,20 +645,20 @@ public class NTCPTransport extends TransportImpl {
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("<div class=\"wideload\"><table>\n");
- buf.append("<tr><th><a href=\"#def.peer\">Peer</a></th>");
- buf.append("<th>Dir</th>");
- buf.append("<th align=\"right\"><a href=\"#def.idle\">Idle</a></th>");
- 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\">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>");
- buf.append(" </tr>\n");
+ buf.append(".</b></h3>\n" +
+ "<div class=\"wideload\"><table>\n" +
+ "<tr><th><a href=\"#def.peer\">Peer</a></th>" +
+ "<th>Dir</th>" +
+ "<th align=\"right\"><a href=\"#def.idle\">Idle</a></th>" +
+ "<th align=\"right\"><a href=\"#def.rate\">In/Out</a></th>" +
+ "<th align=\"right\"><a href=\"#def.up\">Up</a></th>" +
+ "<th align=\"right\"><a href=\"#def.skew\">Skew</a></th>" +
+ "<th align=\"right\"><a href=\"#def.send\">TX</a></th>" +
+ "<th align=\"right\"><a href=\"#def.recv\">RX</a></th>" +
+ "<th>Out queue</th>" +
+ "<th>Backlogged?</th>" +
+ "<th>Reading?</th>" +
+ " </tr>\n");
out.write(buf.toString());
buf.setLength(0);
for (Iterator iter = peers.iterator(); iter.hasNext(); ) {
@@ -726,8 +726,8 @@ public class NTCPTransport extends TransportImpl {
buf.append("</td> <td align=\"center\"><b>").append(DataHelper.formatDuration(totalUptime/peers.size()));
buf.append("</b></td> <td align=\"center\"><b>").append(peers.size() > 0 ? DataHelper.formatDuration(offsetTotal*1000/peers.size()) : "0ms");
buf.append("</b></td> <td align=\"center\"><b>").append(totalSend).append("</b></td> <td align=\"center\"><b>").append(totalRecv);
- buf.append("</b></td> <td> </td> <td> </td> <td> ");
- buf.append("</td></tr>\n");
+ buf.append("</b></td> <td> </td> <td> </td> <td> " +
+ "</td></tr>\n");
}
buf.append("</table></div></p>\n");