Total Leasesets: " + leases.size()); - buf.append("
Published (RAP) Leasesets: " + _context.netDb().getKnownLeaseSets()); - buf.append("
Mod Data: " + HexDump.dump(_context.routingKeyGenerator().getModData()) + "
"); - buf.append("
Network data (only valid if floodfill):"); - buf.append("
Center of Key Space (router hash): " + ourRKey.toBase64() + "
"); + buf.append("
Published (RAP) Leasesets: " + _context.netDb().getKnownLeaseSets()); + buf.append("
Mod Data: " + HexDump.dump(_context.routingKeyGenerator().getModData())); + buf.append("
Network data (only valid if floodfill):"); + buf.append("
Center of Key Space (router hash): " + ourRKey.toBase64()); if (median != null) { double log2 = biLog2(median); - buf.append("
Median distance (bits): " + fmt.format(log2)); + buf.append("
Median distance (bits): " + fmt.format(log2)); // 3 for 8 floodfills... -1 for median int total = (int) Math.round(Math.pow(2, 3 + 256 - 1 - log2)); - buf.append("
Estimated total floodfills: " + total); - buf.append("
Estimated network total leasesets: " + (total * leases.size() / 8)); + buf.append("
Estimated total floodfills: " + total); + buf.append("
Estimated network total leasesets: " + (total * leases.size() / 8)); } + buf.append("
"); } out.write(buf.toString()); out.flush(); @@ -405,11 +405,10 @@ public class NetDbRenderer { /** * what transport types */ - private int classifyTransports(RouterInfo info) { + private static int classifyTransports(RouterInfo info) { int rv = 0; String hash = info.getIdentity().getHash().toBase64(); - for (Iterator iter = info.getAddresses().iterator(); iter.hasNext(); ) { - RouterAddress addr = (RouterAddress)iter.next(); + for (RouterAddress addr : info.getAddresses()) { String style = addr.getTransportStyle(); if (style.equals("NTCP")) { rv |= NTCP; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java b/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java index 9e0a0c951..d1835a320 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java @@ -95,7 +95,8 @@ public class PluginStarter implements Runnable { log.error("Cannot start nonexistent plugin: " + appName); return false; } - //log.error("Starting plugin: " + appName); + if (log.shouldLog(Log.INFO)) + log.info("Starting plugin: " + appName); // register themes File dir = new File(pluginDir, "console/themes"); @@ -139,7 +140,8 @@ public class PluginStarter implements Runnable { } String enabled = props.getProperty(RouterConsoleRunner.PREFIX + warName + ENABLED); if (! "false".equals(enabled)) { - //log.error("Starting webapp: " + warName); + if (log.shouldLog(Log.INFO)) + log.info("Starting webapp: " + warName); String path = new File(webappDir, fileNames[i]).getCanonicalPath(); WebAppStarter.startWebApp(ctx, server, warName, path); pluginWars.get(appName).add(warName); @@ -149,6 +151,8 @@ public class PluginStarter implements Runnable { } } } + } else { + log.error("No console web server to start plugins?"); } // add translation jars in console/locale diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java index 1aa5e9040..9eab8649e 100644 --- a/core/java/src/net/i2p/data/DataHelper.java +++ b/core/java/src/net/i2p/data/DataHelper.java @@ -781,11 +781,10 @@ public class DataHelper { * This treats (null == null) as true, (null == (!null)) as false, * and unequal length arrays as false. * + * @return Arrays.equals(lhs, rhs) */ public final static boolean eq(byte lhs[], byte rhs[]) { - // this appears to be the way Arrays.equals is defined, so all the extra tests are unnecessary? - boolean eq = (((lhs == null) && (rhs == null)) || ((lhs != null) && (rhs != null) && (Arrays.equals(lhs, rhs)))); - return eq; + return Arrays.equals(lhs, rhs); } /** diff --git a/history.txt b/history.txt index 57822a197..20924cd6d 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,11 @@ +2011-04-11 zzz + * Console: Hide iframe on mobile browsers + * DataHelper: Speed up eq() (Ticket #437) + * HTTPServer: Strip inbound X-Accept-Encoding header + * netdb.jsp: HTML fixes + * Plugins: Log error when console server not found + * Reseed: Log tweak + 2011-04-02 m1xxy * routerconsole, i2psnark, ... I2P ahora también en español: ¡Bienvenidos los hispanohablantes! - routerconsole, i2ptunnel, i2psnark, SusiDNS, Susimail fully translated into Spanish diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index a6204817e..f2522cd4e 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 = 8; + public final static long BUILD = 9; /** for example "-test" */ public final static String EXTRA = ""; diff --git a/router/java/src/net/i2p/router/networkdb/reseed/ReseedChecker.java b/router/java/src/net/i2p/router/networkdb/reseed/ReseedChecker.java index dd11c4ae2..6bb816985 100644 --- a/router/java/src/net/i2p/router/networkdb/reseed/ReseedChecker.java +++ b/router/java/src/net/i2p/router/networkdb/reseed/ReseedChecker.java @@ -35,9 +35,9 @@ public class ReseedChecker { if (!noReseedFile.exists() && !noReseedFileAlt1.exists() && !noReseedFileAlt2.exists() && !noReseedFileAlt3.exists()) { Log _log = context.logManager().getLog(ReseedChecker.class); if (count <= 1) - _log.error("Downloading peer router information for a new I2P installation"); + _log.logAlways(Log.INFO, "Downloading peer router information for a new I2P installation"); else - _log.error("Very few routerInfo files remaining - reseeding now"); + _log.logAlways(Log.WARN, "Very few known peers remaining - reseeding now"); Reseeder reseeder = new Reseeder(context); reseeder.requestReseed(); }