diff --git a/Slackware/i2p/i2p.SlackBuild b/Slackware/i2p/i2p.SlackBuild index 421033356..3bb2c9503 100755 --- a/Slackware/i2p/i2p.SlackBuild +++ b/Slackware/i2p/i2p.SlackBuild @@ -65,7 +65,7 @@ cd $CWD/../../ ant distclean ant dist - +ant tarball tar xjvf i2p.tar.bz2 -C $TMP diff --git a/apps/BOB/nbproject/private/private.xml b/apps/BOB/nbproject/private/private.xml index 2482568bf..237b674f1 100644 --- a/apps/BOB/nbproject/private/private.xml +++ b/apps/BOB/nbproject/private/private.xml @@ -2,6 +2,6 @@ - file:/root/NetBeansProjects/i2p.i2p/apps/BOB/src/net/i2p/BOB/MUXlisten.java + file:/root/NetBeansProjects/i2p.i2p/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java diff --git a/apps/i2psnark/java/src/org/klomp/snark/BitField.java b/apps/i2psnark/java/src/org/klomp/snark/BitField.java index 85117b93d..876a39159 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/BitField.java +++ b/apps/i2psnark/java/src/org/klomp/snark/BitField.java @@ -140,7 +140,7 @@ public class BitField public String toString() { // Not very efficient - StringBuffer sb = new StringBuffer("BitField("); + StringBuilder sb = new StringBuilder("BitField("); sb.append(size).append(")["); for (int i = 0; i < size; i++) if (get(i)) diff --git a/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java b/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java index 984e50ef3..77f07d299 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java +++ b/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java @@ -362,7 +362,7 @@ public class MetaInfo */ private static String hexencode(byte[] bs) { - StringBuffer sb = new StringBuffer(bs.length*2); + StringBuilder sb = new StringBuilder(bs.length*2); for (int i = 0; i < bs.length; i++) { int c = bs[i] & 0xFF; @@ -432,7 +432,7 @@ public class MetaInfo private byte[] calculateInfoHash() { Map info = createInfoMap(); - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append("info: "); for (Iterator iter = info.entrySet().iterator(); iter.hasNext(); ) { Map.Entry entry = (Map.Entry)iter.next(); diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerID.java b/apps/i2psnark/java/src/org/klomp/snark/PeerID.java index 67ff4c858..0a998af3d 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerID.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerID.java @@ -190,7 +190,7 @@ public class PeerID implements Comparable { boolean leading_zeros = true; - StringBuffer sb = new StringBuffer(bs.length*2); + StringBuilder sb = new StringBuilder(bs.length*2); for (int i = 0; i < bs.length; i++) { int c = bs[i] & 0xFF; diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index 79ea62ebc..63b327974 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -702,7 +702,7 @@ public class SnarkManager implements Snark.CompleteListener { // , "mastertracker", "http://VzXD~stRKbL3MOmeTn1iaCQ0CFyTmuFHiKYyo0Rd~dFPZFCYH-22rT8JD7i-C2xzYFa4jT5U2aqHzHI-Jre4HL3Ri5hFtZrLk2ax3ji7Qfb6qPnuYkuiF2E2UDmKUOppI8d9Ye7tjdhQVCy0izn55tBaB-U7UWdcvSK2i85sauyw3G0Gfads1Rvy5-CAe2paqyYATcDmGjpUNLoxbfv9KH1KmwRTNH6k1v4PyWYYnhbT39WfKMbBjSxVQRdi19cyJrULSWhjxaQfJHeWx5Z8Ev4bSPByBeQBFl2~4vqy0S5RypINsRSa3MZdbiAAyn5tr5slWR6QdoqY3qBQgBJFZppy-3iWkFqqKgSxCPundF8gdDLC5ddizl~KYcYKl42y9SGFHIukH-TZs8~em0~iahzsqWVRks3zRG~tlBcX2U3M2~OJs~C33-NKhyfZT7-XFBREvb8Szmd~p66jDxrwOnKaku-G6DyoQipJqIz4VHmY9-y5T8RrUcJcM-5lVoMpAAAA.i2p/announce.php=http://tracker.mastertracker.i2p/" // , "Galen", "http://5jpwQMI5FT303YwKa5Rd38PYSX04pbIKgTaKQsWbqoWjIfoancFdWCShXHLI5G5ofOb0Xu11vl2VEMyPsg1jUFYSVnu4-VfMe3y4TKTR6DTpetWrnmEK6m2UXh91J5DZJAKlgmO7UdsFlBkQfR2rY853-DfbJtQIFl91tbsmjcA5CGQi4VxMFyIkBzv-pCsuLQiZqOwWasTlnzey8GcDAPG1LDcvfflGV~6F5no9mnuisZPteZKlrv~~TDoXTj74QjByWc4EOYlwqK8sbU9aOvz~s31XzErbPTfwiawiaZ0RUI-IDrKgyvmj0neuFTWgjRGVTH8bz7cBZIc3viy6ioD-eMQOrXaQL0TCWZUelRwHRvgdPiQrxdYQs7ixkajeHzxi-Pq0EMm5Vbh3j3Q9kfUFW3JjFDA-MLB4g6XnjCbM5J1rC0oOBDCIEfhQkszru5cyLjHiZ5yeA0VThgu~c7xKHybv~OMXION7V8pBKOgET7ZgAkw1xgYe3Kkyq5syAAAA.i2p/tr/announce.php=http://galen.i2p/tr/" , "crstrack", "http://b4G9sCdtfvccMAXh~SaZrPqVQNyGQbhbYMbw6supq2XGzbjU4NcOmjFI0vxQ8w1L05twmkOvg5QERcX6Mi8NQrWnR0stLExu2LucUXg1aYjnggxIR8TIOGygZVIMV3STKH4UQXD--wz0BUrqaLxPhrm2Eh9Hwc8TdB6Na4ShQUq5Xm8D4elzNUVdpM~RtChEyJWuQvoGAHY3ppX-EJJLkiSr1t77neS4Lc-KofMVmgI9a2tSSpNAagBiNI6Ak9L1T0F9uxeDfEG9bBSQPNMOSUbAoEcNxtt7xOW~cNOAyMyGydwPMnrQ5kIYPY8Pd3XudEko970vE0D6gO19yoBMJpKx6Dh50DGgybLQ9CpRaynh2zPULTHxm8rneOGRcQo8D3mE7FQ92m54~SvfjXjD2TwAVGI~ae~n9HDxt8uxOecAAvjjJ3TD4XM63Q9TmB38RmGNzNLDBQMEmJFpqQU8YeuhnS54IVdUoVQFqui5SfDeLXlSkh4vYoMU66pvBfWbAAAA.i2p/tracker/announce.php=http://crstrack.i2p/tracker/" - , "Postman2", "http://lnQ6yoBTxQuQU8EQ1FlF395ITIQF-HGJxUeFvzETLFnoczNjQvKDbtSB7aHhn853zjVXrJBgwlB9sO57KakBDaJ50lUZgVPhjlI19TgJ-CxyHhHSCeKx5JzURdEW-ucdONMynr-b2zwhsx8VQCJwCEkARvt21YkOyQDaB9IdV8aTAmP~PUJQxRwceaTMn96FcVenwdXqleE16fI8CVFOV18jbJKrhTOYpTtcZKV4l1wNYBDwKgwPx5c0kcrRzFyw5~bjuAKO~GJ5dR7BQsL7AwBoQUS4k1lwoYrG1kOIBeDD3XF8BWb6K3GOOoyjc1umYKpur3G~FxBuqtHAsDRICkEbKUqJ9mPYQlTSujhNxiRIW-oLwMtvayCFci99oX8MvazPS7~97x0Gsm-onEK1Td9nBdmq30OqDxpRtXBimbzkLbR1IKObbg9HvrKs3L-kSyGwTUmHG9rSQSoZEvFMA-S0EXO~o4g21q1oikmxPMhkeVwQ22VHB0-LZJfmLr4SAAAA.i2p/announce.php=http://tracker2.postman.i2p/" + , "Postman2", "http://tracker2.postman.i2p/announce.php=http://tracker2.postman.i2p/" }; /** comma delimited list of name=announceURL=baseURL for the trackers to be displayed */ diff --git a/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java b/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java index 3ba2f6be6..da317998a 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java +++ b/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java @@ -373,7 +373,7 @@ public class TrackerClient extends I2PAppThread */ public static String urlencode(byte[] bs) { - StringBuffer sb = new StringBuffer(bs.length*3); + StringBuilder sb = new StringBuilder(bs.length*3); for (int i = 0; i < bs.length; i++) { int c = bs[i] & 0xFF; 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 3929fbe11..ec5e2b8db 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -398,7 +398,7 @@ public class I2PSnarkServlet extends HttpServlet { return rv; } - private static final int MAX_DISPLAYED_FILENAME_LENGTH = 60; + private static final int MAX_DISPLAYED_FILENAME_LENGTH = 44; private static final int MAX_DISPLAYED_ERROR_LENGTH = 40; private void displaySnark(PrintWriter out, Snark snark, String uri, int row, long stats[], boolean showPeers, boolean showDebug) throws IOException { String filename = snark.torrent; @@ -506,7 +506,7 @@ public class I2PSnarkServlet extends HttpServlet { // temporarily hardcoded for postman* and anonymity, requires bytemonsoon patch for lookup by info_hash String announce = snark.meta.getAnnounce(); if (announce.startsWith("http://YRgrgTLG") || announce.startsWith("http://8EoJZIKr") || - announce.startsWith("http://lnQ6yoBT")) { + announce.startsWith("http://lnQ6yoBT") || announce.startsWith("http://tracker2.postman.i2p/")) { Map trackers = _manager.getTrackers(); for (Iterator iter = trackers.entrySet().iterator(); iter.hasNext(); ) { Map.Entry entry = (Map.Entry)iter.next(); @@ -759,7 +759,7 @@ public class I2PSnarkServlet extends HttpServlet { + _manager.util().getI2CPHost() + "\" size=\"15\" /> "); out.write("port:
\n"); - StringBuffer opts = new StringBuffer(64); + StringBuilder opts = new StringBuilder(64); Map options = new TreeMap(_manager.util().getI2CPOptions()); for (Iterator iter = options.entrySet().iterator(); iter.hasNext(); ) { Map.Entry entry = (Map.Entry)iter.next(); diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java index 79270303b..65941f3ba 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java @@ -179,7 +179,7 @@ public class I2PTunnelConnectClient extends I2PTunnelClientBase implements Runna out = s.getOutputStream(); in = s.getInputStream(); String line, method = null, host = null, destination = null, restofline = null; - StringBuffer newRequest = new StringBuffer(); + StringBuilder newRequest = new StringBuilder(); int ahelper = 0; while (true) { // Use this rather than BufferedReader because we can't have readahead, diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java index 8dabdc0f6..f450682cd 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java @@ -240,7 +240,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable out = s.getOutputStream(); InputReader reader = new InputReader(s.getInputStream()); String line, method = null, protocol = null, host = null, destination = null; - StringBuffer newRequest = new StringBuffer(); + StringBuilder newRequest = new StringBuilder(); int ahelper = 0; while ((line = reader.readLine(method)) != null) { line = line.trim(); @@ -811,11 +811,14 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable * but inproxy/gateway ops would be wise to block proxy.i2p to prevent * exposing the docs/ directory or perhaps other issues through * uncaught vulnerabilities. + * Restrict to the /themes/ directory for now. * - * @param targetRequest "proxy.i2p/foo.png HTTP/1.1" + * @param targetRequest "proxy.i2p/themes/foo.png HTTP/1.1" */ private static void serveLocalFile(OutputStream out, String method, String targetRequest) { - if (method.equals("GET") || method.equals("HEAD")) { + if ((method.equals("GET") || method.equals("HEAD")) && + targetRequest.startsWith("proxy.i2p/themes/") && + !targetRequest.contains("..")) { int space = targetRequest.indexOf(' '); String filename = null; try { diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java index d43639cb7..e1ce9084e 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java @@ -19,6 +19,7 @@ import net.i2p.data.DataHelper; import net.i2p.util.EventDispatcher; import net.i2p.util.I2PThread; import net.i2p.util.Log; +import net.i2p.data.Base32; /** * Simple extension to the I2PTunnelServer that filters the HTTP @@ -33,6 +34,8 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer { /** what Host: should we seem to be to the webserver? */ private String _spoofHost; private static final String HASH_HEADER = "X-I2P-DestHash"; + private static final String DEST64_HEADER = "X-I2P-DestB64"; + private static final String DEST32_HEADER = "X-I2P-DestB32"; public I2PTunnelHTTPServer(InetAddress host, int port, String privData, String spoofHost, Logging l, EventDispatcher notifyThis, I2PTunnel tunnel) { super(host, port, privData, l, notifyThis, tunnel); @@ -71,9 +74,12 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer { InputStream in = socket.getInputStream(); - StringBuffer command = new StringBuffer(128); + StringBuilder command = new StringBuilder(128); Properties headers = readHeaders(in, command); headers.setProperty(HASH_HEADER, socket.getPeerDestination().calculateHash().toBase64()); + headers.setProperty(DEST32_HEADER, Base32.encode(socket.getPeerDestination().calculateHash().getData()) + ".b32.i2p" ); + headers.setProperty(DEST64_HEADER, socket.getPeerDestination().toBase64()); + if ( (_spoofHost != null) && (_spoofHost.trim().length() > 0) ) headers.setProperty("Host", _spoofHost); headers.setProperty("Connection", "close"); @@ -303,8 +309,8 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer { } } - private String formatHeaders(Properties headers, StringBuffer command) { - StringBuffer buf = new StringBuffer(command.length() + headers.size() * 64); + private String formatHeaders(Properties headers, StringBuilder command) { + StringBuilder buf = new StringBuilder(command.length() + headers.size() * 64); buf.append(command.toString().trim()).append("\r\n"); for (Iterator iter = headers.keySet().iterator(); iter.hasNext(); ) { String name = (String)iter.next(); @@ -315,9 +321,9 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer { return buf.toString(); } - private Properties readHeaders(InputStream in, StringBuffer command) throws IOException { + private Properties readHeaders(InputStream in, StringBuilder command) throws IOException { Properties headers = new Properties(); - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); boolean ok = DataHelper.readLine(in, command); if (!ok) throw new IOException("EOF reached while reading the HTTP command [" + command.toString() + "]"); @@ -361,6 +367,10 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer { name = "X-Accept-encoding"; else if (HASH_HEADER.equalsIgnoreCase(name)) continue; // Prevent spoofing + else if (DEST64_HEADER.equalsIgnoreCase(name)) + continue; // Prevent spoofing + else if (DEST32_HEADER.equalsIgnoreCase(name)) + continue; // Prevent spoofing headers.setProperty(name, value); if (_log.shouldLog(Log.DEBUG)) _log.debug("Read the header [" + name + "] = [" + value + "]"); diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java index 3b5bff785..dd8c289d9 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java @@ -82,7 +82,7 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable try { i2ps = createI2PSocket(dest); i2ps.setReadTimeout(readTimeout); - StringBuffer expectedPong = new StringBuffer(); + StringBuilder expectedPong = new StringBuilder(); Thread in = new I2PThread(new IrcInboundFilter(s,i2ps, expectedPong), "IRC Client " + __clientId + " in"); in.start(); Thread out = new I2PThread(new IrcOutboundFilter(s,i2ps, expectedPong), "IRC Client " + __clientId + " out"); @@ -121,9 +121,9 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable private Socket local; private I2PSocket remote; - private StringBuffer expectedPong; + private StringBuilder expectedPong; - IrcInboundFilter(Socket _local, I2PSocket _remote, StringBuffer pong) { + IrcInboundFilter(Socket _local, I2PSocket _remote, StringBuilder pong) { local=_local; remote=_remote; expectedPong=pong; @@ -195,9 +195,9 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable private Socket local; private I2PSocket remote; - private StringBuffer expectedPong; + private StringBuilder expectedPong; - IrcOutboundFilter(Socket _local, I2PSocket _remote, StringBuffer pong) { + IrcOutboundFilter(Socket _local, I2PSocket _remote, StringBuilder pong) { local=_local; remote=_remote; expectedPong=pong; @@ -266,7 +266,7 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable * */ - public String inboundFilter(String s, StringBuffer expectedPong) { + public String inboundFilter(String s, StringBuilder expectedPong) { String field[]=s.split(" ",4); String command; @@ -353,7 +353,7 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable return null; } - public String outboundFilter(String s, StringBuffer expectedPong) { + public String outboundFilter(String s, StringBuilder expectedPong) { String field[]=s.split(" ",3); String command; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCServer.java index 2e209dbd7..6e0427095 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCServer.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCServer.java @@ -135,7 +135,7 @@ public class I2PTunnelIRCServer extends I2PTunnelServer implements Runnable { /** keep reading until we see USER or SERVER */ private String filterRegistration(InputStream in, String newHostname) throws IOException { - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); int lineCount = 0; while (true) { diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java index f57ecd23d..1f358abf0 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java @@ -211,7 +211,7 @@ public class I2Ping extends I2PTunnelTask implements Runnable { int fail = 0; long totalTime = 0; int cnt = countPing ? CPING_COUNT : PING_COUNT; - StringBuffer pingResults = new StringBuffer(2 * cnt + destination.length() + 3); + StringBuilder pingResults = new StringBuilder(2 * cnt + destination.length() + 3); for (int i = 0; i < cnt; i++) { boolean sent; sent = ping(dest); diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java index 3dbcfea30..6efff96e5 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java @@ -385,7 +385,7 @@ public class TunnelController implements Logging { public String getI2CPHost() { return _config.getProperty("i2cpHost"); } public String getI2CPPort() { return _config.getProperty("i2cpPort"); } public String getClientOptions() { - StringBuffer opts = new StringBuffer(64); + StringBuilder opts = new StringBuilder(64); for (Iterator iter = _config.keySet().iterator(); iter.hasNext(); ) { String key = (String)iter.next(); String val = _config.getProperty(key); @@ -447,7 +447,7 @@ public class TunnelController implements Logging { return true; } - public void getSummary(StringBuffer buf) { + public void getSummary(StringBuilder buf) { String type = getType(); if ("httpclient".equals(type)) getHttpClientSummary(buf); @@ -461,7 +461,7 @@ public class TunnelController implements Logging { buf.append("Unknown type ").append(type); } - private void getHttpClientSummary(StringBuffer buf) { + private void getHttpClientSummary(StringBuilder buf) { String description = getDescription(); if ( (description != null) && (description.trim().length() > 0) ) buf.append("").append(description).append("
\n"); @@ -482,7 +482,7 @@ public class TunnelController implements Logging { getOptionSummary(buf); } - private void getClientSummary(StringBuffer buf) { + private void getClientSummary(StringBuilder buf) { String description = getDescription(); if ( (description != null) && (description.trim().length() > 0) ) buf.append("").append(description).append("
\n"); @@ -499,7 +499,7 @@ public class TunnelController implements Logging { getOptionSummary(buf); } - private void getServerSummary(StringBuffer buf) { + private void getServerSummary(StringBuilder buf) { String description = getDescription(); if ( (description != null) && (description.trim().length() > 0) ) buf.append("").append(description).append("
\n"); @@ -510,7 +510,7 @@ public class TunnelController implements Logging { getOptionSummary(buf); } - private void getHttpServerSummary(StringBuffer buf) { + private void getHttpServerSummary(StringBuilder buf) { String description = getDescription(); if ( (description != null) && (description.trim().length() > 0) ) buf.append("").append(description).append("
\n"); @@ -522,7 +522,7 @@ public class TunnelController implements Logging { getOptionSummary(buf); } - private void getOptionSummary(StringBuffer buf) { + private void getOptionSummary(StringBuilder buf) { String opts = getClientOptions(); if ( (opts != null) && (opts.length() > 0) ) buf.append("Network options: ").append(opts).append("
\n"); diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java index 88877ff4c..b077179e0 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java @@ -245,7 +245,7 @@ public class TunnelControllerGroup { map.putAll(cur); } - StringBuffer buf = new StringBuffer(1024); + StringBuilder buf = new StringBuilder(1024); for (Iterator iter = map.keySet().iterator(); iter.hasNext(); ) { String key = (String)iter.next(); String val = (String)map.get(key); diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS4aServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS4aServer.java index 23ec70c3f..ef88102cf 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS4aServer.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS4aServer.java @@ -123,7 +123,7 @@ public class SOCKS4aServer extends SOCKSServer { } private String readString(DataInputStream in) throws IOException { - StringBuffer sb = new StringBuffer(16); + StringBuilder sb = new StringBuilder(16); char c; while ((c = (char) (in.readByte() & 0xff)) != 0) sb.append(c); diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java index d606467c5..fe1096eea 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java @@ -223,7 +223,7 @@ public class EditBean extends IndexBean { if (tun != null) { Properties opts = getOptions(tun); if (opts == null) return ""; - StringBuffer buf = new StringBuffer(64); + StringBuilder buf = new StringBuilder(64); int i = 0; for (Iterator iter = opts.keySet().iterator(); iter.hasNext(); ) { String key = (String)iter.next(); diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java index 4c23ced34..48bb984b6 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java @@ -302,7 +302,7 @@ public class IndexBean { if (_group == null) return ""; - StringBuffer buf = new StringBuffer(512); + StringBuilder buf = new StringBuilder(512); if (_action != null) { try { buf.append(processAction()).append("\n"); @@ -927,11 +927,11 @@ public class IndexBean { } private String getMessages(List msgs) { - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); getMessages(msgs, buf); return buf.toString(); } - private void getMessages(List msgs, StringBuffer buf) { + private void getMessages(List msgs, StringBuilder buf) { if (msgs == null) return; for (int i = 0; i < msgs.size(); i++) { buf.append((String)msgs.get(i)).append("\n"); diff --git a/apps/i2ptunnel/jsp/editClient.jsp b/apps/i2ptunnel/jsp/editClient.jsp index 4f0a5a338..26e40afad 100644 --- a/apps/i2ptunnel/jsp/editClient.jsp +++ b/apps/i2ptunnel/jsp/editClient.jsp @@ -18,7 +18,7 @@ <% if (editBean.allowCSS()) { - %> + %> <% } @@ -388,7 +388,7 @@ - + (if known) diff --git a/apps/i2ptunnel/jsp/editServer.jsp b/apps/i2ptunnel/jsp/editServer.jsp index 3a958fd42..2acc75183 100644 --- a/apps/i2ptunnel/jsp/editServer.jsp +++ b/apps/i2ptunnel/jsp/editServer.jsp @@ -18,7 +18,7 @@ <% if (editBean.allowCSS()) { - %> + %> <% } @@ -148,7 +148,7 @@ - + <% if (!"".equals(editBean.getDestinationBase64(curTunnel))) { %> Add to local addressbook <% } %> @@ -270,7 +270,7 @@ - +
diff --git a/apps/i2ptunnel/jsp/index.jsp b/apps/i2ptunnel/jsp/index.jsp index 3454b7eec..8f506c8d0 100644 --- a/apps/i2ptunnel/jsp/index.jsp +++ b/apps/i2ptunnel/jsp/index.jsp @@ -11,7 +11,7 @@ p-equiv="Content-Type" content="text/html; charset=UTF-8" /> <% if (indexBean.allowCSS()) { - %> + %> <% } @@ -77,7 +77,7 @@ p-equiv="Content-Type" content="text/html; charset=UTF-8" /> %>
- <%=indexBean.getTunnelName(curClient)%> + <%=indexBean.getTunnelName(curClient)%> (Edit)
@@ -193,7 +193,7 @@ p-equiv="Content-Type" content="text/html; charset=UTF-8" /> %>
- <%=indexBean.getTunnelName(curServer)%> + <%=indexBean.getTunnelName(curServer)%> (Edit)
diff --git a/apps/jetty/java/src/org/mortbay/http/I2PRequestLog.java b/apps/jetty/java/src/org/mortbay/http/I2PRequestLog.java index 4c96e49f2..c83756332 100644 --- a/apps/jetty/java/src/org/mortbay/http/I2PRequestLog.java +++ b/apps/jetty/java/src/org/mortbay/http/I2PRequestLog.java @@ -88,7 +88,7 @@ public class I2PRequestLog extends NCSARequestLog if (_fileOut==null) return; - StringBuffer buf = new StringBuffer(160); + StringBuilder buf = new StringBuilder(160); String addr = request.getField("X-I2P-DestHash"); if(addr != null) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHelper.java index 3ab6354a6..5bffa2a21 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHelper.java @@ -10,7 +10,7 @@ public class ConfigAdvancedHelper extends HelperBase { public ConfigAdvancedHelper() {} public String getSettings() { - StringBuffer buf = new StringBuffer(4*1024); + StringBuilder buf = new StringBuilder(4*1024); Set names = _context.router().getConfigSettings(); TreeSet sortedNames = new TreeSet(names); for (Iterator iter = sortedNames.iterator(); iter.hasNext(); ) { 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 7acccdc49..02b31e884 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java @@ -13,7 +13,7 @@ public class ConfigClientsHelper extends HelperBase { public ConfigClientsHelper() {} public String getForm1() { - StringBuffer buf = new StringBuffer(1024); + StringBuilder buf = new StringBuilder(1024); buf.append("\n"); buf.append("\n"); @@ -29,7 +29,7 @@ public class ConfigClientsHelper extends HelperBase { } public String getForm2() { - StringBuffer buf = new StringBuffer(1024); + StringBuilder buf = new StringBuilder(1024); buf.append("
ClientRun at Startup?Start NowClass and arguments
\n"); buf.append("\n"); Properties props = RouterConsoleRunner.webAppProperties(); @@ -46,7 +46,7 @@ public class ConfigClientsHelper extends HelperBase { return buf.toString(); } - private void renderForm(StringBuffer buf, String index, String name, boolean urlify, boolean enabled, boolean ro, String desc) { + private void renderForm(StringBuilder buf, String index, String name, boolean urlify, boolean enabled, boolean ro, String desc) { buf.append("
WebAppRun at Startup?Start NowDescription
"); if (urlify && enabled) { String link = "/"; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java index 635d2e544..fa32340a8 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java @@ -29,7 +29,7 @@ public class ConfigLoggingHelper extends HelperBase { return (bytes/(1024)) + "k"; } public String getLogLevelTable() { - StringBuffer buf = new StringBuffer(32*1024); + StringBuilder buf = new StringBuilder(32*1024); Properties limits = _context.logManager().getLimits(); TreeSet sortedLogs = new TreeSet(); for (Iterator iter = limits.keySet().iterator(); iter.hasNext(); ) { @@ -51,7 +51,7 @@ public class ConfigLoggingHelper extends HelperBase { } public String getDefaultLogLevelBox() { String cur = _context.logManager().getDefaultLimit(); - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append("\n"); boolean found = false; for (int i = 30; i <= 110; i += 10) { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java index 7ae7181bc..c9ab42dde 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java @@ -71,7 +71,7 @@ public class ConfigRestartBean { /** @param s value,label,... pairs */ private static String buttons(String url, String nonce, String s) { - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); StringTokenizer tok = new StringTokenizer(s, ","); buf.append("
\n"); buf.append("\n"); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHandler.java index 00d2f509d..00a384e73 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHandler.java @@ -102,7 +102,7 @@ public class ConfigStatsHandler extends FormHandler { } } - StringBuffer stats = new StringBuffer(); + StringBuilder stats = new StringBuilder(); for (int i = 0; i < _stats.size(); i++) { stats.append((String)_stats.get(i)); if (i + 1 < _stats.size()) 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 f1a63e421..d73b75765 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java @@ -13,7 +13,7 @@ public class ConfigTunnelsHelper extends HelperBase { public String getForm() { - StringBuffer buf = new StringBuffer(1024); + StringBuilder buf = new StringBuilder(1024); buf.append("\n"); TunnelPoolSettings exploratoryIn = _context.tunnelManager().getInboundSettings(); TunnelPoolSettings exploratoryOut = _context.tunnelManager().getOutboundSettings(); @@ -54,7 +54,7 @@ public class ConfigTunnelsHelper extends HelperBase { private static final int MAX_BACKUP_QUANTITY = 3; private static final int MAX_VARIANCE = 2; private static final int MIN_NEG_VARIANCE = -1; - private void renderForm(StringBuffer buf, int index, String prefix, String name, TunnelPoolSettings in, TunnelPoolSettings out) { + private void renderForm(StringBuilder buf, int index, String prefix, String name, TunnelPoolSettings in, TunnelPoolSettings out) { buf.append("\n"); @@ -179,7 +179,7 @@ public class ConfigTunnelsHelper extends HelperBase { buf.append("\n"); } - private void renderOptions(StringBuffer buf, int min, int max, int now, String prefix, String name) { + private void renderOptions(StringBuilder buf, int min, int max, int now, String prefix, String name) { for (int i = min; i <= max; i++) { buf.append("
"); buf.append(name).append("
- +
Dest. name, hash, or full key: - +
Session Key:
diff --git a/apps/sam/java/src/net/i2p/sam/SAMUtils.java b/apps/sam/java/src/net/i2p/sam/SAMUtils.java index 61578e333..859154c4f 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMUtils.java +++ b/apps/sam/java/src/net/i2p/sam/SAMUtils.java @@ -155,7 +155,7 @@ public class SAMUtils { String token, param; Properties props = new Properties(); - StringBuffer value = new StringBuffer(); + StringBuilder value = new StringBuilder(); for (int i = 0; i < ntoks; ++i) { token = tok.nextToken(); diff --git a/apps/streaming/java/src/net/i2p/client/streaming/Connection.java b/apps/streaming/java/src/net/i2p/client/streaming/Connection.java index e6d99c473..94ec5532c 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/Connection.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/Connection.java @@ -899,7 +899,7 @@ public class Connection { if (_log.shouldLog(Log.WARN)) _log.warn("Closing connection due to inactivity"); if (_log.shouldLog(Log.DEBUG)) { - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append("last sent was: ").append(_context.clock().now() - _lastSendTime); buf.append("ms ago, last received was: ").append(_context.clock().now()-_lastReceivedOn); buf.append("ms ago, inactivity timeout is: ").append(_options.getInactivityTimeout()); @@ -934,7 +934,7 @@ public class Connection { @Override public String toString() { - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append("[Connection "); if (_receiveStreamId > 0) buf.append(Packet.toId(_receiveStreamId)); diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java index 740fdcf82..c7084b4e7 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java @@ -475,7 +475,7 @@ public class ConnectionOptions extends I2PSocketOptionsImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append("conDelay=").append(_connectDelay); buf.append(" maxSize=").append(_maxMessageSize); buf.append(" rtt=").append(_rtt); diff --git a/apps/streaming/java/src/net/i2p/client/streaming/MessageInputStream.java b/apps/streaming/java/src/net/i2p/client/streaming/MessageInputStream.java index 7b87e5583..ad4795c07 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/MessageInputStream.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/MessageInputStream.java @@ -174,7 +174,7 @@ public class MessageInputStream extends InputStream { public void closeReceived() { synchronized (_dataLock) { if (_log.shouldLog(Log.DEBUG)) { - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append("Close received, ready bytes: "); long available = 0; for (int i = 0; i < _readyDataBlocks.size(); i++) diff --git a/apps/streaming/java/src/net/i2p/client/streaming/Packet.java b/apps/streaming/java/src/net/i2p/client/streaming/Packet.java index 8fc0f02fa..2a6ae59ad 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/Packet.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/Packet.java @@ -598,12 +598,12 @@ public class Packet { @Override public String toString() { - StringBuffer str = formatAsString(); + StringBuilder str = formatAsString(); return str.toString(); } - protected StringBuffer formatAsString() { - StringBuffer buf = new StringBuffer(64); + protected StringBuilder formatAsString() { + StringBuilder buf = new StringBuilder(64); buf.append(toId(_sendStreamId)); //buf.append("<-->"); buf.append(toId(_receiveStreamId)).append(": #").append(_sequenceNum); @@ -629,7 +629,7 @@ public class Packet { } private final String toFlagString() { - StringBuffer buf = new StringBuffer(32); + StringBuilder buf = new StringBuilder(32); if (isFlagSet(FLAG_CLOSE)) buf.append(" CLOSE"); if (isFlagSet(FLAG_DELAY_REQUESTED)) buf.append(" DELAY ").append(_optionDelay); if (isFlagSet(FLAG_ECHO)) buf.append(" ECHO"); diff --git a/apps/streaming/java/src/net/i2p/client/streaming/PacketHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/PacketHandler.java index ff43293a0..bbb5a9536 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/PacketHandler.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/PacketHandler.java @@ -112,7 +112,7 @@ public class PacketHandler { private static final SimpleDateFormat _fmt = new SimpleDateFormat("HH:mm:ss.SSS"); void displayPacket(Packet packet, String prefix, String suffix) { if (!_log.shouldLog(Log.INFO)) return; - StringBuffer buf = new StringBuffer(256); + StringBuilder buf = new StringBuilder(256); synchronized (_fmt) { buf.append(_fmt.format(new Date())); } @@ -198,7 +198,7 @@ public class PacketHandler { // someone is sending us a packet on the wrong stream if (_log.shouldLog(Log.ERROR)) { Set cons = _manager.listConnections(); - StringBuffer buf = new StringBuffer(512); + StringBuilder buf = new StringBuilder(512); buf.append("Received a packet on the wrong stream: "); buf.append(packet); buf.append(" connection: "); @@ -275,7 +275,7 @@ public class PacketHandler { _log.warn("Packet belongs to no other cons, putting on the syn queue: " + packet); } if (_log.shouldLog(Log.DEBUG)) { - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); Set cons = _manager.listConnections(); for (Iterator iter = cons.iterator(); iter.hasNext(); ) { Connection con = (Connection)iter.next(); diff --git a/apps/streaming/java/src/net/i2p/client/streaming/PacketLocal.java b/apps/streaming/java/src/net/i2p/client/streaming/PacketLocal.java index 827be5b04..9ed29b50f 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/PacketLocal.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/PacketLocal.java @@ -133,8 +133,8 @@ public class PacketLocal extends Packet implements MessageOutputStream.WriteStat public void setResendPacketEvent(SimpleTimer2.TimedEvent evt) { _resendEvent = evt; } @Override - public StringBuffer formatAsString() { - StringBuffer buf = super.formatAsString(); + public StringBuilder formatAsString() { + StringBuilder buf = super.formatAsString(); Connection con = _connection; if (con != null) diff --git a/apps/susidns/src/java/src/i2p/susi/dns/ConfigBean.java b/apps/susidns/src/java/src/i2p/susi/dns/ConfigBean.java index 8cddafdc4..7dad7a250 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/ConfigBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/ConfigBean.java @@ -83,7 +83,7 @@ public class ConfigBean implements Serializable { { File file = new File( configFileName ); if( file != null && file.isFile() ) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); BufferedReader br = null; try { br = new BufferedReader( new FileReader( file ) ); diff --git a/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java b/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java index 9d16701f9..56a42208b 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java @@ -86,7 +86,7 @@ public class SubscriptionsBean { File file = new File( getFileName() ); if( file != null && file.isFile() ) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); BufferedReader br = null; try { br = new BufferedReader( new FileReader( file ) ); diff --git a/apps/susidns/src/jsp/addressbook.jsp b/apps/susidns/src/jsp/addressbook.jsp index d3cf0c3b4..cb3eb32c5 100644 --- a/apps/susidns/src/jsp/addressbook.jsp +++ b/apps/susidns/src/jsp/addressbook.jsp @@ -143,7 +143,7 @@ ${addr.name} - (addrhlpr)
@@ -168,7 +168,7 @@

Add new destination:

Hostname: -Destination:
+Destination:

diff --git a/apps/susimail/src/src/i2p/susi/webmail/Mail.java b/apps/susimail/src/src/i2p/susi/webmail/Mail.java index a60f9b93c..80f6d67bf 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/Mail.java +++ b/apps/susimail/src/src/i2p/susi/webmail/Mail.java @@ -142,7 +142,7 @@ public class Mail { } return ok; } - public static void appendRecipients( StringBuffer buf, ArrayList recipients, String prefix ) + public static void appendRecipients( StringBuilder buf, ArrayList recipients, String prefix ) { for( Iterator it = recipients.iterator(); it.hasNext(); ) { buf.append( prefix ); diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java index 6e9fad1c5..8d3086c74 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java +++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java @@ -444,7 +444,7 @@ public class WebMail extends HttpServlet boolean showBody = false; boolean prepareAttachment = false; String reason = ""; - StringBuffer body = null; + StringBuilder body = null; String ident = quoteHTML( ( mailPart.description != null ? mailPart.description + ", " : "" ) + @@ -485,7 +485,7 @@ public class WebMail extends HttpServlet try { ReadBuffer decoded = e.decode( mailPart.buffer.content, mailPart.beginBody, mailPart.end - mailPart.beginBody ); BufferedReader reader = new BufferedReader( new InputStreamReader( new ByteArrayInputStream( decoded.content, decoded.offset, decoded.length ), charset ) ); - body = new StringBuffer(); + body = new StringBuilder(); String line; while( ( line = reader.readLine() ) != null ) { body.append( quoteHTML( line ) ); @@ -782,7 +782,7 @@ public class WebMail extends HttpServlet /* * extract additional recipients */ - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); String pad = ""; if( mail.to != null ) { for( int i = 0; i < mail.to.length; i++ ) { @@ -1429,7 +1429,7 @@ public class WebMail extends HttpServlet } if( ok ) { - StringBuffer body = new StringBuffer(); + StringBuilder body = new StringBuilder(); body.append( "From: " + from + "\r\n" ); Mail.appendRecipients( body, toList, "To: " ); Mail.appendRecipients( body, ccList, "To: " ); diff --git a/apps/susimail/src/src/i2p/susi/webmail/encoding/Base64.java b/apps/susimail/src/src/i2p/susi/webmail/encoding/Base64.java index f9d47152b..b6c8ffaf5 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/encoding/Base64.java +++ b/apps/susimail/src/src/i2p/susi/webmail/encoding/Base64.java @@ -70,7 +70,7 @@ public class Base64 implements Encoding { */ private String encode( InputStream in ) throws IOException, EncodingException { - StringBuffer strBuf = new StringBuffer(); + StringBuilder strBuf = new StringBuilder(); int buf[] = new int[3]; int out[] = new int[4]; diff --git a/apps/susimail/src/src/i2p/susi/webmail/encoding/HeaderLine.java b/apps/susimail/src/src/i2p/susi/webmail/encoding/HeaderLine.java index 9eca318fb..96dab5295 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/encoding/HeaderLine.java +++ b/apps/susimail/src/src/i2p/susi/webmail/encoding/HeaderLine.java @@ -55,7 +55,7 @@ public class HeaderLine implements Encoding { private static final int BUFSIZE = 2; private String encode(InputStream in) throws IOException { - StringBuffer out = new StringBuffer(); + StringBuilder out = new StringBuilder(); int l = 0, buffered = 0, tmp[] = new int[BUFSIZE]; boolean quoting = false; boolean quote = false; diff --git a/apps/susimail/src/src/i2p/susi/webmail/encoding/QuotedPrintable.java b/apps/susimail/src/src/i2p/susi/webmail/encoding/QuotedPrintable.java index f42d3ecea..5a98c6a05 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/encoding/QuotedPrintable.java +++ b/apps/susimail/src/src/i2p/susi/webmail/encoding/QuotedPrintable.java @@ -69,7 +69,7 @@ public class QuotedPrintable implements Encoding { */ private static int BUFSIZE = 2; private String encode( InputStream in ) throws EncodingException, IOException { - StringBuffer out = new StringBuffer(); + StringBuilder out = new StringBuilder(); int l = 0; int read = 0, buffered = 0, tmp[] = new int[BUFSIZE]; while( true ) { diff --git a/core/java/src/com/nettgryppa/security/HashCash.java b/core/java/src/com/nettgryppa/security/HashCash.java index 7d4e16e92..6cee4c935 100644 --- a/core/java/src/com/nettgryppa/security/HashCash.java +++ b/core/java/src/com/nettgryppa/security/HashCash.java @@ -323,7 +323,7 @@ private static long bytesToLong(byte[] b) { if(null == extensions || extensions.isEmpty()) return ""; - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); List tempList; boolean first = true; diff --git a/core/java/src/freenet/support/CPUInformation/CPUID.java b/core/java/src/freenet/support/CPUInformation/CPUID.java index e145c3795..378791ccf 100644 --- a/core/java/src/freenet/support/CPUInformation/CPUID.java +++ b/core/java/src/freenet/support/CPUInformation/CPUID.java @@ -74,7 +74,7 @@ public class CPUID { private static String getCPUVendorID() { CPUIDResult c = doCPUID(0); - StringBuffer sb= new StringBuffer(13); + StringBuilder sb= new StringBuilder(13); sb.append((char)( c.EBX & 0xFF)); sb.append((char)((c.EBX >> 8) & 0xFF)); sb.append((char)((c.EBX >> 16) & 0xFF)); diff --git a/core/java/src/net/i2p/client/naming/PetName.java b/core/java/src/net/i2p/client/naming/PetName.java index 128fb9811..38d27b608 100644 --- a/core/java/src/net/i2p/client/naming/PetName.java +++ b/core/java/src/net/i2p/client/naming/PetName.java @@ -124,7 +124,7 @@ public class PetName { @Override public String toString() { - StringBuffer buf = new StringBuffer(256); + StringBuilder buf = new StringBuilder(256); if (_name != null) buf.append(_name.trim()); buf.append(':'); if (_network != null) buf.append(_network.trim()); diff --git a/core/java/src/net/i2p/crypto/ElGamalEngine.java b/core/java/src/net/i2p/crypto/ElGamalEngine.java index 8733e26cf..ae82613c7 100644 --- a/core/java/src/net/i2p/crypto/ElGamalEngine.java +++ b/core/java/src/net/i2p/crypto/ElGamalEngine.java @@ -130,7 +130,7 @@ public class ElGamalEngine { System.arraycopy(dbytes, 0, out, (dbytes.length < 257 ? 514 - dbytes.length : 257), (dbytes.length > 257 ? 257 : dbytes.length)); /* - StringBuffer buf = new StringBuffer(1024); + StringBuilder buf = new StringBuilder(1024); buf.append("Timing\n"); buf.append("0-1: ").append(t1 - t0).append('\n'); buf.append("1-2: ").append(t2 - t1).append('\n'); diff --git a/core/java/src/net/i2p/crypto/SHA1Test.java b/core/java/src/net/i2p/crypto/SHA1Test.java index de1bf1b81..2c532c5cd 100644 --- a/core/java/src/net/i2p/crypto/SHA1Test.java +++ b/core/java/src/net/i2p/crypto/SHA1Test.java @@ -179,7 +179,7 @@ public class SHA1Test { } private static final String toHex(final byte[] bytes) { - StringBuffer buf = new StringBuffer(bytes.length * 2); + StringBuilder buf = new StringBuilder(bytes.length * 2); for (int i = 0; i < bytes.length; i++) { if ((i & 3) == 0 && i != 0) buf.append(' '); diff --git a/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java b/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java index 9bda56119..f9661240b 100644 --- a/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java +++ b/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java @@ -452,12 +452,12 @@ public class TransientSessionKeyManager extends SessionKeyManager { int removed = 0; int remaining = 0; long now = _context.clock().now(); - StringBuffer buf = null; - StringBuffer bufSummary = null; + StringBuilder buf = null; + StringBuilder bufSummary = null; if (_log.shouldLog(Log.DEBUG)) { - buf = new StringBuffer(128); + buf = new StringBuilder(128); buf.append("Expiring inbound: "); - bufSummary = new StringBuffer(1024); + bufSummary = new StringBuilder(1024); } synchronized (_inboundTagSets) { for (Iterator iter = _inboundTagSets.keySet().iterator(); iter.hasNext();) { @@ -500,7 +500,7 @@ public class TransientSessionKeyManager extends SessionKeyManager { } public String renderStatusHTML() { - StringBuffer buf = new StringBuffer(1024); + StringBuilder buf = new StringBuilder(1024); buf.append("

Inbound sessions

"); buf.append(""); Set inbound = getInboundTagSets(); diff --git a/core/java/src/net/i2p/crypto/TrustedUpdate.java b/core/java/src/net/i2p/crypto/TrustedUpdate.java index 469809beb..102442156 100644 --- a/core/java/src/net/i2p/crypto/TrustedUpdate.java +++ b/core/java/src/net/i2p/crypto/TrustedUpdate.java @@ -255,16 +255,16 @@ D8usM7Dxp5yrDrCYZ5AIijc= } private static final String sanitize(String versionString) { - StringBuffer versionStringBuffer = new StringBuffer(versionString); + StringBuilder versionStringBuilder = new StringBuilder(versionString); - for (int i = 0; i < versionStringBuffer.length(); i++) { - if (VALID_VERSION_CHARS.indexOf(versionStringBuffer.charAt(i)) == -1) { - versionStringBuffer.deleteCharAt(i); + for (int i = 0; i < versionStringBuilder.length(); i++) { + if (VALID_VERSION_CHARS.indexOf(versionStringBuilder.charAt(i)) == -1) { + versionStringBuilder.deleteCharAt(i); i--; } } - return versionStringBuffer.toString(); + return versionStringBuilder.toString(); } private static final void showUsageCLI() { @@ -328,7 +328,7 @@ D8usM7Dxp5yrDrCYZ5AIijc= * delimited by CR LF line breaks. */ public String getTrustedKeysString() { - StringBuffer buf = new StringBuffer(1024); + StringBuilder buf = new StringBuilder(1024); for (int i = 0; i < _trustedKeys.size(); i++) { // If something already buffered, first add line break. if (buf.length() > 0) buf.append("\r\n"); diff --git a/core/java/src/net/i2p/data/Address.java b/core/java/src/net/i2p/data/Address.java index 205c448ff..3a69a232f 100644 --- a/core/java/src/net/i2p/data/Address.java +++ b/core/java/src/net/i2p/data/Address.java @@ -73,7 +73,7 @@ public class Address extends DataStructureImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(64); + StringBuilder buf = new StringBuilder(64); buf.append("[Address: "); buf.append("\n\tHostname: ").append(getHostname()); buf.append("\n\tDestination: ").append(getDestination()); diff --git a/core/java/src/net/i2p/data/Base32.java b/core/java/src/net/i2p/data/Base32.java index b2cc2d548..adb7e9196 100644 --- a/core/java/src/net/i2p/data/Base32.java +++ b/core/java/src/net/i2p/data/Base32.java @@ -137,7 +137,7 @@ public class Base32 { } public static String encode(byte[] source) { - StringBuffer buf = new StringBuffer((source.length + 7) * 8 / 5); + StringBuilder buf = new StringBuilder((source.length + 7) * 8 / 5); encodeBytes(source, buf); return buf.toString(); } @@ -149,7 +149,7 @@ public class Base32 { * * @param source The data to convert */ - private static void encodeBytes(byte[] source, StringBuffer out) { + private static void encodeBytes(byte[] source, StringBuilder out) { int usedbits = 0; for (int i = 0; i < source.length; ) { int fivebits; diff --git a/core/java/src/net/i2p/data/Base64.java b/core/java/src/net/i2p/data/Base64.java index 58ec48d24..2b9fe85e6 100644 --- a/core/java/src/net/i2p/data/Base64.java +++ b/core/java/src/net/i2p/data/Base64.java @@ -330,7 +330,7 @@ public class Base64 { } // end switch } // end encode3to4 - private static void encode3to4(byte[] source, int srcOffset, int numSigBytes, StringBuffer buf, byte alpha[]) { + private static void encode3to4(byte[] source, int srcOffset, int numSigBytes, StringBuilder buf, byte alpha[]) { // 1 2 3 // 01234567890123456789012345678901 Bit position // --------000000001111111122222222 Array position from threeBytes @@ -394,7 +394,7 @@ public class Base64 { private static String safeEncode(byte[] source, int off, int len, boolean useStandardAlphabet) { if (len + off > source.length) throw new ArrayIndexOutOfBoundsException("Trying to encode too much! source.len=" + source.length + " off=" + off + " len=" + len); - StringBuffer buf = new StringBuffer(len * 4 / 3); + StringBuilder buf = new StringBuilder(len * 4 / 3); if (useStandardAlphabet) encodeBytes(source, off, len, false, buf, ALPHABET); else @@ -446,7 +446,7 @@ public class Base64 { ******/ private static String encodeBytes(byte[] source, int off, int len, boolean breakLines) { - StringBuffer buf = new StringBuffer( (len*4)/3 ); + StringBuilder buf = new StringBuilder( (len*4)/3 ); encodeBytes(source, off, len, breakLines, buf, ALPHABET); return buf.toString(); } @@ -460,7 +460,7 @@ public class Base64 { * @param breakLines Break lines at 80 characters or less. * @since 1.4 */ - private static void encodeBytes(byte[] source, int off, int len, boolean breakLines, StringBuffer out, byte alpha[]) { + private static void encodeBytes(byte[] source, int off, int len, boolean breakLines, StringBuilder out, byte alpha[]) { //int len43 = len * 4 / 3; //byte[] outBuff = new byte[(len43) // Main 4:3 // + ((len % 3) > 0 ? 4 : 0) // Account for padding diff --git a/core/java/src/net/i2p/data/Certificate.java b/core/java/src/net/i2p/data/Certificate.java index 0d89fcdd8..9dcc431e5 100644 --- a/core/java/src/net/i2p/data/Certificate.java +++ b/core/java/src/net/i2p/data/Certificate.java @@ -149,7 +149,7 @@ public class Certificate extends DataStructureImpl { } @Override public String toString() { - StringBuffer buf = new StringBuffer(64); + StringBuilder buf = new StringBuilder(64); buf.append("[Certificate: type: "); if (getCertificateType() == CERTIFICATE_TYPE_NULL) buf.append("Null certificate"); diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java index 53e32a347..b3806d1b9 100644 --- a/core/java/src/net/i2p/data/DataHelper.java +++ b/core/java/src/net/i2p/data/DataHelper.java @@ -196,7 +196,7 @@ public class DataHelper { * */ public static String toString(Properties options) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); if (options != null) { for (Iterator iter = options.keySet().iterator(); iter.hasNext();) { String key = (String) iter.next(); @@ -273,7 +273,7 @@ public class DataHelper { * */ public static String toString(Collection col) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); if (col != null) { for (Iterator iter = col.iterator(); iter.hasNext();) { Object o = iter.next(); @@ -296,17 +296,17 @@ public class DataHelper { public static String toString(byte buf[], int len) { if (buf == null) buf = EMPTY_BUFFER; - StringBuffer out = new StringBuffer(); + StringBuilder out = new StringBuilder(); if (len > buf.length) { for (int i = 0; i < len - buf.length; i++) out.append("00"); } for (int i = 0; i < buf.length && i < len; i++) { - StringBuffer temp = new StringBuffer(Integer.toHexString(buf[i])); + StringBuilder temp = new StringBuilder(Integer.toHexString(buf[i])); while (temp.length() < 2) { temp.insert(0, '0'); } - temp = new StringBuffer(temp.substring(temp.length() - 2)); + temp = new StringBuilder(temp.substring(temp.length() - 2)); out.append(temp.toString()); } return out.toString(); @@ -775,19 +775,27 @@ public class DataHelper { /** * Read a newline delimited line from the stream, returning the line (without * the newline), or null if EOF reached before the newline was found + * Warning - strips \n but not \r */ public static String readLine(InputStream in) throws IOException { return readLine(in, (Sha256Standalone)null); } - /** update the hash along the way */ + + /** + * update the hash along the way + * Warning - strips \n but not \r + */ public static String readLine(InputStream in, Sha256Standalone hash) throws IOException { - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); boolean ok = readLine(in, buf, hash); if (ok) return buf.toString(); else return null; } + /** * Read in a line, placing it into the buffer (excluding the newline). + * Warning - strips \n but not \r + * @deprecated use StringBuilder version * * @return true if the line was read, false if eof was reached before a * newline was found @@ -795,7 +803,12 @@ public class DataHelper { public static boolean readLine(InputStream in, StringBuffer buf) throws IOException { return readLine(in, buf, null); } - /** update the hash along the way */ + + /** + * update the hash along the way + * Warning - strips \n but not \r + * @deprecated use StringBuilder version + */ public static boolean readLine(InputStream in, StringBuffer buf, Sha256Standalone hash) throws IOException { int c = -1; while ( (c = in.read()) != -1) { @@ -810,6 +823,32 @@ public class DataHelper { return true; } + /** + * Read in a line, placing it into the buffer (excluding the newline). + * Warning - strips \n but not \r + * + * @return true if the line was read, false if eof was reached before a + * newline was found + */ + public static boolean readLine(InputStream in, StringBuilder buf) throws IOException { + return readLine(in, buf, null); + } + + /** + * update the hash along the way + * Warning - strips \n but not \r + */ + public static boolean readLine(InputStream in, StringBuilder buf, Sha256Standalone hash) throws IOException { + int c = -1; + while ( (c = in.read()) != -1) { + if (hash != null) hash.update((byte)c); + if (c == '\n') + break; + buf.append((char)c); + } + return c != -1; + } + public static void write(OutputStream out, byte data[], Sha256Standalone hash) throws IOException { hash.update(data); out.write(data); diff --git a/core/java/src/net/i2p/data/Destination.java b/core/java/src/net/i2p/data/Destination.java index 791dc1209..5946056b3 100644 --- a/core/java/src/net/i2p/data/Destination.java +++ b/core/java/src/net/i2p/data/Destination.java @@ -145,7 +145,7 @@ public class Destination extends DataStructureImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append("[Destination: "); buf.append("\n\tHash: ").append(calculateHash().toBase64()); buf.append("\n\tPublic Key: ").append(getPublicKey()); diff --git a/core/java/src/net/i2p/data/Hash.java b/core/java/src/net/i2p/data/Hash.java index e986b2b5d..c04bc62c4 100644 --- a/core/java/src/net/i2p/data/Hash.java +++ b/core/java/src/net/i2p/data/Hash.java @@ -104,7 +104,7 @@ public class Hash extends DataStructureImpl { } if (_log.shouldLog(Log.DEBUG)) { // explicit buffer, since the compiler can't guess how long it'll be - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append("miss [").append(cached).append("] from "); buf.append(DataHelper.toHexString(getData())).append(" to "); buf.append(DataHelper.toHexString(key.getData())); @@ -113,7 +113,7 @@ public class Hash extends DataStructureImpl { } else { if (_log.shouldLog(Log.DEBUG)) { // explicit buffer, since the compiler can't guess how long it'll be - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append("hit from "); buf.append(DataHelper.toHexString(getData())).append(" to "); buf.append(DataHelper.toHexString(key.getData())); @@ -155,7 +155,7 @@ public class Hash extends DataStructureImpl { @Override public String toString() { if (_stringified == null) { - StringBuffer buf = new StringBuffer(64); + StringBuilder buf = new StringBuilder(64); buf.append("[Hash: "); if (_data == null) { buf.append("null hash"); diff --git a/core/java/src/net/i2p/data/Lease.java b/core/java/src/net/i2p/data/Lease.java index 5f7b3159e..eb22d64cf 100644 --- a/core/java/src/net/i2p/data/Lease.java +++ b/core/java/src/net/i2p/data/Lease.java @@ -147,7 +147,7 @@ public class Lease extends DataStructureImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append("[Lease: "); buf.append("\n\tEnd Date: ").append(getEndDate()); buf.append("\n\tGateway: ").append(getGateway()); diff --git a/core/java/src/net/i2p/data/LeaseSet.java b/core/java/src/net/i2p/data/LeaseSet.java index 66d10da94..3dcbf97a6 100644 --- a/core/java/src/net/i2p/data/LeaseSet.java +++ b/core/java/src/net/i2p/data/LeaseSet.java @@ -355,7 +355,7 @@ public class LeaseSet extends DataStructureImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append("[LeaseSet: "); buf.append("\n\tDestination: ").append(getDestination()); buf.append("\n\tEncryptionKey: ").append(getEncryptionKey()); diff --git a/core/java/src/net/i2p/data/Payload.java b/core/java/src/net/i2p/data/Payload.java index 2c730a236..5f3af7c16 100644 --- a/core/java/src/net/i2p/data/Payload.java +++ b/core/java/src/net/i2p/data/Payload.java @@ -108,7 +108,7 @@ public class Payload extends DataStructureImpl { @Override public String toString() { if (true) return "[Payload]"; - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append("[Payload: "); if (getUnencryptedData() != null) buf.append("\n\tData: ").append(DataHelper.toString(getUnencryptedData(), 16)); diff --git a/core/java/src/net/i2p/data/PrivateKey.java b/core/java/src/net/i2p/data/PrivateKey.java index e6c06dfd2..7ea047314 100644 --- a/core/java/src/net/i2p/data/PrivateKey.java +++ b/core/java/src/net/i2p/data/PrivateKey.java @@ -77,7 +77,7 @@ public class PrivateKey extends DataStructureImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(64); + StringBuilder buf = new StringBuilder(64); buf.append("[PrivateKey: "); if (_data == null) { buf.append("null key"); diff --git a/core/java/src/net/i2p/data/PrivateKeyFile.java b/core/java/src/net/i2p/data/PrivateKeyFile.java index 497733cc4..7ba7f1b6a 100644 --- a/core/java/src/net/i2p/data/PrivateKeyFile.java +++ b/core/java/src/net/i2p/data/PrivateKeyFile.java @@ -263,7 +263,7 @@ public class PrivateKeyFile { } public String toString() { - StringBuffer s = new StringBuffer(128); + StringBuilder s = new StringBuilder(128); s.append("Dest: "); s.append(this.dest != null ? this.dest.toBase64() : "null"); s.append("\nContains: "); diff --git a/core/java/src/net/i2p/data/PublicKey.java b/core/java/src/net/i2p/data/PublicKey.java index aaf25b04a..d653ea9a4 100644 --- a/core/java/src/net/i2p/data/PublicKey.java +++ b/core/java/src/net/i2p/data/PublicKey.java @@ -79,7 +79,7 @@ public class PublicKey extends DataStructureImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(64); + StringBuilder buf = new StringBuilder(64); buf.append("[PublicKey: "); if (_data == null) { buf.append("null key"); diff --git a/core/java/src/net/i2p/data/RouterAddress.java b/core/java/src/net/i2p/data/RouterAddress.java index f87e2b4ce..393bf9621 100644 --- a/core/java/src/net/i2p/data/RouterAddress.java +++ b/core/java/src/net/i2p/data/RouterAddress.java @@ -138,7 +138,7 @@ public class RouterAddress extends DataStructureImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(64); + StringBuilder buf = new StringBuilder(64); buf.append("[RouterAddress: "); buf.append("\n\tTransportStyle: ").append(getTransportStyle()); buf.append("\n\tCost: ").append(getCost()); diff --git a/core/java/src/net/i2p/data/RouterIdentity.java b/core/java/src/net/i2p/data/RouterIdentity.java index c1ad540ef..d7375b290 100644 --- a/core/java/src/net/i2p/data/RouterIdentity.java +++ b/core/java/src/net/i2p/data/RouterIdentity.java @@ -109,7 +109,7 @@ public class RouterIdentity extends DataStructureImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(64); + StringBuilder buf = new StringBuilder(64); buf.append("[RouterIdentity: "); buf.append("\n\tHash: ").append(getHash().toBase64()); buf.append("\n\tCertificate: ").append(getCertificate()); diff --git a/core/java/src/net/i2p/data/RouterInfo.java b/core/java/src/net/i2p/data/RouterInfo.java index 191c72019..e22c033e1 100644 --- a/core/java/src/net/i2p/data/RouterInfo.java +++ b/core/java/src/net/i2p/data/RouterInfo.java @@ -382,7 +382,7 @@ public class RouterInfo extends DataStructureImpl { } else if ((idx = caps.indexOf(cap)) == -1) { return; } else { - StringBuffer buf = new StringBuffer(caps); + StringBuilder buf = new StringBuilder(caps); while ( (idx = buf.indexOf(""+cap)) != -1) buf.deleteCharAt(idx); _options.setProperty(PROP_CAPABILITIES, buf.toString()); @@ -555,7 +555,7 @@ public class RouterInfo extends DataStructureImpl { @Override public String toString() { if (_stringified != null) return _stringified; - StringBuffer buf = new StringBuffer(5*1024); + StringBuilder buf = new StringBuilder(5*1024); buf.append("[RouterInfo: "); buf.append("\n\tIdentity: ").append(getIdentity()); buf.append("\n\tSignature: ").append(getSignature()); diff --git a/core/java/src/net/i2p/data/SessionKey.java b/core/java/src/net/i2p/data/SessionKey.java index a59632592..b89bee505 100644 --- a/core/java/src/net/i2p/data/SessionKey.java +++ b/core/java/src/net/i2p/data/SessionKey.java @@ -84,7 +84,7 @@ public class SessionKey extends DataStructureImpl { @Override public String toString() { if (true) return super.toString(); - StringBuffer buf = new StringBuffer(64); + StringBuilder buf = new StringBuilder(64); buf.append("[SessionKey: "); if (_data == null) { buf.append("null key"); diff --git a/core/java/src/net/i2p/data/Signature.java b/core/java/src/net/i2p/data/Signature.java index 4ab11b947..41a56aacd 100644 --- a/core/java/src/net/i2p/data/Signature.java +++ b/core/java/src/net/i2p/data/Signature.java @@ -69,7 +69,7 @@ public class Signature extends DataStructureImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(64); + StringBuilder buf = new StringBuilder(64); buf.append("[Signature: "); if (_data == null) { buf.append("null signature"); diff --git a/core/java/src/net/i2p/data/SigningPrivateKey.java b/core/java/src/net/i2p/data/SigningPrivateKey.java index 5f4d64ec0..4a1a99ccb 100644 --- a/core/java/src/net/i2p/data/SigningPrivateKey.java +++ b/core/java/src/net/i2p/data/SigningPrivateKey.java @@ -75,7 +75,7 @@ public class SigningPrivateKey extends DataStructureImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(64); + StringBuilder buf = new StringBuilder(64); buf.append("[SigningPrivateKey: "); if (_data == null) { buf.append("null key"); diff --git a/core/java/src/net/i2p/data/SigningPublicKey.java b/core/java/src/net/i2p/data/SigningPublicKey.java index 148fc242e..09097593f 100644 --- a/core/java/src/net/i2p/data/SigningPublicKey.java +++ b/core/java/src/net/i2p/data/SigningPublicKey.java @@ -74,7 +74,7 @@ public class SigningPublicKey extends DataStructureImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(64); + StringBuilder buf = new StringBuilder(64); buf.append("[SigningPublicKey: "); if (_data == null) { buf.append("null key"); diff --git a/core/java/src/net/i2p/data/VerifiedDestination.java b/core/java/src/net/i2p/data/VerifiedDestination.java index 888d6a211..19fd1079e 100644 --- a/core/java/src/net/i2p/data/VerifiedDestination.java +++ b/core/java/src/net/i2p/data/VerifiedDestination.java @@ -155,7 +155,7 @@ public class VerifiedDestination extends Destination { @Override public String toString() { - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append(super.toString()); buf.append("\n\tVerified Certificate? ").append(verifyCert(true)); return buf.toString(); diff --git a/core/java/src/net/i2p/data/i2cp/BandwidthLimitsMessage.java b/core/java/src/net/i2p/data/i2cp/BandwidthLimitsMessage.java index 2f8d56786..888242d6b 100644 --- a/core/java/src/net/i2p/data/i2cp/BandwidthLimitsMessage.java +++ b/core/java/src/net/i2p/data/i2cp/BandwidthLimitsMessage.java @@ -91,7 +91,7 @@ public class BandwidthLimitsMessage extends I2CPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[BandwidthLimitsMessage"); buf.append("\n\tIn: ").append(data[0]); buf.append("\n\tOut: ").append(data[1]); diff --git a/core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java b/core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java index f31aaa3aa..5b22929e9 100644 --- a/core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java +++ b/core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java @@ -128,7 +128,7 @@ public class CreateLeaseSetMessage extends I2CPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[CreateLeaseSetMessage: "); buf.append("\n\tLeaseSet: ").append(getLeaseSet()); buf.append("\n\tSigningPrivateKey: ").append(getSigningPrivateKey()); diff --git a/core/java/src/net/i2p/data/i2cp/CreateSessionMessage.java b/core/java/src/net/i2p/data/i2cp/CreateSessionMessage.java index fa47ce57f..909238625 100644 --- a/core/java/src/net/i2p/data/i2cp/CreateSessionMessage.java +++ b/core/java/src/net/i2p/data/i2cp/CreateSessionMessage.java @@ -84,7 +84,7 @@ public class CreateSessionMessage extends I2CPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[CreateSessionMessage: "); buf.append("\n\tConfig: ").append(getSessionConfig()); buf.append("]"); diff --git a/core/java/src/net/i2p/data/i2cp/DestLookupMessage.java b/core/java/src/net/i2p/data/i2cp/DestLookupMessage.java index 13135a2a4..09b405d6e 100644 --- a/core/java/src/net/i2p/data/i2cp/DestLookupMessage.java +++ b/core/java/src/net/i2p/data/i2cp/DestLookupMessage.java @@ -67,7 +67,7 @@ public class DestLookupMessage extends I2CPMessageImpl { } public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[DestLookupMessage: "); buf.append("\n\tHash: ").append(_hash); buf.append("]"); diff --git a/core/java/src/net/i2p/data/i2cp/DestReplyMessage.java b/core/java/src/net/i2p/data/i2cp/DestReplyMessage.java index 1ed601dc2..fbbb93c3d 100644 --- a/core/java/src/net/i2p/data/i2cp/DestReplyMessage.java +++ b/core/java/src/net/i2p/data/i2cp/DestReplyMessage.java @@ -69,7 +69,7 @@ public class DestReplyMessage extends I2CPMessageImpl { } public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[DestReplyMessage: "); buf.append("\n\tDestination: ").append(_dest); buf.append("]"); diff --git a/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java b/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java index a6f43dc7b..2c932c2b8 100644 --- a/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java +++ b/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java @@ -80,7 +80,7 @@ public class DestroySessionMessage extends I2CPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[DestroySessionMessage: "); buf.append("\n\tSessionId: ").append(getSessionId()); buf.append("]"); diff --git a/core/java/src/net/i2p/data/i2cp/DisconnectMessage.java b/core/java/src/net/i2p/data/i2cp/DisconnectMessage.java index 3ccd5263a..cdfa638cc 100644 --- a/core/java/src/net/i2p/data/i2cp/DisconnectMessage.java +++ b/core/java/src/net/i2p/data/i2cp/DisconnectMessage.java @@ -76,7 +76,7 @@ public class DisconnectMessage extends I2CPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[DisconnectMessage: "); buf.append("\n\tReason: ").append(getReason()); buf.append("]"); diff --git a/core/java/src/net/i2p/data/i2cp/GetBandwidthLimitsMessage.java b/core/java/src/net/i2p/data/i2cp/GetBandwidthLimitsMessage.java index a47f883d7..67ad71dec 100644 --- a/core/java/src/net/i2p/data/i2cp/GetBandwidthLimitsMessage.java +++ b/core/java/src/net/i2p/data/i2cp/GetBandwidthLimitsMessage.java @@ -49,7 +49,7 @@ public class GetBandwidthLimitsMessage extends I2CPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[GetBandwidthLimitsMessage]"); return buf.toString(); } diff --git a/core/java/src/net/i2p/data/i2cp/GetDateMessage.java b/core/java/src/net/i2p/data/i2cp/GetDateMessage.java index 003ab534d..a928f1f68 100644 --- a/core/java/src/net/i2p/data/i2cp/GetDateMessage.java +++ b/core/java/src/net/i2p/data/i2cp/GetDateMessage.java @@ -52,7 +52,7 @@ public class GetDateMessage extends I2CPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[GetDateMessage]"); return buf.toString(); } diff --git a/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java b/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java index 5dc4a5d71..3301b90d2 100644 --- a/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java +++ b/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java @@ -123,7 +123,7 @@ public class MessagePayloadMessage extends I2CPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[MessagePayloadMessage: "); buf.append("\n\tSessionId: ").append(getSessionId()); buf.append("\n\tMessageId: ").append(getMessageId()); diff --git a/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java b/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java index 998069041..912b38b20 100644 --- a/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java +++ b/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java @@ -168,7 +168,7 @@ public class MessageStatusMessage extends I2CPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[MessageStatusMessage: "); buf.append("\n\tSessionId: ").append(getSessionId()); buf.append("\n\tNonce: ").append(getNonce()); diff --git a/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java b/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java index 29320c82a..b942a7173 100644 --- a/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java +++ b/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java @@ -102,7 +102,7 @@ public class ReceiveMessageBeginMessage extends I2CPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[ReceiveMessageBeginMessage: "); buf.append("\n\tSessionId: ").append(getSessionId()); buf.append("\n\tMessageId: ").append(getMessageId()); diff --git a/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java b/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java index dcdae6e14..f17298d0a 100644 --- a/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java +++ b/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java @@ -86,7 +86,7 @@ public class ReceiveMessageEndMessage extends I2CPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[ReceiveMessageEndMessage: "); buf.append("\n\tSessionId: ").append(getSessionId()); buf.append("\n\tMessageId: ").append(getMessageId()); diff --git a/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java b/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java index 7165f6d32..4e3eede84 100644 --- a/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java +++ b/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java @@ -93,7 +93,7 @@ public class ReconfigureSessionMessage extends I2CPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[ReconfigureSessionMessage: "); buf.append("\n\tSessionId: ").append(getSessionId()); buf.append("\n\tSessionConfig: ").append(getSessionConfig()); diff --git a/core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java b/core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java index 0800359f2..2499610b6 100644 --- a/core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java +++ b/core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java @@ -123,7 +123,7 @@ public class ReportAbuseMessage extends I2CPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[ReportAbuseMessage: "); buf.append("\n\tSessionID: ").append(getSessionId()); buf.append("\n\tSeverity: ").append(getSeverity()); diff --git a/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java b/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java index b5fca013d..f5a0557aa 100644 --- a/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java +++ b/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java @@ -143,7 +143,7 @@ public class RequestLeaseSetMessage extends I2CPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[RequestLeaseMessage: "); buf.append("\n\tSessionId: ").append(getSessionId()); buf.append("\n\tTunnels:"); diff --git a/core/java/src/net/i2p/data/i2cp/SendMessageExpiresMessage.java b/core/java/src/net/i2p/data/i2cp/SendMessageExpiresMessage.java index d15c1979c..fabd6e354 100644 --- a/core/java/src/net/i2p/data/i2cp/SendMessageExpiresMessage.java +++ b/core/java/src/net/i2p/data/i2cp/SendMessageExpiresMessage.java @@ -104,7 +104,7 @@ public class SendMessageExpiresMessage extends SendMessageMessage { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[SendMessageMessage: "); buf.append("\n\tSessionId: ").append(getSessionId()); buf.append("\n\tNonce: ").append(getNonce()); diff --git a/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java b/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java index 2b9973c0e..a9bb5fb58 100644 --- a/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java +++ b/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java @@ -149,7 +149,7 @@ public class SendMessageMessage extends I2CPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[SendMessageMessage: "); buf.append("\n\tSessionId: ").append(getSessionId()); buf.append("\n\tNonce: ").append(getNonce()); diff --git a/core/java/src/net/i2p/data/i2cp/SessionConfig.java b/core/java/src/net/i2p/data/i2cp/SessionConfig.java index d16ffe126..89d56c736 100644 --- a/core/java/src/net/i2p/data/i2cp/SessionConfig.java +++ b/core/java/src/net/i2p/data/i2cp/SessionConfig.java @@ -218,7 +218,7 @@ public class SessionConfig extends DataStructureImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer("[SessionConfig: "); + StringBuilder buf = new StringBuilder("[SessionConfig: "); buf.append("\n\tDestination: ").append(getDestination()); buf.append("\n\tSignature: ").append(getSignature()); buf.append("\n\tCreation Date: ").append(getCreationDate()); diff --git a/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java b/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java index cf989c908..051bad504 100644 --- a/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java +++ b/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java @@ -96,7 +96,7 @@ public class SessionStatusMessage extends I2CPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[SessionStatusMessage: "); buf.append("\n\tSessionId: ").append(getSessionId()); buf.append("\n\tStatus: ").append(getStatus()); diff --git a/core/java/src/net/i2p/data/i2cp/SetDateMessage.java b/core/java/src/net/i2p/data/i2cp/SetDateMessage.java index 605b0a928..174dea6d6 100644 --- a/core/java/src/net/i2p/data/i2cp/SetDateMessage.java +++ b/core/java/src/net/i2p/data/i2cp/SetDateMessage.java @@ -79,7 +79,7 @@ public class SetDateMessage extends I2CPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[SetDateMessage"); buf.append("\n\tDate: ").append(getDate()); buf.append("]"); diff --git a/core/java/src/net/i2p/stat/PersistenceHelper.java b/core/java/src/net/i2p/stat/PersistenceHelper.java index 813268899..d8c1312d4 100644 --- a/core/java/src/net/i2p/stat/PersistenceHelper.java +++ b/core/java/src/net/i2p/stat/PersistenceHelper.java @@ -9,13 +9,13 @@ class PersistenceHelper { private final static Log _log = new Log(PersistenceHelper.class); private final static String NL = System.getProperty("line.separator"); - public final static void add(StringBuffer buf, String prefix, String name, String description, double value) { + public final static void add(StringBuilder buf, String prefix, String name, String description, double value) { buf.append("# ").append(prefix).append(name).append(NL); buf.append("# ").append(description).append(NL); buf.append(prefix).append(name).append('=').append(value).append(NL).append(NL); } - public final static void add(StringBuffer buf, String prefix, String name, String description, long value) { + public final static void add(StringBuilder buf, String prefix, String name, String description, long value) { buf.append("# ").append(prefix).append(name).append(NL); buf.append("# ").append(description).append(NL); buf.append(prefix).append(name).append('=').append(value).append(NL).append(NL); diff --git a/core/java/src/net/i2p/stat/Rate.java b/core/java/src/net/i2p/stat/Rate.java index d4164c2b5..03dc696a5 100644 --- a/core/java/src/net/i2p/stat/Rate.java +++ b/core/java/src/net/i2p/stat/Rate.java @@ -363,7 +363,7 @@ public class Rate { return 0.0D; } - public void store(String prefix, StringBuffer buf) throws IOException { + public void store(String prefix, StringBuilder buf) throws IOException { PersistenceHelper.add(buf, prefix, ".period", "Number of milliseconds in the period", _period); PersistenceHelper.add(buf, prefix, ".creationDate", "When was this rate created? (milliseconds since the epoch, GMT)", _creationDate); @@ -454,7 +454,7 @@ public class Rate { @Override public String toString() { - StringBuffer buf = new StringBuffer(2048); + StringBuilder buf = new StringBuilder(2048); buf.append("\n\t total value: ").append(getLastTotalValue()); buf.append("\n\t highest total value: ").append(getExtremeTotalValue()); buf.append("\n\t lifetime total value: ").append(getLifetimeTotalValue()); @@ -494,7 +494,7 @@ public class Rate { rate.addData(i * 100, 20); } rate.coalesce(); - StringBuffer buf = new StringBuffer(1024); + StringBuilder buf = new StringBuilder(1024); try { rate.store("rate.test", buf); byte data[] = buf.toString().getBytes(); diff --git a/core/java/src/net/i2p/stat/RateStat.java b/core/java/src/net/i2p/stat/RateStat.java index dd1fe63e3..b021d59f4 100644 --- a/core/java/src/net/i2p/stat/RateStat.java +++ b/core/java/src/net/i2p/stat/RateStat.java @@ -93,7 +93,7 @@ public class RateStat { @Override public String toString() { - StringBuffer buf = new StringBuffer(4096); + StringBuilder buf = new StringBuilder(4096); buf.append(getGroupName()).append('.').append(getName()).append(": ").append(getDescription()).append('\n'); long periods[] = getPeriods(); Arrays.sort(periods); @@ -121,7 +121,7 @@ public class RateStat { } public void store(OutputStream out, String prefix) throws IOException { - StringBuffer buf = new StringBuffer(1024); + StringBuilder buf = new StringBuilder(1024); buf.append(NL); buf.append("################################################################################").append(NL); buf.append("# Rate: ").append(_groupName).append(": ").append(_statName).append(NL); diff --git a/core/java/src/net/i2p/stat/SimpleStatDumper.java b/core/java/src/net/i2p/stat/SimpleStatDumper.java index 2a7d4ae78..eb48e5fce 100644 --- a/core/java/src/net/i2p/stat/SimpleStatDumper.java +++ b/core/java/src/net/i2p/stat/SimpleStatDumper.java @@ -14,13 +14,13 @@ public class SimpleStatDumper { public static void dumpStats(I2PAppContext context, int logLevel) { if (!_log.shouldLog(logLevel)) return; - StringBuffer buf = new StringBuffer(4 * 1024); + StringBuilder buf = new StringBuilder(4 * 1024); dumpFrequencies(context, buf); dumpRates(context, buf); _log.log(logLevel, buf.toString()); } - private static void dumpFrequencies(I2PAppContext ctx, StringBuffer buf) { + private static void dumpFrequencies(I2PAppContext ctx, StringBuilder buf) { Set frequencies = new TreeSet(ctx.statManager().getFrequencyNames()); for (Iterator iter = frequencies.iterator(); iter.hasNext();) { String name = (String) iter.next(); @@ -40,7 +40,7 @@ public class SimpleStatDumper { } } - private static void dumpRates(I2PAppContext ctx, StringBuffer buf) { + private static void dumpRates(I2PAppContext ctx, StringBuilder buf) { Set rates = new TreeSet(ctx.statManager().getRateNames()); for (Iterator iter = rates.iterator(); iter.hasNext();) { String name = (String) iter.next(); @@ -59,7 +59,7 @@ public class SimpleStatDumper { } } - static void dumpRate(Rate curRate, StringBuffer buf) { + static void dumpRate(Rate curRate, StringBuilder buf) { buf.append(curRate.toString()); } } \ No newline at end of file diff --git a/core/java/src/net/i2p/time/Timestamper.java b/core/java/src/net/i2p/time/Timestamper.java index b3f5290e3..c452f110a 100644 --- a/core/java/src/net/i2p/time/Timestamper.java +++ b/core/java/src/net/i2p/time/Timestamper.java @@ -197,7 +197,7 @@ public class Timestamper implements Runnable { } else { if (Math.abs(delta - expectedDelta) > MAX_VARIANCE) { if (_log.shouldLog(Log.ERROR)) { - StringBuffer err = new StringBuffer(96); + StringBuilder err = new StringBuilder(96); err.append("SNTP client variance exceeded at query ").append(i); err.append(". expected = "); err.append(expectedDelta); @@ -214,7 +214,7 @@ public class Timestamper implements Runnable { } stampTime(now); if (_log.shouldLog(Log.DEBUG)) { - StringBuffer buf = new StringBuffer(64); + StringBuilder buf = new StringBuilder(64); buf.append("Deltas: "); for (int i = 0; i < found.length; i++) buf.append(found[i]).append(' '); diff --git a/core/java/src/net/i2p/util/BufferedRandomSource.java b/core/java/src/net/i2p/util/BufferedRandomSource.java index dc975671a..c6ecd2740 100644 --- a/core/java/src/net/i2p/util/BufferedRandomSource.java +++ b/core/java/src/net/i2p/util/BufferedRandomSource.java @@ -218,7 +218,7 @@ public class BufferedRandomSource extends RandomSource { System.out.println("Data: " + data.length + "/" + compressed.length + ": " + toString(data)); } private static final String toString(byte data[]) { - StringBuffer buf = new StringBuffer(data.length * 9); + StringBuilder buf = new StringBuilder(data.length * 9); for (int i = 0; i < data.length; i++) { for (int j = 0; j < 8; j++) { if ((data[i] & (1 << j)) != 0) diff --git a/core/java/src/net/i2p/util/EepGet.java b/core/java/src/net/i2p/util/EepGet.java index c3c18866a..035d0c6be 100644 --- a/core/java/src/net/i2p/util/EepGet.java +++ b/core/java/src/net/i2p/util/EepGet.java @@ -207,7 +207,7 @@ public class EepGet { "01234567890.,_=@#:"; private static String sanitize(String name) { name = name.replace('/', '_'); - StringBuffer buf = new StringBuffer(name); + StringBuilder buf = new StringBuilder(name); for (int i = 0; i < name.length(); i++) if (_safeChars.indexOf(buf.charAt(i)) == -1) buf.setCharAt(i, '_'); @@ -292,7 +292,7 @@ public class EepGet { long now = _context.clock().now(); long timeToSend = now - _lastComplete; if (timeToSend > 0) { - StringBuffer buf = new StringBuffer(50); + StringBuilder buf = new StringBuilder(50); buf.append(" "); if ( bytesRemaining > 0 ) { double pct = ((double)_written + _previousWritten) / @@ -353,7 +353,7 @@ public class EepGet { if (_etag != null) System.out.println("== ETag: " + _etag); if (transferred > 0) { - StringBuffer buf = new StringBuffer(50); + StringBuilder buf = new StringBuilder(50); buf.append("== Transfer rate: "); double kbps = (1000.0d*(double)(transferred)/((double)timeToSend*1024.0d)); synchronized (_kbps) { @@ -381,7 +381,7 @@ public class EepGet { long timeToSend = _context.clock().now() - _startedOn; System.out.println("== Transfer time: " + DataHelper.formatDuration(timeToSend)); double kbps = (timeToSend > 0 ? (1000.0d*(double)(bytesTransferred)/((double)timeToSend*1024.0d)) : 0); - StringBuffer buf = new StringBuffer(50); + StringBuilder buf = new StringBuilder(50); buf.append("== Transfer rate: "); synchronized (_kbps) { buf.append(_kbps.format(kbps)); @@ -627,7 +627,7 @@ public class EepGet { private void readHeaders() throws IOException { String key = null; - StringBuffer buf = new StringBuffer(32); + StringBuilder buf = new StringBuilder(32); boolean read = DataHelper.readLine(_proxyIn, buf); if (!read) throw new IOException("Unable to read the first line"); @@ -738,7 +738,7 @@ public class EepGet { } private long readChunkLength() throws IOException { - StringBuffer buf = new StringBuffer(8); + StringBuilder buf = new StringBuilder(8); int nl = 0; while (true) { int cur = _proxyIn.read(); @@ -893,7 +893,7 @@ public class EepGet { } private String getRequest() throws IOException { - StringBuffer buf = new StringBuffer(512); + StringBuilder buf = new StringBuilder(512); boolean post = false; if ( (_postData != null) && (_postData.length() > 0) ) post = true; @@ -922,7 +922,8 @@ public class EepGet { buf.append("-\r\n"); } buf.append("Accept-Encoding: \r\n"); - buf.append("X-Accept-Encoding: x-i2p-gzip;q=1.0, identity;q=0.5, deflate;q=0, gzip;q=0, *;q=0\r\n"); + if (_shouldProxy) + buf.append("X-Accept-Encoding: x-i2p-gzip;q=1.0, identity;q=0.5, deflate;q=0, gzip;q=0, *;q=0\r\n"); if (!_allowCaching) { buf.append("Cache-control: no-cache\r\n"); buf.append("Pragma: no-cache\r\n"); diff --git a/core/java/src/net/i2p/util/EepPost.java b/core/java/src/net/i2p/util/EepPost.java index 50929f3cf..615361e20 100644 --- a/core/java/src/net/i2p/util/EepPost.java +++ b/core/java/src/net/i2p/util/EepPost.java @@ -184,7 +184,7 @@ public class EepPost { } private String getHeader(boolean isProxy, String path, String host, int port, String separator, long length) { - StringBuffer buf = new StringBuffer(512); + StringBuilder buf = new StringBuilder(512); buf.append("POST "); if (isProxy) { buf.append("http://").append(host); @@ -212,7 +212,7 @@ public class EepPost { return "------------------------" + new java.util.Random().nextLong(); byte separator[] = new byte[32]; // 2^-128 chance of this being a problem I2PAppContext.getGlobalContext().random().nextBytes(separator); - StringBuffer sep = new StringBuffer(48); + StringBuilder sep = new StringBuilder(48); for (int i = 0; i < separator.length; i++) sep.append((char)((int)'a' + (int)(separator[i]&0x0F))).append((char)((int)'a' + (int)((separator[i] >>> 4) & 0x0F))); return sep.toString(); diff --git a/core/java/src/net/i2p/util/FileUtil.java b/core/java/src/net/i2p/util/FileUtil.java index b6140b6e4..9232ec4dc 100644 --- a/core/java/src/net/i2p/util/FileUtil.java +++ b/core/java/src/net/i2p/util/FileUtil.java @@ -160,7 +160,7 @@ public class FileUtil { lines.remove(0); } } - StringBuffer buf = new StringBuffer(lines.size() * 80); + StringBuilder buf = new StringBuilder(lines.size() * 80); for (int i = 0; i < lines.size(); i++) buf.append((String)lines.get(i)).append('\n'); return buf.toString(); diff --git a/core/java/src/net/i2p/util/LogManager.java b/core/java/src/net/i2p/util/LogManager.java index 73178b0d6..054e79a22 100644 --- a/core/java/src/net/i2p/util/LogManager.java +++ b/core/java/src/net/i2p/util/LogManager.java @@ -546,7 +546,7 @@ public class LogManager { } private String createConfig() { - StringBuffer buf = new StringBuffer(8*1024); + StringBuilder buf = new StringBuilder(8*1024); buf.append(PROP_FORMAT).append('=').append(new String(_format)).append('\n'); buf.append(PROP_DATEFORMAT).append('=').append(_dateFormatPattern).append('\n'); buf.append(PROP_DISPLAYONSCREEN).append('=').append((_displayOnScreen ? "TRUE" : "FALSE")).append('\n'); diff --git a/core/java/src/net/i2p/util/LogRecordFormatter.java b/core/java/src/net/i2p/util/LogRecordFormatter.java index f280e7bf9..72d6ef9ee 100644 --- a/core/java/src/net/i2p/util/LogRecordFormatter.java +++ b/core/java/src/net/i2p/util/LogRecordFormatter.java @@ -30,7 +30,7 @@ class LogRecordFormatter { int size = 128 + rec.getMessage().length(); if (rec.getThrowable() != null) size += 512; - StringBuffer buf = new StringBuffer(size); + StringBuilder buf = new StringBuilder(size); char format[] = manager.getFormat(); for (int i = 0; i < format.length; ++i) { switch (format[i]) { @@ -93,7 +93,7 @@ class LogRecordFormatter { } private static String toString(String str, int size) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); if (str == null) str = ""; if (str.length() > size) str = str.substring(str.length() - size); buf.append(str); diff --git a/core/java/src/net/i2p/util/LogWriter.java b/core/java/src/net/i2p/util/LogWriter.java index b6302c3c4..ed94081c6 100644 --- a/core/java/src/net/i2p/util/LogWriter.java +++ b/core/java/src/net/i2p/util/LogWriter.java @@ -238,7 +238,7 @@ class LogWriter implements Runnable { private static final String replace(String pattern, int num) { char c[] = pattern.toCharArray(); - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); for (int i = 0; i < c.length; i++) { if ( (c[i] != '#') && (c[i] != '@') ) buf.append(c[i]); diff --git a/core/java/src/net/i2p/util/SimpleTimer.java b/core/java/src/net/i2p/util/SimpleTimer.java index 87aa7b4e5..bb0a2e67e 100644 --- a/core/java/src/net/i2p/util/SimpleTimer.java +++ b/core/java/src/net/i2p/util/SimpleTimer.java @@ -233,7 +233,7 @@ public class SimpleTimer { } else { _occurredTime = now; if (_occurredEventCount > 2500) { - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append("Too many simpleTimerJobs (").append(_occurredEventCount); buf.append(") in a second!"); _log.log(Log.WARN, buf.toString()); diff --git a/core/java/src/net/i2p/util/SocketTimeout.java b/core/java/src/net/i2p/util/SocketTimeout.java index 65238dd0d..3813ec6e8 100644 --- a/core/java/src/net/i2p/util/SocketTimeout.java +++ b/core/java/src/net/i2p/util/SocketTimeout.java @@ -58,7 +58,7 @@ public class SocketTimeout implements SimpleTimer.TimedEvent { private static String ts(long when) { synchronized (_fmt) { return _fmt.format(new Date(when)); } } @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("started on "); buf.append(ts(_startTime)); buf.append("idle for "); diff --git a/core/java/src/org/xlattice/crypto/filters/BloomSHA1.java b/core/java/src/org/xlattice/crypto/filters/BloomSHA1.java index 05b515bd2..6da1f0f60 100644 --- a/core/java/src/org/xlattice/crypto/filters/BloomSHA1.java +++ b/core/java/src/org/xlattice/crypto/filters/BloomSHA1.java @@ -212,7 +212,7 @@ public class BloomSHA1 { } // DEBUG METHODS public static String keyToString(byte[] key) { - StringBuffer sb = new StringBuffer().append(key[0]); + StringBuilder sb = new StringBuilder().append(key[0]); for (int i = 1; i < key.length; i++) { sb.append(".").append(Integer.toString(key[i], 16)); } @@ -220,14 +220,14 @@ public class BloomSHA1 { } /** convert 64-bit integer to hex String */ public static String ltoh (long i) { - StringBuffer sb = new StringBuffer().append("#") + StringBuilder sb = new StringBuilder().append("#") .append(Long.toString(i, 16)); return sb.toString(); } /** convert 32-bit integer to String */ public static String itoh (int i) { - StringBuffer sb = new StringBuffer().append("#") + StringBuilder sb = new StringBuilder().append("#") .append(Integer.toString(i, 16)); return sb.toString(); } diff --git a/core/java/test/net/i2p/crypto/HMACSHA256Bench.java b/core/java/test/net/i2p/crypto/HMACSHA256Bench.java index 762821f15..00474e0e4 100644 --- a/core/java/test/net/i2p/crypto/HMACSHA256Bench.java +++ b/core/java/test/net/i2p/crypto/HMACSHA256Bench.java @@ -70,12 +70,12 @@ public class HMACSHA256Bench { long maxLong1 = 0; byte[] smess = new String("abc").getBytes(); - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); for (int x = 0; x < 2*1024; x++) { buf.append("a"); } byte[] mmess = buf.toString().getBytes(); // new String("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq").getBytes(); - buf = new StringBuffer(); + buf = new StringBuilder(); for (int x = 0; x < 10000; x++) { buf.append("a"); } diff --git a/core/java/test/net/i2p/crypto/SHA1HashTest.java b/core/java/test/net/i2p/crypto/SHA1HashTest.java index 140f784eb..b83883821 100644 --- a/core/java/test/net/i2p/crypto/SHA1HashTest.java +++ b/core/java/test/net/i2p/crypto/SHA1HashTest.java @@ -133,7 +133,7 @@ public class SHA1HashTest extends TestCase{ } private final String toHex(final byte[] bytes) { - StringBuffer buf = new StringBuffer(bytes.length * 2); + StringBuilder buf = new StringBuilder(bytes.length * 2); for (int i = 0; i < bytes.length; i++) { if ((i & 3) == 0 && i != 0) buf.append(' '); diff --git a/core/java/test/net/i2p/crypto/SHA256Bench.java b/core/java/test/net/i2p/crypto/SHA256Bench.java index dc5f14163..0988fde34 100644 --- a/core/java/test/net/i2p/crypto/SHA256Bench.java +++ b/core/java/test/net/i2p/crypto/SHA256Bench.java @@ -57,12 +57,12 @@ public class SHA256Bench { long maxLong1 = 0; byte[] smess = new String("abc").getBytes(); - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); for (int x = 0; x < 10*1024; x++) { buf.append("a"); } byte[] mmess = buf.toString().getBytes(); // new String("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq").getBytes(); - buf = new StringBuffer(); + buf = new StringBuilder(); for (int x = 0; x < 1000000; x++) { buf.append("a"); } diff --git a/core/java/test/net/i2p/stat/RateTest.java b/core/java/test/net/i2p/stat/RateTest.java index fd565054a..471e7bb8f 100644 --- a/core/java/test/net/i2p/stat/RateTest.java +++ b/core/java/test/net/i2p/stat/RateTest.java @@ -13,7 +13,7 @@ public class RateTest extends TestCase { rate.addData(i * 100, 20); } rate.coalesce(); - StringBuffer buf = new StringBuffer(1024); + StringBuilder buf = new StringBuilder(1024); rate.store("rate.test", buf); byte data[] = buf.toString().getBytes(); diff --git a/history.txt b/history.txt index d02bf97dc..fa86dcd76 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,30 @@ +2009-07-06 zzz + * Console: Fix small textareas on Opera + * EepGet: Don't send X-Accept-Encoding for non-proxied fetches + * HTTP Proxy: Limit proxy.i2p to /themes/ directory + * I2PSnark: + - Change postman2 announce URL to use hostname rather than B64 + - Shorten torrent name to fit better on one line + * I2PTunnel: + - Add edit text + - Fix broken favicon + * Move almost all uses of StringBuffer to StringBuilder, + for efficiency (thanks Arsene for the suggestion) + * Reseed: + - Fix console status messages broken by global replace + - Remove tino, add b.netdb.i2p2.de + * SSUDemo: Move to the router/java/test directory + * Startup: Log clients.config problems + * Transport: Implement NTCP auto-transition from an + address to no address, so that inbound NTCP is disabled + after SSU detects a firewall. When UPnP was apparently successful + but the router is still firewalled (due to an additional + software firewall or a bad UPnP indication, for example) + the router will now remove the NTCP address. + +2009-07-05 sponge + * Added X-I2P-DestB64 and X-I2P-DestB32 http headers + 2009-06-29 zzz * Big directory rework: Eliminate all uses of the current working directory, and diff --git a/router/java/src/net/i2p/data/i2np/DataMessage.java b/router/java/src/net/i2p/data/i2np/DataMessage.java index 8ba6b1346..cd4c4d327 100644 --- a/router/java/src/net/i2p/data/i2np/DataMessage.java +++ b/router/java/src/net/i2p/data/i2np/DataMessage.java @@ -106,7 +106,7 @@ public class DataMessage extends I2NPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[DataMessage: "); buf.append("\n\tData: ").append(DataHelper.toString(getData(), 64)); buf.append("]"); diff --git a/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java b/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java index 79dec2ee9..43e2ee8d5 100644 --- a/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java +++ b/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java @@ -238,7 +238,7 @@ public class DatabaseLookupMessage extends I2NPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[DatabaseLookupMessage: "); buf.append("\n\tSearch Key: ").append(getSearchKey()); buf.append("\n\tFrom: ").append(getFrom()); diff --git a/router/java/src/net/i2p/data/i2np/DatabaseSearchReplyMessage.java b/router/java/src/net/i2p/data/i2np/DatabaseSearchReplyMessage.java index c8dc9aa90..f477ef2a1 100644 --- a/router/java/src/net/i2p/data/i2np/DatabaseSearchReplyMessage.java +++ b/router/java/src/net/i2p/data/i2np/DatabaseSearchReplyMessage.java @@ -131,7 +131,7 @@ public class DatabaseSearchReplyMessage extends I2NPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[DatabaseSearchReplyMessage: "); buf.append("\n\tSearch Key: ").append(getSearchKey()); buf.append("\n\tReplies: # = ").append(getNumReplies()); diff --git a/router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java b/router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java index 04ef417d3..9bf61e843 100644 --- a/router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java +++ b/router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java @@ -260,7 +260,7 @@ public class DatabaseStoreMessage extends I2NPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[DatabaseStoreMessage: "); buf.append("\n\tExpiration: ").append(getMessageExpiration()); buf.append("\n\tUnique ID: ").append(getUniqueId()); diff --git a/router/java/src/net/i2p/data/i2np/DateMessage.java b/router/java/src/net/i2p/data/i2np/DateMessage.java index b5388eda5..166ecafd3 100644 --- a/router/java/src/net/i2p/data/i2np/DateMessage.java +++ b/router/java/src/net/i2p/data/i2np/DateMessage.java @@ -70,7 +70,7 @@ public class DateMessage extends I2NPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[DateMessage: "); buf.append("Now: ").append(_now); buf.append("]"); diff --git a/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java b/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java index 8ad3ddff2..98935a394 100644 --- a/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java +++ b/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java @@ -377,7 +377,7 @@ public class DeliveryInstructions extends DataStructureImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append("[DeliveryInstructions: "); buf.append("\n\tDelivery mode: "); switch (getDeliveryMode()) { diff --git a/router/java/src/net/i2p/data/i2np/DeliveryStatusMessage.java b/router/java/src/net/i2p/data/i2np/DeliveryStatusMessage.java index ff8ad12cb..9325a6333 100644 --- a/router/java/src/net/i2p/data/i2np/DeliveryStatusMessage.java +++ b/router/java/src/net/i2p/data/i2np/DeliveryStatusMessage.java @@ -82,7 +82,7 @@ public class DeliveryStatusMessage extends I2NPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[DeliveryStatusMessage: "); buf.append("\n\tMessage ID: ").append(getMessageId()); buf.append("\n\tArrival: ").append(_context.clock().now() - _arrival); diff --git a/router/java/src/net/i2p/data/i2np/GarlicClove.java b/router/java/src/net/i2p/data/i2np/GarlicClove.java index aa37994a0..867071c86 100644 --- a/router/java/src/net/i2p/data/i2np/GarlicClove.java +++ b/router/java/src/net/i2p/data/i2np/GarlicClove.java @@ -107,25 +107,25 @@ public class GarlicClove extends DataStructureImpl { public void writeBytes(OutputStream out) throws DataFormatException, IOException { - StringBuffer error = null; + StringBuilder error = null; if (_instructions == null) { - if (error == null) error = new StringBuffer(); + if (error == null) error = new StringBuilder(); error.append("No instructions "); } if (_msg == null) { - if (error == null) error = new StringBuffer(); + if (error == null) error = new StringBuilder(); error.append("No message "); } if (_cloveId < 0) { - if (error == null) error = new StringBuffer(); + if (error == null) error = new StringBuilder(); error.append("CloveID < 0 [").append(_cloveId).append("] "); } if (_expiration == null) { - if (error == null) error = new StringBuffer(); + if (error == null) error = new StringBuilder(); error.append("Expiration is null "); } if (_certificate == null) { - if (error == null) error = new StringBuffer(); + if (error == null) error = new StringBuilder(); error.append("Certificate is null "); } @@ -210,7 +210,7 @@ public class GarlicClove extends DataStructureImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append("[GarlicClove: "); buf.append("\n\tInstructions: ").append(getInstructions()); buf.append("\n\tCertificate: ").append(getCertificate()); diff --git a/router/java/src/net/i2p/data/i2np/GarlicMessage.java b/router/java/src/net/i2p/data/i2np/GarlicMessage.java index 357e7d2f5..88d2f2b37 100644 --- a/router/java/src/net/i2p/data/i2np/GarlicMessage.java +++ b/router/java/src/net/i2p/data/i2np/GarlicMessage.java @@ -90,7 +90,7 @@ public class GarlicMessage extends I2NPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[GarlicMessage: "); buf.append("\n\tData length: ").append(getData().length).append(" bytes"); buf.append("]"); diff --git a/router/java/src/net/i2p/data/i2np/TunnelCreateMessage.java b/router/java/src/net/i2p/data/i2np/TunnelCreateMessage.java index b611f4672..4d0008642 100644 --- a/router/java/src/net/i2p/data/i2np/TunnelCreateMessage.java +++ b/router/java/src/net/i2p/data/i2np/TunnelCreateMessage.java @@ -263,7 +263,7 @@ public class TunnelCreateMessage extends I2NPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[TunnelCreateMessage: "); buf.append("\n\tNext Router: ").append(getNextRouter()); buf.append("\n\tNext Tunnel: ").append(getNextTunnelId()); diff --git a/router/java/src/net/i2p/data/i2np/TunnelCreateStatusMessage.java b/router/java/src/net/i2p/data/i2np/TunnelCreateStatusMessage.java index 515436f5d..07185f340 100644 --- a/router/java/src/net/i2p/data/i2np/TunnelCreateStatusMessage.java +++ b/router/java/src/net/i2p/data/i2np/TunnelCreateStatusMessage.java @@ -108,7 +108,7 @@ public class TunnelCreateStatusMessage extends I2NPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[TunnelCreateStatusMessage: "); buf.append("\n\tTunnel ID: ").append(getReceiveTunnelId()); buf.append("\n\tStatus: ").append(getStatus()); diff --git a/router/java/src/net/i2p/data/i2np/TunnelDataMessage.java b/router/java/src/net/i2p/data/i2np/TunnelDataMessage.java index 77c967f58..a55efc2b1 100644 --- a/router/java/src/net/i2p/data/i2np/TunnelDataMessage.java +++ b/router/java/src/net/i2p/data/i2np/TunnelDataMessage.java @@ -139,7 +139,7 @@ public class TunnelDataMessage extends I2NPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[TunnelDataMessage:"); buf.append(" MessageId: ").append(getUniqueId()); buf.append(" Tunnel ID: ").append(getTunnelId()); diff --git a/router/java/src/net/i2p/data/i2np/TunnelGatewayMessage.java b/router/java/src/net/i2p/data/i2np/TunnelGatewayMessage.java index a436472e4..43fc4bce6 100644 --- a/router/java/src/net/i2p/data/i2np/TunnelGatewayMessage.java +++ b/router/java/src/net/i2p/data/i2np/TunnelGatewayMessage.java @@ -131,7 +131,7 @@ public class TunnelGatewayMessage extends I2NPMessageImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("[TunnelGatewayMessage:"); buf.append(" Tunnel ID: ").append(getTunnelId()); buf.append(" Message: ").append(_msg); diff --git a/router/java/src/net/i2p/router/Blocklist.java b/router/java/src/net/i2p/router/Blocklist.java index 6195d6a76..1ce5cb5e7 100644 --- a/router/java/src/net/i2p/router/Blocklist.java +++ b/router/java/src/net/i2p/router/Blocklist.java @@ -188,7 +188,7 @@ public class Blocklist { FileInputStream in = null; try { in = new FileInputStream(BLFile); - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); while (DataHelper.readLine(in, buf) && count < maxSize) { Entry e = parse(buf, true); buf.setLength(0); @@ -267,7 +267,7 @@ public class Blocklist { } } - private Entry parse(StringBuffer buf, boolean bitch) { + private Entry parse(StringBuilder buf, boolean bitch) { byte[] ip1; byte[] ip2; int start1 = 0; @@ -378,7 +378,7 @@ public class Blocklist { FileInputStream in = null; try { in = new FileInputStream(BLFile); - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); while (DataHelper.readLine(in, buf)) { lines++; buf.setLength(0); @@ -628,7 +628,7 @@ public class Blocklist { } private static String toStr(long entry) { - StringBuffer buf = new StringBuffer(32); + StringBuilder buf = new StringBuilder(32); for (int i = 7; i >= 0; i--) { buf.append((entry >> (8*i)) & 0xff); if (i == 4) @@ -640,7 +640,7 @@ public class Blocklist { } private static String toStr(int ip) { - StringBuffer buf = new StringBuffer(16); + StringBuilder buf = new StringBuilder(16); for (int i = 3; i >= 0; i--) { buf.append((ip >> (8*i)) & 0xff); if (i > 0) @@ -719,7 +719,7 @@ public class Blocklist { FileInputStream in = null; try { in = new FileInputStream(BLFile); - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); // assume the file is unsorted, so go through the whole thing while (DataHelper.readLine(in, buf)) { Entry e = parse(buf, false); diff --git a/router/java/src/net/i2p/router/ClientTunnelSettings.java b/router/java/src/net/i2p/router/ClientTunnelSettings.java index 6cd398195..cc8c74e6c 100644 --- a/router/java/src/net/i2p/router/ClientTunnelSettings.java +++ b/router/java/src/net/i2p/router/ClientTunnelSettings.java @@ -46,7 +46,7 @@ public class ClientTunnelSettings { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); Properties p = new Properties(); writeToProperties(p); buf.append("Client tunnel settings:\n"); diff --git a/router/java/src/net/i2p/router/JobImpl.java b/router/java/src/net/i2p/router/JobImpl.java index a72f85296..2934855c8 100644 --- a/router/java/src/net/i2p/router/JobImpl.java +++ b/router/java/src/net/i2p/router/JobImpl.java @@ -35,7 +35,7 @@ public abstract class JobImpl implements Job { @Override public String toString() { - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append(super.toString()); buf.append(": Job ").append(_id).append(": ").append(getName()); return buf.toString(); diff --git a/router/java/src/net/i2p/router/JobQueue.java b/router/java/src/net/i2p/router/JobQueue.java index 890b303c0..f14cb5146 100644 --- a/router/java/src/net/i2p/router/JobQueue.java +++ b/router/java/src/net/i2p/router/JobQueue.java @@ -245,7 +245,7 @@ public class JobQueue { _jobLock.notifyAll(); } if (_log.shouldLog(Log.WARN)) { - StringBuffer buf = new StringBuffer(1024); + StringBuilder buf = new StringBuilder(1024); buf.append("current jobs: \n"); for (Iterator iter = _queueRunners.values().iterator(); iter.hasNext(); ) { JobQueueRunner runner = (JobQueueRunner)iter.next(); @@ -587,7 +587,7 @@ public class JobQueue { numRunners = _queueRunners.size(); } - StringBuffer str = new StringBuffer(128); + StringBuilder str = new StringBuilder(128); str.append("\n"); out.flush(); - StringBuffer buf = new StringBuffer(32*1024); + StringBuilder buf = new StringBuilder(32*1024); buf.append("

JobQueue

"); buf.append("# runners: ").append(numRunners).append(" [states="); if (states != null) @@ -667,7 +667,7 @@ public class JobQueue { } /** render the HTML for the job stats */ - private void getJobStats(StringBuffer buf) { + private void getJobStats(StringBuilder buf) { buf.append("
\n"); buf.append(""); buf.append(""); diff --git a/router/java/src/net/i2p/router/JobStats.java b/router/java/src/net/i2p/router/JobStats.java index ec5712993..148fb7410 100644 --- a/router/java/src/net/i2p/router/JobStats.java +++ b/router/java/src/net/i2p/router/JobStats.java @@ -77,7 +77,7 @@ class JobStats { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("Over ").append(getRuns()).append(" runs, job ").append(getName()).append(" took "); buf.append(getTotalTime()).append("ms (").append(getAvgTime()).append("ms/").append(getMaxTime()).append("ms/"); buf.append(getMinTime()).append("ms avg/max/min) after a total lag of "); diff --git a/router/java/src/net/i2p/router/MessageHistory.java b/router/java/src/net/i2p/router/MessageHistory.java index f875c03b3..a116aaca7 100644 --- a/router/java/src/net/i2p/router/MessageHistory.java +++ b/router/java/src/net/i2p/router/MessageHistory.java @@ -144,7 +144,7 @@ public class MessageHistory { */ public void requestTunnelCreate(TunnelId createTunnel, TunnelId outTunnel, Hash peerRequested, Hash nextPeer, TunnelId replyTunnel, Hash replyThrough) { if (!_doLog) return; - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append(getPrefix()); buf.append("request [").append(getName(peerRequested)).append("] to create tunnel ["); buf.append(createTunnel.getTunnelId()).append("] "); @@ -169,7 +169,7 @@ public class MessageHistory { */ public void receiveTunnelCreate(TunnelId createTunnel, Hash nextPeer, Date expire, boolean ok, Hash sourceRoutePeer) { if (!_doLog) return; - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append(getPrefix()); buf.append("receive tunnel create [").append(createTunnel.getTunnelId()).append("] "); if (nextPeer != null) @@ -187,7 +187,7 @@ public class MessageHistory { public void tunnelJoined(String state, TunnelInfo tunnel) { if (!_doLog) return; if (tunnel == null) return; - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append(getPrefix()); buf.append("joining as [").append(state); buf.append("] to tunnel: ").append(tunnel.toString()); @@ -203,7 +203,7 @@ public class MessageHistory { public void tunnelJoined(String state, HopConfig tunnel) { if (!_doLog) return; if (tunnel == null) return; - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append(getPrefix()); buf.append("joining as [").append(state); buf.append("] to tunnel: ").append(tunnel.toString()); @@ -242,7 +242,7 @@ public class MessageHistory { public void tunnelFailed(TunnelId tunnel) { if (!_doLog) return; if (tunnel == null) return; - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append(getPrefix()); buf.append("failing tunnel [").append(tunnel.getTunnelId()).append("]"); addEntry(buf.toString()); @@ -258,7 +258,7 @@ public class MessageHistory { public void tunnelValid(TunnelInfo tunnel, long timeToTest) { if (!_doLog) return; if (tunnel == null) return; - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append(getPrefix()); buf.append("tunnel ").append(tunnel).append(" tested ok after ").append(timeToTest).append("ms"); addEntry(buf.toString()); @@ -271,7 +271,7 @@ public class MessageHistory { public void tunnelRejected(Hash peer, TunnelId tunnel, Hash replyThrough, String reason) { if (!_doLog) return; if ( (tunnel == null) || (peer == null) ) return; - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append(getPrefix()); buf.append("tunnel [").append(tunnel.getTunnelId()).append("] was rejected by ["); buf.append(getName(peer)).append("] for [").append(reason).append("]"); @@ -283,7 +283,7 @@ public class MessageHistory { public void tunnelParticipantRejected(Hash peer, String msg) { if (!_doLog) return; if (peer == null) return; - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append(getPrefix()); buf.append("tunnel participation rejected by ["); buf.append(getName(peer)).append("]: ").append(msg); @@ -298,7 +298,7 @@ public class MessageHistory { public void tunnelRequestTimedOut(Hash peer, TunnelId tunnel) { if (!_doLog) return; if ( (tunnel == null) || (peer == null) ) return; - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append(getPrefix()); buf.append("tunnel [").append(tunnel.getTunnelId()).append("] timed out on ["); buf.append(getName(peer)).append("]"); @@ -314,7 +314,7 @@ public class MessageHistory { */ public void droppedTunnelMessage(TunnelId id, long msgId, Date expiration, Hash from) { if (!_doLog) return; - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append(getPrefix()); buf.append("dropped message ").append(msgId).append(" for unknown tunnel [").append(id.getTunnelId()); buf.append("] from [").append(getName(from)).append("]").append(" expiring on "); @@ -328,7 +328,7 @@ public class MessageHistory { public void droppedOtherMessage(I2NPMessage message, Hash from) { if (!_doLog) return; if (message == null) return; - StringBuffer buf = new StringBuffer(512); + StringBuilder buf = new StringBuilder(512); buf.append(getPrefix()); buf.append("dropped [").append(message.getClass().getName()).append("] ").append(message.getUniqueId()); buf.append(" [").append(message.toString()).append("] from ["); @@ -342,7 +342,7 @@ public class MessageHistory { public void droppedInboundMessage(long messageId, Hash from, String info) { if (!_doLog) return; - StringBuffer buf = new StringBuffer(512); + StringBuilder buf = new StringBuilder(512); buf.append(getPrefix()); buf.append("dropped inbound message ").append(messageId); buf.append(" from "); @@ -364,7 +364,7 @@ public class MessageHistory { public void replyTimedOut(OutNetMessage sentMessage) { if (!_doLog) return; if (sentMessage == null) return; - StringBuffer buf = new StringBuffer(512); + StringBuilder buf = new StringBuilder(512); buf.append(getPrefix()); buf.append("timed out waiting for a reply to [").append(sentMessage.getMessageType()); buf.append("] [").append(sentMessage.getMessageId()).append("] expiring on ["); @@ -383,7 +383,7 @@ public class MessageHistory { */ public void messageProcessingError(long messageId, String messageType, String error) { if (!_doLog) return; - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append(getPrefix()); buf.append("Error processing [").append(messageType).append("] [").append(messageId).append("] failed with [").append(error).append("]"); addEntry(buf.toString()); @@ -420,7 +420,7 @@ public class MessageHistory { public void sendMessage(String messageType, long messageId, long expiration, Hash peer, boolean sentOk, String info) { if (!_doLog) return; if (false) return; - StringBuffer buf = new StringBuffer(256); + StringBuilder buf = new StringBuilder(256); buf.append(getPrefix()); buf.append("send [").append(messageType).append("] message [").append(messageId).append("] "); buf.append("to [").append(getName(peer)).append("] "); @@ -448,7 +448,7 @@ public class MessageHistory { public void receiveMessage(String messageType, long messageId, long expiration, Hash from, boolean isValid) { if (!_doLog) return; if (false) return; - StringBuffer buf = new StringBuffer(256); + StringBuilder buf = new StringBuilder(256); buf.append(getPrefix()); buf.append("receive [").append(messageType).append("] with id [").append(messageId).append("] "); if (from != null) @@ -470,7 +470,7 @@ public class MessageHistory { */ public void wrap(String bodyMessageType, long bodyMessageId, String containerMessageType, long containerMessageId) { if (!_doLog) return; - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append(getPrefix()); buf.append("Wrap message [").append(bodyMessageType).append("] id [").append(bodyMessageId).append("] "); buf.append("in [").append(containerMessageType).append("] id [").append(containerMessageId).append("]"); @@ -483,7 +483,7 @@ public class MessageHistory { */ public void receivePayloadMessage(long messageId) { if (!_doLog) return; - StringBuffer buf = new StringBuffer(64); + StringBuilder buf = new StringBuilder(64); buf.append(getPrefix()); buf.append("Receive payload message [").append(messageId).append("]"); addEntry(buf.toString()); @@ -498,7 +498,7 @@ public class MessageHistory { */ public void sendPayloadMessage(long messageId, boolean successfullySent, long timeToSend) { if (!_doLog) return; - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append(getPrefix()); buf.append("Send payload message in [").append(messageId).append("] in [").append(timeToSend).append("] successfully? ").append(successfullySent); addEntry(buf.toString()); @@ -507,7 +507,7 @@ public class MessageHistory { public void receiveTunnelFragment(long messageId, int fragmentId, Object status) { if (!_doLog) return; if (messageId == -1) throw new IllegalArgumentException("why are you -1?"); - StringBuffer buf = new StringBuffer(48); + StringBuilder buf = new StringBuilder(48); buf.append(getPrefix()); buf.append("Receive fragment ").append(fragmentId).append(" in ").append(messageId); buf.append(" status: ").append(status.toString()); @@ -516,7 +516,7 @@ public class MessageHistory { public void receiveTunnelFragmentComplete(long messageId) { if (!_doLog) return; if (messageId == -1) throw new IllegalArgumentException("why are you -1?"); - StringBuffer buf = new StringBuffer(48); + StringBuilder buf = new StringBuilder(48); buf.append(getPrefix()); buf.append("Receive fragmented message completely: ").append(messageId); addEntry(buf.toString()); @@ -524,7 +524,7 @@ public class MessageHistory { public void droppedFragmentedMessage(long messageId, String status) { if (!_doLog) return; if (messageId == -1) throw new IllegalArgumentException("why are you -1?"); - StringBuffer buf = new StringBuffer(48); + StringBuilder buf = new StringBuilder(48); buf.append(getPrefix()); buf.append("Fragmented message dropped: ").append(messageId); buf.append(" ").append(status); @@ -533,7 +533,7 @@ public class MessageHistory { public void fragmentMessage(long messageId, int numFragments, int totalLength, List messageIds, String msg) { if (!_doLog) return; //if (messageId == -1) throw new IllegalArgumentException("why are you -1?"); - StringBuffer buf = new StringBuffer(48); + StringBuilder buf = new StringBuilder(48); buf.append(getPrefix()); buf.append("Break message ").append(messageId).append(" into fragments: ").append(numFragments); buf.append(" total size ").append(totalLength); @@ -545,7 +545,7 @@ public class MessageHistory { public void fragmentMessage(long messageId, int numFragments, int totalLength, List messageIds, Object tunnel, String msg) { if (!_doLog) return; //if (messageId == -1) throw new IllegalArgumentException("why are you -1?"); - StringBuffer buf = new StringBuffer(48); + StringBuilder buf = new StringBuilder(48); buf.append(getPrefix()); buf.append("Break message ").append(messageId).append(" into fragments: ").append(numFragments); buf.append(" total size ").append(totalLength); @@ -559,7 +559,7 @@ public class MessageHistory { public void droppedTunnelDataMessageUnknown(long msgId, long tunnelId) { if (!_doLog) return; if (msgId == -1) throw new IllegalArgumentException("why are you -1?"); - StringBuffer buf = new StringBuffer(48); + StringBuilder buf = new StringBuilder(48); buf.append(getPrefix()); buf.append("Dropped data message ").append(msgId).append(" for unknown tunnel ").append(tunnelId); addEntry(buf.toString()); @@ -567,7 +567,7 @@ public class MessageHistory { public void droppedTunnelGatewayMessageUnknown(long msgId, long tunnelId) { if (!_doLog) return; if (msgId == -1) throw new IllegalArgumentException("why are you -1?"); - StringBuffer buf = new StringBuffer(48); + StringBuilder buf = new StringBuilder(48); buf.append(getPrefix()); buf.append("Dropped gateway message ").append(msgId).append(" for unknown tunnel ").append(tunnelId); addEntry(buf.toString()); @@ -585,7 +585,7 @@ public class MessageHistory { } private final String getPrefix() { - StringBuffer buf = new StringBuffer(48); + StringBuilder buf = new StringBuilder(48); buf.append(getTime(_context.clock().now())); buf.append(' ').append(_localIdent).append(": "); return buf.toString(); diff --git a/router/java/src/net/i2p/router/MultiRouterBuilder.java b/router/java/src/net/i2p/router/MultiRouterBuilder.java index 9518e4fac..6a7c635bc 100644 --- a/router/java/src/net/i2p/router/MultiRouterBuilder.java +++ b/router/java/src/net/i2p/router/MultiRouterBuilder.java @@ -77,7 +77,7 @@ public class MultiRouterBuilder { buildStartupScriptNix(args); } private static void buildStartupScriptNix(String args[]) { - StringBuffer buf = new StringBuffer(4096); + StringBuilder buf = new StringBuilder(4096); buf.append("#!/bin/sh\n"); buf.append("export CP=.; for LIB in lib/* ; do export CP=$CP:$LIB ; done\n"); buf.append("nohup java -cp $CP "); @@ -106,7 +106,7 @@ public class MultiRouterBuilder { File baseDir = new File(dir); baseDir.mkdirs(); File cfgFile = new File(baseDir, "router.config"); - StringBuffer buf = new StringBuffer(8*1024); + StringBuilder buf = new StringBuilder(8*1024); buf.append("router.profileDir=").append(baseDir.getPath()).append("/peerProfiles\n"); buf.append("router.historyFilename=").append(baseDir.getPath()).append("/messageHistory.txt\n"); buf.append("router.sessionKeys.location=").append(baseDir.getPath()).append("/sessionKeys.dat\n"); diff --git a/router/java/src/net/i2p/router/OutNetMessage.java b/router/java/src/net/i2p/router/OutNetMessage.java index e1cd2a896..39921a5e7 100644 --- a/router/java/src/net/i2p/router/OutNetMessage.java +++ b/router/java/src/net/i2p/router/OutNetMessage.java @@ -287,7 +287,7 @@ public class OutNetMessage { public void finalize() throws Throwable { if (_message != null) { if (_log.shouldLog(Log.WARN)) { - StringBuffer buf = new StringBuffer(1024); + StringBuilder buf = new StringBuilder(1024); buf.append("Undiscarded ").append(_messageSize).append("byte "); buf.append(_messageType).append(" message created "); buf.append((_context.clock().now() - _created)).append("ms ago: "); @@ -304,7 +304,7 @@ public class OutNetMessage { */ @Override public String toString() { - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append("[OutNetMessage contains "); if (_message == null) { buf.append("*no message*"); @@ -334,7 +334,7 @@ public class OutNetMessage { return buf.toString(); } - private void renderTimestamps(StringBuffer buf) { + private void renderTimestamps(StringBuilder buf) { if (_log.shouldLog(Log.INFO)) { synchronized (this) { long lastWhen = -1; diff --git a/router/java/src/net/i2p/router/PersistentKeyRing.java b/router/java/src/net/i2p/router/PersistentKeyRing.java index f1f4fe55a..9b7ffe0f3 100644 --- a/router/java/src/net/i2p/router/PersistentKeyRing.java +++ b/router/java/src/net/i2p/router/PersistentKeyRing.java @@ -66,7 +66,7 @@ public class PersistentKeyRing extends KeyRing { @Override public void renderStatusHTML(Writer out) throws IOException { - StringBuffer buf = new StringBuffer(1024); + StringBuilder buf = new StringBuilder(1024); buf.append("\n
JobRunsTimeAvgMaxMin
"); for (Entry e : entrySet()) { buf.append("\n
Destination HashName or Dest.Session Key
"); diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java index 8c918d93f..1539750ad 100644 --- a/router/java/src/net/i2p/router/Router.java +++ b/router/java/src/net/i2p/router/Router.java @@ -589,7 +589,7 @@ public class Router { " " + "
\n"); - StringBuffer buf = new StringBuffer(32*1024); + StringBuilder buf = new StringBuilder(32*1024); if ( (_routerInfo != null) && (_routerInfo.getIdentity() != null) ) buf.append("Router: ").append(_routerInfo.getIdentity().getHash().toBase64()).append("
\n"); @@ -762,7 +762,7 @@ public class Router { } private static int MAX_MSG_LENGTH = 120; - private static final void appendLogMessage(StringBuffer buf, String msg) { + private static final void appendLogMessage(StringBuilder buf, String msg) { // disable this code for the moment because i think it // looks ugly (on the router console) if (true) { @@ -804,7 +804,7 @@ public class Router { /** main-ish method for testing appendLogMessage */ private static final void testAppendLog() { - StringBuffer buf = new StringBuffer(1024); + StringBuilder buf = new StringBuilder(1024); Router.appendLogMessage(buf, "hi\nhow are you\nh0h0h0"); System.out.println("line: [" + buf.toString() + "]"); buf.setLength(0); @@ -1005,7 +1005,7 @@ public class Router { FileOutputStream fos = null; try { fos = new FileOutputStream(_configFilename); - StringBuffer buf = new StringBuffer(8*1024); + StringBuilder buf = new StringBuilder(8*1024); synchronized (_config) { TreeSet ordered = new TreeSet(_config.keySet()); for (Iterator iter = ordered.iterator() ; iter.hasNext(); ) { diff --git a/router/java/src/net/i2p/router/RouterContext.java b/router/java/src/net/i2p/router/RouterContext.java index 656b1299b..6dd7282b0 100644 --- a/router/java/src/net/i2p/router/RouterContext.java +++ b/router/java/src/net/i2p/router/RouterContext.java @@ -268,7 +268,7 @@ public class RouterContext extends I2PAppContext { @Override public String toString() { - StringBuffer buf = new StringBuffer(512); + StringBuilder buf = new StringBuilder(512); buf.append("RouterContext: ").append(super.toString()).append('\n'); buf.append(_router).append('\n'); buf.append(_clientManagerFacade).append('\n'); diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index bd644cee5..e4d51a2bb 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 2; + public final static long BUILD = 4; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; diff --git a/router/java/src/net/i2p/router/Shitlist.java b/router/java/src/net/i2p/router/Shitlist.java index 4e94090a4..6f38826b3 100644 --- a/router/java/src/net/i2p/router/Shitlist.java +++ b/router/java/src/net/i2p/router/Shitlist.java @@ -252,7 +252,7 @@ public class Shitlist { } public void renderStatusHTML(Writer out) throws IOException { - StringBuffer buf = new StringBuffer(1024); + StringBuilder buf = new StringBuilder(1024); buf.append("

Shitlist

"); Map entries = new TreeMap(new HashComparator()); diff --git a/router/java/src/net/i2p/router/StatisticsManager.java b/router/java/src/net/i2p/router/StatisticsManager.java index df51e36b4..a3c54458a 100644 --- a/router/java/src/net/i2p/router/StatisticsManager.java +++ b/router/java/src/net/i2p/router/StatisticsManager.java @@ -200,7 +200,7 @@ public class StatisticsManager implements Service { } private String renderRate(Rate rate, boolean fudgeQuantity) { - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append(num(rate.getAverageValue())).append(';'); buf.append(num(rate.getExtremeAverageValue())).append(';'); buf.append(pct(rate.getPercentageOfLifetimeValue())).append(';'); @@ -259,7 +259,7 @@ public class StatisticsManager implements Service { } private String renderRate(Rate rate, double fudgeQuantity) { - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append(num(rate.getAverageValue())).append(';'); buf.append(num(rate.getExtremeAverageValue())).append(';'); buf.append(pct(rate.getPercentageOfLifetimeValue())).append(';'); diff --git a/router/java/src/net/i2p/router/TunnelPoolSettings.java b/router/java/src/net/i2p/router/TunnelPoolSettings.java index fab33d919..bf7eb0638 100644 --- a/router/java/src/net/i2p/router/TunnelPoolSettings.java +++ b/router/java/src/net/i2p/router/TunnelPoolSettings.java @@ -187,7 +187,7 @@ public class TunnelPoolSettings { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); Properties p = new Properties(); writeToProperties("", p); buf.append("Tunnel pool settings:\n"); diff --git a/router/java/src/net/i2p/router/admin/AdminRunner.java b/router/java/src/net/i2p/router/admin/AdminRunner.java index c515f8976..2851d7d86 100644 --- a/router/java/src/net/i2p/router/admin/AdminRunner.java +++ b/router/java/src/net/i2p/router/admin/AdminRunner.java @@ -73,7 +73,7 @@ class AdminRunner implements Runnable { } private void reply(OutputStream out, String content) throws IOException { - StringBuffer reply = new StringBuffer(10240); + StringBuilder reply = new StringBuilder(10240); reply.append("HTTP/1.1 200 OK\n"); reply.append("Connection: close\n"); reply.append("Cache-control: no-cache\n"); @@ -90,7 +90,7 @@ class AdminRunner implements Runnable { } private void replyText(OutputStream out, String content) throws IOException { - StringBuffer reply = new StringBuffer(10240); + StringBuilder reply = new StringBuilder(10240); reply.append("HTTP/1.1 200 OK\n"); reply.append("Connection: close\n"); reply.append("Cache-control: no-cache\n"); diff --git a/router/java/src/net/i2p/router/admin/StatsGenerator.java b/router/java/src/net/i2p/router/admin/StatsGenerator.java index f1053a341..8da59a255 100644 --- a/router/java/src/net/i2p/router/admin/StatsGenerator.java +++ b/router/java/src/net/i2p/router/admin/StatsGenerator.java @@ -28,7 +28,7 @@ public class StatsGenerator { } public void generateStatsPage(Writer out) throws IOException { - StringBuffer buf = new StringBuffer(16*1024); + StringBuilder buf = new StringBuilder(16*1024); buf.append("
"); buf.append(""); diff --git a/router/java/src/net/i2p/router/peermanager/ProfilePersistenceHelper.java b/router/java/src/net/i2p/router/peermanager/ProfilePersistenceHelper.java index e1f265d8f..e7151314e 100644 --- a/router/java/src/net/i2p/router/peermanager/ProfilePersistenceHelper.java +++ b/router/java/src/net/i2p/router/peermanager/ProfilePersistenceHelper.java @@ -89,7 +89,7 @@ class ProfilePersistenceHelper { groups = groups + ", well integrated"; } - StringBuffer buf = new StringBuffer(512); + StringBuilder buf = new StringBuilder(512); buf.append("########################################################################").append(NL); buf.append("# profile for ").append(profile.getPeer().toBase64()).append(NL); if (_us != null) diff --git a/router/java/src/net/i2p/router/peermanager/TunnelHistory.java b/router/java/src/net/i2p/router/peermanager/TunnelHistory.java index d43aff6cd..bdf352501 100644 --- a/router/java/src/net/i2p/router/peermanager/TunnelHistory.java +++ b/router/java/src/net/i2p/router/peermanager/TunnelHistory.java @@ -131,7 +131,7 @@ public class TunnelHistory { private final static String NL = System.getProperty("line.separator"); public void store(OutputStream out) throws IOException { - StringBuffer buf = new StringBuffer(512); + StringBuilder buf = new StringBuilder(512); buf.append(NL); buf.append("#################").append(NL); buf.append("# Tunnel history").append(NL); @@ -150,7 +150,7 @@ public class TunnelHistory { _failRate.store(out, "tunnelHistory.failRate"); } - private void add(StringBuffer buf, String name, long val, String description) { + private void add(StringBuilder buf, String name, long val, String description) { buf.append("# ").append(name.toUpperCase()).append(NL).append("# ").append(description).append(NL); buf.append("tunnels.").append(name).append('=').append(val).append(NL).append(NL); } diff --git a/router/java/src/net/i2p/router/startup/ClientAppConfig.java b/router/java/src/net/i2p/router/startup/ClientAppConfig.java index f5d48cb1f..70d61f346 100644 --- a/router/java/src/net/i2p/router/startup/ClientAppConfig.java +++ b/router/java/src/net/i2p/router/startup/ClientAppConfig.java @@ -47,13 +47,15 @@ public class ClientAppConfig { cfgFile = new File(ctx.getConfigDir(), clientConfigFile); // fall back to use router.config's clientApp.* lines - if (!cfgFile.exists()) + if (!cfgFile.exists()) { + System.out.println("Warning - No client config file " + cfgFile.getAbsolutePath()); return ctx.router().getConfigMap(); + } try { DataHelper.loadProps(rv, cfgFile); } catch (IOException ioe) { - // _log.warn("Error loading the client app properties from " + cfgFile.getName(), ioe); + System.out.println("Error loading the client app properties from " + cfgFile.getAbsolutePath() + ' ' + ioe); } return rv; @@ -99,7 +101,7 @@ public class ClientAppConfig { FileOutputStream fos = null; try { fos = new FileOutputStream(cfgFile); - StringBuffer buf = new StringBuffer(2048); + StringBuilder buf = new StringBuilder(2048); for(int i = 0; i < apps.size(); i++) { ClientAppConfig app = (ClientAppConfig) apps.get(i); buf.append(PREFIX).append(i).append(".main=").append(app.className).append("\n"); diff --git a/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java b/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java index 0770241d6..0f86f5b61 100644 --- a/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java +++ b/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java @@ -29,6 +29,11 @@ public class LoadClientAppsJob extends JobImpl { _loaded = true; } List apps = ClientAppConfig.getClientApps(getContext()); + if (apps.size() <= 0) { + _log.error("Warning - No client apps or router console configured - we are just a router"); + System.err.println("Warning - No client apps or router console configured - we are just a router"); + return; + } for(int i = 0; i < apps.size(); i++) { ClientAppConfig app = (ClientAppConfig) apps.get(i); if (app.disabled) @@ -64,7 +69,7 @@ public class LoadClientAppsJob extends JobImpl { List argList = new ArrayList(4); if (args != null) { char data[] = args.toCharArray(); - StringBuffer buf = new StringBuffer(32); + StringBuilder buf = new StringBuilder(32); boolean isQuoted = false; for (int i = 0; i < data.length; i++) { switch (data[i]) { @@ -74,7 +79,7 @@ public class LoadClientAppsJob extends JobImpl { String str = buf.toString().trim(); if (str.length() > 0) argList.add(str); - buf = new StringBuffer(32); + buf = new StringBuilder(32); } else { isQuoted = true; } @@ -89,7 +94,7 @@ public class LoadClientAppsJob extends JobImpl { String str = buf.toString().trim(); if (str.length() > 0) argList.add(str); - buf = new StringBuffer(32); + buf = new StringBuilder(32); } break; default: diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java index 858490345..9067aad93 100644 --- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java +++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java @@ -206,14 +206,15 @@ public class CommSystemFacadeImpl extends CommSystemFacade { public final static String PROP_I2NP_NTCP_AUTO_IP = "i2np.ntcp.autoip"; /** + * This only creates an address if the hostname AND port are set in router.config, + * which should be rare. + * Otherwise, notifyReplaceAddress() below takes care of it. + * Note this is called both from above and from NTCPTransport.startListening() + * * This should really be moved to ntcp/NTCPTransport.java, why is it here? */ public static RouterAddress createNTCPAddress(RouterContext ctx) { if (!TransportManager.enableNTCP(ctx)) return null; - RouterAddress addr = new RouterAddress(); - addr.setCost(10); - addr.setExpiration(null); - Properties props = new Properties(); String name = ctx.router().getConfigSetting(PROP_I2NP_NTCP_HOSTNAME); String port = ctx.router().getConfigSetting(PROP_I2NP_NTCP_PORT); /* @@ -236,12 +237,16 @@ public class CommSystemFacadeImpl extends CommSystemFacade { } catch (NumberFormatException nfe) { return null; } + Properties props = new Properties(); props.setProperty(NTCPAddress.PROP_HOST, name); props.setProperty(NTCPAddress.PROP_PORT, port); + RouterAddress addr = new RouterAddress(); + addr.setCost(10); + addr.setExpiration(null); addr.setOptions(props); addr.setTransportStyle(NTCPTransport.STYLE); //if (isNew) { - if (false) return null; + // why save the same thing? ctx.router().setConfigSetting(PROP_I2NP_NTCP_HOSTNAME, name); ctx.router().setConfigSetting(PROP_I2NP_NTCP_PORT, port); ctx.router().saveConfig(); @@ -334,6 +339,15 @@ public class CommSystemFacadeImpl extends CommSystemFacade { } } else if (ohost == null || ohost.length() <= 0) { return; + } else if (enabled.equalsIgnoreCase("true") && status != STATUS_OK) { + // UDP transitioned to not-OK, turn off NTCP address + // This will commonly happen at startup if we were initially OK + // because UPnP was successful, but a subsequent SSU Peer Test determines + // we are still firewalled (SW firewall, bad UPnP indication, etc.) + if (_log.shouldLog(Log.INFO)) + _log.info("old: " + ohost + " config: " + name + " new: null"); + newAddr = null; + changed = true; } if (!changed) { @@ -346,10 +360,12 @@ public class CommSystemFacadeImpl extends CommSystemFacade { // // really need to fix this so that we can change or create an inbound address // without tearing down everything + // Especially on disabling the address, we shouldn't tear everything down. // _log.warn("Halting NTCP to change address"); t.stopListening(); - newAddr.setOptions(newProps); + if (newAddr != null) + newAddr.setOptions(newProps); // Wait for NTCP Pumper to stop so we don't end up with two... while (t.isAlive()) { try { Thread.sleep(5*1000); } catch (InterruptedException ie) {} @@ -448,7 +464,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade { /** Provide a consistent "look" for displaying router IDs in the console */ public String renderPeerHTML(Hash peer) { String h = peer.toBase64().substring(0, 4); - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); String c = getCountry(peer); if (c != null) { buf.append("\"").append(c.toUpperCase()).append("\"Limiter Status:
").append(getStatus().toString()).append("

\n"); buf.append("

Pending bandwidth requests:

    "); buf.append("
  • Inbound requests:
      "); diff --git a/router/java/src/net/i2p/router/transport/GeoIP.java b/router/java/src/net/i2p/router/transport/GeoIP.java index fb4984978..185547a31 100644 --- a/router/java/src/net/i2p/router/transport/GeoIP.java +++ b/router/java/src/net/i2p/router/transport/GeoIP.java @@ -140,7 +140,7 @@ public class GeoIP { FileInputStream in = null; try { in = new FileInputStream(GeoFile); - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); while (DataHelper.readLine(in, buf)) { try { if (buf.charAt(0) == '#') { @@ -202,7 +202,7 @@ public class GeoIP { FileInputStream in = null; try { in = new FileInputStream(GeoFile); - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); while (DataHelper.readLine(in, buf) && idx < search.length) { try { if (buf.charAt(0) == '#') { diff --git a/router/java/src/net/i2p/router/transport/TransportImpl.java b/router/java/src/net/i2p/router/transport/TransportImpl.java index e6e3c80e5..7f27766a7 100644 --- a/router/java/src/net/i2p/router/transport/TransportImpl.java +++ b/router/java/src/net/i2p/router/transport/TransportImpl.java @@ -364,7 +364,7 @@ public abstract class TransportImpl implements Transport { if (msToReceive > 5000) level = Log.WARN; if (_log.shouldLog(level)) { - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append("Message received: ").append(inMsg.getClass().getName()); buf.append(" / ").append(inMsg.getUniqueId()); buf.append(" in ").append(msToReceive).append("ms containing "); diff --git a/router/java/src/net/i2p/router/transport/TransportManager.java b/router/java/src/net/i2p/router/transport/TransportManager.java index c61ed14f8..d432f80fd 100644 --- a/router/java/src/net/i2p/router/transport/TransportManager.java +++ b/router/java/src/net/i2p/router/transport/TransportManager.java @@ -486,7 +486,7 @@ public class TransportManager implements TransportEventListener { Transport t= (Transport)iter.next(); t.renderStatusHTML(out, urlBase, sortFlags); } - StringBuffer buf = new StringBuffer(4*1024); + StringBuilder buf = new StringBuilder(4*1024); buf.append("

      Router Transport Addresses:

      \n");
         for (int i = 0; i < _transports.size(); i++) {
             Transport t = (Transport)_transports.get(i);
diff --git a/router/java/src/net/i2p/router/transport/ntcp/EstablishState.java b/router/java/src/net/i2p/router/transport/ntcp/EstablishState.java
index e462764d5..89d1cf85b 100644
--- a/router/java/src/net/i2p/router/transport/ntcp/EstablishState.java
+++ b/router/java/src/net/i2p/router/transport/ntcp/EstablishState.java
@@ -662,7 +662,7 @@ public class EstablishState {
     private String prefix() { return toString(); }
     @Override
     public String toString() {
-        StringBuffer buf = new StringBuffer(64);
+        StringBuilder buf = new StringBuilder(64);
         buf.append("est").append(System.identityHashCode(this));
         if (_con.isInbound()) buf.append(" inbound");
         else buf.append(" outbound");
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 84cd76732..5fa10b310 100644
--- a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java
+++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java
@@ -417,7 +417,7 @@ public class NTCPTransport extends TransportImpl {
     private static final int NUM_CONCURRENT_WRITERS = 3;
 
     public synchronized RouterAddress startListening() {
-        if (_log.shouldLog(Log.DEBUG)) _log.debug("Starting ntcp transport listening");
+        if (_log.shouldLog(Log.WARN)) _log.warn("Starting ntcp transport listening");
         _finisher.start();
         _pumper.startPumping();
 
@@ -429,14 +429,17 @@ public class NTCPTransport extends TransportImpl {
     }
 
     public synchronized RouterAddress restartListening(RouterAddress addr) {
-        if (_log.shouldLog(Log.DEBUG)) _log.debug("Restarting ntcp transport listening");
+        if (_log.shouldLog(Log.WARN)) _log.warn("Restarting ntcp transport listening");
         _finisher.start();
         _pumper.startPumping();
 
         _reader.startReading(NUM_CONCURRENT_READERS);
         _writer.startWriting(NUM_CONCURRENT_WRITERS);
 
-        _myAddress = new NTCPAddress(addr);
+        if (addr == null)
+            _myAddress = null;
+        else
+            _myAddress = new NTCPAddress(addr);
         return bindAddress();
     }
 
@@ -603,7 +606,7 @@ public class NTCPTransport extends TransportImpl {
      *  before calling startListening() or restartListening()
      */
     public synchronized void stopListening() {
-        if (_log.shouldLog(Log.DEBUG)) _log.debug("Stopping ntcp transport");
+        if (_log.shouldLog(Log.WARN)) _log.warn("Stopping ntcp transport");
         _pumper.stopPumping();
         _writer.stopWriting();
         _reader.stopReading();
@@ -643,7 +646,7 @@ public class NTCPTransport extends TransportImpl {
         long totalSend = 0;
         long totalRecv = 0;
 
-        StringBuffer buf = new StringBuffer(512);
+        StringBuilder buf = new StringBuilder(512);
         buf.append("
      NTCP connections: ").append(peers.size());
         buf.append(" limit: ").append(getMaxConnections());
         buf.append(" timeout: ").append(DataHelper.formatDuration(_pumper.getIdleTimeout()));
diff --git a/router/java/src/net/i2p/router/transport/udp/InboundEstablishState.java b/router/java/src/net/i2p/router/transport/udp/InboundEstablishState.java
index 290a5139b..7b2bce4b0 100644
--- a/router/java/src/net/i2p/router/transport/udp/InboundEstablishState.java
+++ b/router/java/src/net/i2p/router/transport/udp/InboundEstablishState.java
@@ -181,7 +181,7 @@ public class InboundEstablishState {
         _sentSignature = _context.dsa().sign(signed, _context.keyManager().getSigningPrivateKey());
         
         if (_log.shouldLog(Log.DEBUG)) {
-            StringBuffer buf = new StringBuffer(128);
+            StringBuilder buf = new StringBuilder(128);
             buf.append("Signing sessionCreated:");
             buf.append(" ReceivedX: ").append(Base64.encode(_receivedX));
             buf.append(" SentY: ").append(Base64.encode(_sentY));
@@ -333,7 +333,7 @@ public class InboundEstablishState {
     
     @Override
     public String toString() {            
-        StringBuffer buf = new StringBuffer(128);
+        StringBuilder buf = new StringBuilder(128);
         buf.append(super.toString());
         if (_receivedX != null)
             buf.append(" ReceivedX: ").append(Base64.encode(_receivedX, 0, 4));
diff --git a/router/java/src/net/i2p/router/transport/udp/InboundMessageState.java b/router/java/src/net/i2p/router/transport/udp/InboundMessageState.java
index 71ce7d081..7338e0b83 100644
--- a/router/java/src/net/i2p/router/transport/udp/InboundMessageState.java
+++ b/router/java/src/net/i2p/router/transport/udp/InboundMessageState.java
@@ -140,7 +140,7 @@ public class InboundMessageState {
         
         @Override
         public String toString() { 
-            StringBuffer buf = new StringBuffer(64);
+            StringBuilder buf = new StringBuilder(64);
             buf.append("Partial ACK of ");
             buf.append(_bitfieldMessageId);
             buf.append(" with ACKs for: ");
@@ -165,7 +165,7 @@ public class InboundMessageState {
     
     @Override
     public String toString() {
-        StringBuffer buf = new StringBuffer(32);
+        StringBuilder buf = new StringBuilder(32);
         buf.append("Message: ").append(_messageId);
         if (isComplete()) {
             buf.append(" completely received with ");
diff --git a/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java b/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java
index 47a54ce11..a5c732e08 100644
--- a/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java
+++ b/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState.java
@@ -291,7 +291,7 @@ public class OutboundEstablishState {
         DataHelper.toLong(signed, off, 4, _receivedSignedOnTime);
         boolean valid = _context.dsa().verifySignature(_receivedSignature, signed, _remotePeer.getSigningPublicKey());
         if (!valid || _log.shouldLog(Log.DEBUG)) {
-            StringBuffer buf = new StringBuffer(128);
+            StringBuilder buf = new StringBuilder(128);
             buf.append("Signed sessionCreated:");
             buf.append(" AliceIP: ").append(Base64.encode(_aliceIP));
             buf.append(" AlicePort: ").append(_alicePort);
diff --git a/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java b/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java
index 052ff2b4f..650c17592 100644
--- a/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java
+++ b/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java
@@ -295,7 +295,7 @@ public class OutboundMessageState {
     public String toString() {
         short sends[] = _fragmentSends;
         ByteArray messageBuf = _messageBuf;
-        StringBuffer buf = new StringBuffer(64);
+        StringBuilder buf = new StringBuilder(64);
         buf.append("Message ").append(_messageId);
         if (sends != null)
             buf.append(" with ").append(sends.length).append(" fragments");
diff --git a/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java b/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java
index dcdf5fb6d..d12076e7f 100644
--- a/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java
+++ b/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java
@@ -61,10 +61,10 @@ public class PacketBuilder {
     public UDPPacket buildPacket(OutboundMessageState state, int fragment, PeerState peer, List ackIdsRemaining, List partialACKsRemaining) {
         UDPPacket packet = UDPPacket.acquire(_context, false);
 
-        StringBuffer msg = null;
+        StringBuilder msg = null;
         boolean acksIncluded = false;
         if (_log.shouldLog(Log.INFO)) {
-            msg = new StringBuffer(128);
+            msg = new StringBuilder(128);
             msg.append("Send to ").append(peer.getRemotePeer().toBase64());
             msg.append(" msg ").append(state.getMessageId()).append(":").append(fragment);
             if (fragment == state.getFragmentCount() - 1)
@@ -219,9 +219,9 @@ public class PacketBuilder {
     public UDPPacket buildACK(PeerState peer, List ackBitfields) {
         UDPPacket packet = UDPPacket.acquire(_context, false);
         
-        StringBuffer msg = null;
+        StringBuilder msg = null;
         if (_log.shouldLog(Log.DEBUG)) {
-            msg = new StringBuffer(128);
+            msg = new StringBuilder(128);
             msg.append("building ACK packet to ").append(peer.getRemotePeer().toBase64().substring(0,6));
         }
 
@@ -379,7 +379,7 @@ public class PacketBuilder {
         off += 8;
         
         if (_log.shouldLog(Log.DEBUG)) {
-            StringBuffer buf = new StringBuffer(128);
+            StringBuilder buf = new StringBuilder(128);
             buf.append("Sending sessionCreated:");
             buf.append(" AliceIP: ").append(Base64.encode(sentIP));
             buf.append(" AlicePort: ").append(state.getSentPort());
diff --git a/router/java/src/net/i2p/router/transport/udp/PacketHandler.java b/router/java/src/net/i2p/router/transport/udp/PacketHandler.java
index d32e8526d..fb5d2e9c9 100644
--- a/router/java/src/net/i2p/router/transport/udp/PacketHandler.java
+++ b/router/java/src/net/i2p/router/transport/udp/PacketHandler.java
@@ -93,7 +93,7 @@ public class PacketHandler {
     }
 
     String getHandlerStatus() {
-        StringBuffer rv = new StringBuffer();
+        StringBuilder rv = new StringBuilder();
         int size = _handlers.size();
         rv.append("Handlers: ").append(size);
         for (int i = 0; i < size; i++) {
@@ -324,7 +324,7 @@ public class PacketHandler {
         private void receivePacket(UDPPacketReader reader, UDPPacket packet, InboundEstablishState state, boolean allowFallback) {
             _state = 31;
             if ( (state != null) && (_log.shouldLog(Log.DEBUG)) ) {
-                StringBuffer buf = new StringBuffer(128);
+                StringBuilder buf = new StringBuilder(128);
                 buf.append("Attempting to receive a packet on a known inbound state: ");
                 buf.append(state);
                 buf.append(" MAC key: ").append(state.getMACKey());
@@ -362,7 +362,7 @@ public class PacketHandler {
         private void receivePacket(UDPPacketReader reader, UDPPacket packet, OutboundEstablishState state) {
             _state = 35;
             if ( (state != null) && (_log.shouldLog(Log.DEBUG)) ) {
-                StringBuffer buf = new StringBuffer(128);
+                StringBuilder buf = new StringBuilder(128);
                 buf.append("Attempting to receive a packet on a known outbound state: ");
                 buf.append(state);
                 buf.append(" MAC key: ").append(state.getMACKey());
@@ -470,7 +470,7 @@ public class PacketHandler {
                     if (state != null) {
                         UDPPacketReader.DataReader dr = reader.getDataReader();
                         if (_log.shouldLog(Log.INFO)) {
-                            StringBuffer msg = new StringBuffer();
+                            StringBuilder msg = new StringBuilder();
                             msg.append("Receive ").append(System.identityHashCode(packet));
                             msg.append(" from ").append(state.getRemotePeer().toBase64()).append(" ").append(state.getRemoteHostId());
                             for (int i = 0; i < dr.readFragmentCount(); i++) {
diff --git a/router/java/src/net/i2p/router/transport/udp/PeerState.java b/router/java/src/net/i2p/router/transport/udp/PeerState.java
index 74608069c..85169b049 100644
--- a/router/java/src/net/i2p/router/transport/udp/PeerState.java
+++ b/router/java/src/net/i2p/router/transport/udp/PeerState.java
@@ -1555,7 +1555,7 @@ public class PeerState {
     
     @Override
     public String toString() {
-        StringBuffer buf = new StringBuffer(64);
+        StringBuilder buf = new StringBuilder(64);
         buf.append(_remoteHostId.toString());
         if (_remotePeer != null)
             buf.append(" ").append(_remotePeer.toBase64().substring(0,6));
diff --git a/router/java/src/net/i2p/router/transport/udp/PeerTestState.java b/router/java/src/net/i2p/router/transport/udp/PeerTestState.java
index 625bf648a..16fff5fa8 100644
--- a/router/java/src/net/i2p/router/transport/udp/PeerTestState.java
+++ b/router/java/src/net/i2p/router/transport/udp/PeerTestState.java
@@ -98,7 +98,7 @@ class PeerTestState {
     
     @Override
     public synchronized String toString() {
-        StringBuffer buf = new StringBuffer(512);
+        StringBuilder buf = new StringBuilder(512);
         buf.append("Role: ");
         if (_ourRole == ALICE) buf.append("Alice");
         else if (_ourRole == BOB) buf.append("Bob");
diff --git a/router/java/src/net/i2p/router/transport/udp/RemoteHostId.java b/router/java/src/net/i2p/router/transport/udp/RemoteHostId.java
index 4bb2338f1..510d712a0 100644
--- a/router/java/src/net/i2p/router/transport/udp/RemoteHostId.java
+++ b/router/java/src/net/i2p/router/transport/udp/RemoteHostId.java
@@ -60,7 +60,7 @@ final class RemoteHostId {
         }
     }
     public static String toString(byte ip[]) {
-        StringBuffer buf = new StringBuffer(ip.length+5);
+        StringBuilder buf = new StringBuilder(ip.length+5);
         for (int i = 0; i < ip.length; i++) {
             buf.append(ip[i]&0xFF);
             if (i + 1 < ip.length)
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPAddress.java b/router/java/src/net/i2p/router/transport/udp/UDPAddress.java
index 723817e01..6db0b1c6c 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPAddress.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPAddress.java
@@ -42,7 +42,7 @@ public class UDPAddress {
     
     @Override
     public String toString() {
-        StringBuffer rv = new StringBuffer(64);
+        StringBuilder rv = new StringBuilder(64);
         if (_introHosts != null) {
             for (int i = 0; i < _introHosts.length; i++) {
                 rv.append("ssu://");
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPPacket.java b/router/java/src/net/i2p/router/transport/udp/UDPPacket.java
index 4a5ef837f..37fd5ad12 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPPacket.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPPacket.java
@@ -168,7 +168,7 @@ public class UDPPacket {
             Hash hmac = _context.hmac().calculate(macKey, buf.getData(), 0, off);
 
             if (_log.shouldLog(Log.DEBUG)) {
-                StringBuffer str = new StringBuffer(128);
+                StringBuilder str = new StringBuilder(128);
                 str.append(_packet.getLength()).append(" byte packet received, payload length ");
                 str.append(payloadLength);
                 str.append("\nIV: ").append(Base64.encode(buf.getData(), payloadLength, IV_SIZE));
@@ -237,7 +237,7 @@ public class UDPPacket {
     @Override
     public String toString() {
         verifyNotReleased(); 
-        StringBuffer buf = new StringBuffer(64);
+        StringBuilder buf = new StringBuilder(64);
         buf.append(_packet.getLength());
         buf.append(" byte packet with ");
         buf.append(_packet.getAddress().getHostAddress()).append(":");
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java b/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java
index 5bff1789d..9bb665f6b 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java
@@ -129,7 +129,7 @@ public class UDPPacketReader {
         }
     }
     
-    public void toRawString(StringBuffer buf) {
+    public void toRawString(StringBuilder buf) {
         if (_message != null)
             buf.append(Base64.encode(_message, _payloadBeginOffset, _payloadLength));
     }
@@ -401,7 +401,7 @@ public class UDPPacketReader {
         
         @Override
         public String toString() {
-            StringBuffer buf = new StringBuffer(256);
+            StringBuilder buf = new StringBuilder(256);
             long msAgo = _context.clock().now() - readTimestamp()*1000;
             buf.append("Data packet sent ").append(msAgo).append("ms ago ");
             buf.append("IV ");
@@ -463,7 +463,7 @@ public class UDPPacketReader {
             return buf.toString();
         }
         
-        public void toRawString(StringBuffer buf) { 
+        public void toRawString(StringBuilder buf) { 
             UDPPacketReader.this.toRawString(buf); 
             buf.append(" payload: ");
                   
@@ -506,7 +506,7 @@ public class UDPPacketReader {
         }
         @Override
         public String toString() { 
-            StringBuffer buf = new StringBuffer(64);
+            StringBuilder buf = new StringBuilder(64);
             buf.append("Read partial ACK of ");
             buf.append(getMessageId());
             buf.append(" with ACKs for: ");
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPReceiver.java b/router/java/src/net/i2p/router/transport/udp/UDPReceiver.java
index 6dec9779e..82d0ea656 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPReceiver.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPReceiver.java
@@ -164,7 +164,7 @@ public class UDPReceiver {
         packet.release();
         _context.statManager().addRateData("udp.droppedInbound", queueSize, headPeriod);
         if (_log.shouldLog(Log.WARN)) {
-            StringBuffer msg = new StringBuffer();
+            StringBuilder msg = new StringBuilder();
             msg.append("Dropping inbound packet with ");
             msg.append(queueSize);
             msg.append(" queued for ");
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 e010e5213..47edd62c3 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
@@ -437,12 +437,16 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
             synchronized (this) {
                 if ( (_externalListenHost == null) ||
                      (!eq(_externalListenHost.getAddress(), _externalListenPort, ourIP, ourPort)) ) {
+                    if (_log.shouldLog(Log.WARN))
+                        _log.warn("Change address? status = " + _reachabilityStatus +
+                                  " diff = " + (_context.clock().now() - _reachabilityStatusLastUpdated) +
+                                  " old = " + _externalListenHost + ':' + _externalListenPort);
                     if ( (_reachabilityStatus != CommSystemFacade.STATUS_OK) ||
                          (_externalListenHost == null) || (_externalListenPort <= 0) ||
                          (_context.clock().now() - _reachabilityStatusLastUpdated > 2*TEST_FREQUENCY) ) {
                         // they told us something different and our tests are either old or failing
-                        if (_log.shouldLog(Log.INFO))
-                            _log.info("Trying to change our external address...");
+                        if (_log.shouldLog(Log.WARN))
+                            _log.warn("Trying to change our external address...");
                         try {
                             _externalListenHost = InetAddress.getByAddress(ourIP);
                             // fixed port defaults to true so we never do this
@@ -455,15 +459,15 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
                             }
                         } catch (UnknownHostException uhe) {
                             _externalListenHost = null;
-                            if (_log.shouldLog(Log.INFO))
-                                _log.info("Error trying to change our external address", uhe);
+                            if (_log.shouldLog(Log.WARN))
+                                _log.warn("Error trying to change our external address", uhe);
                         }
                     } else {
                         // they told us something different, but our tests are recent and positive,
                         // so lets test again
                         fireTest = true;
-                        if (_log.shouldLog(Log.INFO))
-                            _log.info("Different address, but we're fine.. (" + _reachabilityStatus + ")");
+                        if (_log.shouldLog(Log.WARN))
+                            _log.warn("Different address, but we're fine.. (" + _reachabilityStatus + ")");
                     }
                 } else {
                     // matched what we expect
@@ -760,7 +764,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
     private void dropPeer(PeerState peer, boolean shouldShitlist, String why) {
         if (_log.shouldLog(Log.WARN)) {
             long now = _context.clock().now();
-            StringBuffer buf = new StringBuffer(4096);
+            StringBuilder buf = new StringBuilder(4096);
             long timeSinceSend = now - peer.getLastSendTime();
             long timeSinceRecv = now - peer.getLastReceiveTime();
             long timeSinceAck  = now - peer.getLastACKSend();
@@ -1282,7 +1286,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
      
         OutNetMessage m = msg.getMessage();
         PeerState p = msg.getPeer();
-        StringBuffer buf = new StringBuffer(64);
+        StringBuilder buf = new StringBuilder(64);
         buf.append(" lifetime: ").append(msg.getLifetime());
         buf.append(" sends: ").append(sends);
         buf.append(" pushes: ").append(pushCount);
@@ -1727,7 +1731,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
         }
     }
     
-    private void appendSortLinks(StringBuffer buf, String urlBase, int sortFlags, String descr, int ascending) {
+    private void appendSortLinks(StringBuilder buf, String urlBase, int sortFlags, String descr, int ascending) {
         if (sortFlags == ascending) {
             buf.append(" V^ ");
@@ -1763,7 +1767,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
         long dupRecvTotal = 0;
         int numPeers = 0;
         
-        StringBuffer buf = new StringBuffer(512);
+        StringBuilder buf = new StringBuilder(512);
         buf.append("
      UDP connections: ").append(peers.size());
         buf.append(" limit: ").append(getMaxConnections());
         buf.append(" timeout: ").append(DataHelper.formatDuration(_expireTimeout));
diff --git a/router/java/src/net/i2p/router/tunnel/BatchedPreprocessor.java b/router/java/src/net/i2p/router/tunnel/BatchedPreprocessor.java
index 2de7868db..751d629a5 100644
--- a/router/java/src/net/i2p/router/tunnel/BatchedPreprocessor.java
+++ b/router/java/src/net/i2p/router/tunnel/BatchedPreprocessor.java
@@ -65,10 +65,10 @@ public class BatchedPreprocessor extends TrivialPreprocessor {
     
     @Override
     public boolean preprocessQueue(List pending, TunnelGateway.Sender sender, TunnelGateway.Receiver rec) {
-        StringBuffer timingBuf = null;
+        StringBuilder timingBuf = null;
         if (_log.shouldLog(Log.DEBUG)) {
             _log.debug("Preprocess queue with " + pending.size() + " to send");
-            timingBuf = new StringBuffer(128);
+            timingBuf = new StringBuilder(128);
             timingBuf.append("Preprocess with " + pending.size() + " to send. ");
         }
         if (DISABLE_BATCHING) {
@@ -246,7 +246,7 @@ public class BatchedPreprocessor extends TrivialPreprocessor {
     private void display(long allocated, List pending, String title) {
         if (_log.shouldLog(Log.INFO)) {
             long highestDelay = 0;
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append(_name).append(": ");
             buf.append(title);
             buf.append(" allocated: ").append(allocated);
@@ -286,7 +286,7 @@ public class BatchedPreprocessor extends TrivialPreprocessor {
         // generate the final preprocessed data
         
         if (offset <= 0) {
-            StringBuffer buf = new StringBuffer(128);
+            StringBuilder buf = new StringBuilder(128);
             buf.append("wtf, written offset is ").append(offset);
             buf.append(" for ").append(startAt).append(" through ").append(sendThrough);
             for (int i = startAt; i <= sendThrough; i++) {
diff --git a/router/java/src/net/i2p/router/tunnel/FragmentedMessage.java b/router/java/src/net/i2p/router/tunnel/FragmentedMessage.java
index 94e2c8c24..77f54bb2c 100644
--- a/router/java/src/net/i2p/router/tunnel/FragmentedMessage.java
+++ b/router/java/src/net/i2p/router/tunnel/FragmentedMessage.java
@@ -275,7 +275,7 @@ public class FragmentedMessage {
     
     @Override
     public String toString() {
-        StringBuffer buf = new StringBuffer(128);
+        StringBuilder buf = new StringBuilder(128);
         buf.append("Fragments for ").append(_messageId).append(": ");
         for (int i = 0; i <= _highFragmentNum; i++) {
             ByteArray ba = _fragments[i];
diff --git a/router/java/src/net/i2p/router/tunnel/HopConfig.java b/router/java/src/net/i2p/router/tunnel/HopConfig.java
index ab0c32a3f..532bdfe20 100644
--- a/router/java/src/net/i2p/router/tunnel/HopConfig.java
+++ b/router/java/src/net/i2p/router/tunnel/HopConfig.java
@@ -137,7 +137,7 @@ public class HopConfig {
     
     @Override
     public String toString() {
-        StringBuffer buf = new StringBuffer(64);
+        StringBuilder buf = new StringBuilder(64);
         if (_receiveTunnelId != null) {
             buf.append("recv on ");
             buf.append(DataHelper.fromLong(_receiveTunnelId, 0, 4));
diff --git a/router/java/src/net/i2p/router/tunnel/TrivialPreprocessor.java b/router/java/src/net/i2p/router/tunnel/TrivialPreprocessor.java
index d687df726..4792b14c2 100644
--- a/router/java/src/net/i2p/router/tunnel/TrivialPreprocessor.java
+++ b/router/java/src/net/i2p/router/tunnel/TrivialPreprocessor.java
@@ -43,9 +43,9 @@ public class TrivialPreprocessor implements TunnelGateway.QueuePreprocessor {
      */
     public boolean preprocessQueue(List pending, TunnelGateway.Sender sender, TunnelGateway.Receiver rec) {
         long begin = System.currentTimeMillis();
-        StringBuffer buf = null;
+        StringBuilder buf = null;
         if (_log.shouldLog(Log.DEBUG)) {
-            buf = new StringBuffer(256);
+            buf = new StringBuilder(256);
             buf.append("Trivial preprocessing of ").append(pending.size()).append(" ");
         }
         while (pending.size() > 0) {
diff --git a/router/java/src/net/i2p/router/tunnel/TunnelCreatorConfig.java b/router/java/src/net/i2p/router/tunnel/TunnelCreatorConfig.java
index 72dccf45c..c91af6929 100644
--- a/router/java/src/net/i2p/router/tunnel/TunnelCreatorConfig.java
+++ b/router/java/src/net/i2p/router/tunnel/TunnelCreatorConfig.java
@@ -166,7 +166,7 @@ public class TunnelCreatorConfig implements TunnelInfo {
     @Override
     public String toString() {
         // H0:1235-->H1:2345-->H2:2345
-        StringBuffer buf = new StringBuffer(128);
+        StringBuilder buf = new StringBuilder(128);
         if (_isInbound)
             buf.append("inbound");
         else
diff --git a/router/java/src/net/i2p/router/tunnel/TunnelGateway.java b/router/java/src/net/i2p/router/tunnel/TunnelGateway.java
index 077a43b7d..75887f406 100644
--- a/router/java/src/net/i2p/router/tunnel/TunnelGateway.java
+++ b/router/java/src/net/i2p/router/tunnel/TunnelGateway.java
@@ -238,7 +238,7 @@ public class TunnelGateway {
         
         @Override
         public String toString() {
-            StringBuffer buf = new StringBuffer(64);
+            StringBuilder buf = new StringBuilder(64);
             buf.append("Message ").append(_messageId).append(" on ");
             buf.append(TunnelGateway.this.toString());
             if (_toRouter != null) {
diff --git a/router/java/src/net/i2p/router/tunnel/TunnelParticipant.java b/router/java/src/net/i2p/router/tunnel/TunnelParticipant.java
index 5e4a92641..b9d660751 100644
--- a/router/java/src/net/i2p/router/tunnel/TunnelParticipant.java
+++ b/router/java/src/net/i2p/router/tunnel/TunnelParticipant.java
@@ -221,7 +221,7 @@ public class TunnelParticipant {
     @Override
     public String toString() { 
         if (_config != null) {
-            StringBuffer buf = new StringBuffer(64);
+            StringBuilder buf = new StringBuilder(64);
             buf.append("participant at ").append(_config.toString());
             return buf.toString();
         } else {
diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java b/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java
index bee05c9c6..0583c73b1 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java
@@ -206,7 +206,7 @@ class BuildHandler {
         long replyMessageId = state.msg.getUniqueId();
         PooledTunnelCreatorConfig cfg = null;
         List building = _exec.locked_getCurrentlyBuilding();
-        StringBuffer buf = null;
+        StringBuilder buf = null;
         synchronized (building) {
             for (int i = 0; i < building.size(); i++) {
                 PooledTunnelCreatorConfig cur = (PooledTunnelCreatorConfig)building.get(i);
@@ -217,7 +217,7 @@ class BuildHandler {
                 }
             }
             if ( (cfg == null) && (_log.shouldLog(Log.DEBUG)) )
-                buf = new StringBuffer(building.toString());
+                buf = new StringBuilder(building.toString());
         }
         
         if (cfg == null) {
diff --git a/router/java/src/net/i2p/router/tunnel/pool/TestJob.java b/router/java/src/net/i2p/router/tunnel/pool/TestJob.java
index 24b379543..c0633ef9f 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/TestJob.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/TestJob.java
@@ -252,7 +252,7 @@ class TestJob extends JobImpl {
         
         @Override
         public String toString() {
-            StringBuffer rv = new StringBuffer(64);
+            StringBuilder rv = new StringBuilder(64);
             rv.append("Testing tunnel ").append(_cfg.toString()).append(" waiting for ");
             rv.append(_id).append(" found? ").append(_found);
             return rv.toString();
@@ -284,7 +284,7 @@ class TestJob extends JobImpl {
         
         @Override
         public String toString() {
-            StringBuffer rv = new StringBuffer(64);
+            StringBuilder rv = new StringBuilder(64);
             rv.append("Testing tunnel ").append(_cfg.toString());
             rv.append(" successful after ").append(_successTime);
             return rv.toString();
@@ -310,7 +310,7 @@ class TestJob extends JobImpl {
         
         @Override
         public String toString() {
-            StringBuffer rv = new StringBuffer(64);
+            StringBuilder rv = new StringBuilder(64);
             rv.append("Testing tunnel ").append(_cfg.toString());
             rv.append(" timed out");
             return rv.toString();
diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java
index c51531005..2cfac2cc4 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java
@@ -129,7 +129,7 @@ public abstract class TunnelPeerSelector {
             rv.remove(0);
         
         if (log.shouldLog(Log.INFO)) {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             if (settings.getDestinationNickname() != null)
                 buf.append("peers for ").append(settings.getDestinationNickname());
             else if (settings.getDestination() != null)
diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
index 8ce5859df..39e6c2280 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
@@ -892,7 +892,7 @@ public class TunnelPool {
             else
                 return "Outbound exploratory pool";
         } else {
-            StringBuffer rv = new StringBuffer(32);
+            StringBuilder rv = new StringBuilder(32);
             if (_settings.isInbound())
                 rv.append("Inbound client pool for ");
             else
diff --git a/router/java/src/net/i2p/router/SSUDemo.java b/router/java/test/net/i2p/router/SSUDemo.java
similarity index 100%
rename from router/java/src/net/i2p/router/SSUDemo.java
rename to router/java/test/net/i2p/router/SSUDemo.java