diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java index b06166e6e2..80a749bb81 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java @@ -273,23 +273,6 @@ class NetDbRenderer { int ff = _context.peerManager().getPeersByCapability(FloodfillNetworkDatabaseFacade.CAPABILITY_FLOODFILL).size(); buf.append("Known Floodfills:").append(ff).append("\n") .append("Currently Floodfill?").append(netdb.floodfillEnabled() ? "yes" : "no").append("\n"); - if (debug) { - 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("") - .append("Median distance (bits):").append(fmt.format(log2)).append("\n"); - // 2 for 4 floodfills... -1 for median - // this can be way off for unknown reasons - int total = (int) Math.round(Math.pow(2, 2 + 256 - 1 - log2)); - buf.append("Estimated total floodfills:").append(total).append("\n"); - buf.append("Estimated total leasesets:").append(total * rapCount / 4); - } else { - buf.append("Not floodfill or no data."); - } - buf.append("\n"); - } buf.append("\n"); if (leases.isEmpty()) { @@ -411,6 +394,23 @@ class NetDbRenderer { out.write(buf.toString()); buf.setLength(0); } // for each + if (debug) { + buf.append("") + .append("\n"); + // 2 for 4 floodfills... -1 for median + // this can be way off for unknown reasons + int total = (int) Math.round(Math.pow(2, 2 + 256 - 1 - log2)); + buf.append("\n"); + 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):").append(fmt.format(log2)).append("
Estimated total floodfills:").append(total).append("
Estimated total leasesets:").append(total * rapCount / 4); + } else { + buf.append("Not floodfill or no data."); + } + buf.append("
\n"); + } // median table buf.append(""); } // !empty out.write(buf.toString()); diff --git a/history.txt b/history.txt index 77fcfd7af5..0584004471 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,10 @@ +2018-02-01 zzz + * Console: Fix number formatting (tickets #1912, #1913, #2126) + * i2psnark: URL escape fixes + * i2ptunnel: Reset connection if out of threads + * NetDB: Increase min floodfill version + * SusiMail: Don't duplicate Re: and Fwd: in subject + * 2018-01-30 0.9.33 released 2018-01-26 zzz diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index a411b00998..87e5bffca0 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 = 0; + public final static long BUILD = 1; /** for example "-test" */ public final static String EXTRA = "";