Console: Move LS debug display back to the bottom,

can't work at the top as we don't have the data.

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("<tr><td><b>Known Floodfills:</b></td><td colspan=\"3\">").append(ff).append("</td></tr>\n")
            .append("<tr><td><b>Currently Floodfill?</b></td><td colspan=\"3\">").append(netdb.floodfillEnabled() ? "yes" : "no").append("</td></tr>\n");
-        if (debug) {
-            buf.append("<tr><td><b>Network data (only valid if floodfill):</b></td><td colspan=\"3\">");
-            //buf.append("</b></p><p><b>Center of Key Space (router hash): " + ourRKey.toBase64());
-            if (median != null) {
-                double log2 = biLog2(median);
-                buf.append("</td></tr>")
-                   .append("<tr><td><b>Median distance (bits):</b></td><td colspan=\"3\">").append(fmt.format(log2)).append("</td></tr>\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("<tr><td><b>Estimated total floodfills:</b></td><td colspan=\"3\">").append(total).append("</td></tr>\n");
-                buf.append("<tr><td><b>Estimated total leasesets:</b></td><td colspan=\"3\">").append(total * rapCount / 4);
-            } else {
-                buf.append("<i>Not floodfill or no data.</i>");
-            }
-            buf.append("</td></tr>\n");
-        }
         buf.append("</table>\n");
 
         if (leases.isEmpty()) {
@@ -411,6 +394,23 @@ class NetDbRenderer {
             out.write(buf.toString());
             buf.setLength(0);
           } // for each
+          if (debug) {
+              buf.append("<table id=\"leasesetdebug\"><tr><td><b>Network data (only valid if floodfill):</b></td><td colspan=\"3\">");
+              //buf.append("</b></p><p><b>Center of Key Space (router hash): " + ourRKey.toBase64());
+              if (median != null) {
+                  double log2 = biLog2(median);
+                  buf.append("</td></tr>")
+                     .append("<tr><td><b>Median distance (bits):</b></td><td colspan=\"3\">").append(fmt.format(log2)).append("</td></tr>\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("<tr><td><b>Estimated total floodfills:</b></td><td colspan=\"3\">").append(total).append("</td></tr>\n");
+                  buf.append("<tr><td><b>Estimated total leasesets:</b></td><td colspan=\"3\">").append(total * rapCount / 4);
+              } else {
+                  buf.append("<i>Not floodfill or no data.</i>");
+              }
+              buf.append("</td></tr></table>\n");
+          } // median table
           buf.append("</div>");
         }  // !empty
         out.write(buf.toString());

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

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 = "";