i2psnark:

- Increase default to 3 hops (ticket #966)
   - Reduce upload threshold for auto-stop
   - Revert addition of js mime type, it was already in the default

apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java

@@ -544,7 +544,7 @@ public class SnarkManager implements CompleteListener {
         if (!_config.containsKey(PROP_I2CP_PORT))
             _config.setProperty(PROP_I2CP_PORT, "7654");
         if (!_config.containsKey(PROP_I2CP_OPTS))
-            _config.setProperty(PROP_I2CP_OPTS, "inbound.length=2 inbound.lengthVariance=0 outbound.length=2 outbound.lengthVariance=0 inbound.quantity=3 outbound.quantity=3");
+            _config.setProperty(PROP_I2CP_OPTS, "inbound.length=3 outbound.length=3 inbound.quantity=3 outbound.quantity=3");
         //if (!_config.containsKey(PROP_EEP_HOST))
         //    _config.setProperty(PROP_EEP_HOST, "127.0.0.1");
         //if (!_config.containsKey(PROP_EEP_PORT))

apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java

@@ -530,7 +530,7 @@ public class TrackerClient implements Runnable {
                         coordinator.getPeerCount() <= 0 &&
                         _util.getContext().clock().now() > _startedOn + 2*60*60*1000 &&
                         snark.getTotalLength() > 0 &&
-                        uploaded >= snark.getTotalLength() * 3 / 2) {
+                        uploaded >= snark.getTotalLength() * 5 / 4) {
                         if (_log.shouldLog(Log.WARN))
                             _log.warn("Auto stopping " + snark.getBaseName());
                         snark.setAutoStoppable(false);

apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

@@ -2232,15 +2232,15 @@ public class I2PSnarkServlet extends BasicServlet {
         out.write("<tr><td>");
         out.write(_("Inbound Settings"));
         out.write(":<td>");
-        out.write(renderOptions(1, 6, options.remove("inbound.quantity"), "inbound.quantity", TUNNEL));
+        out.write(renderOptions(1, 6, 3, options.remove("inbound.quantity"), "inbound.quantity", TUNNEL));
         out.write("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
-        out.write(renderOptions(0, 4, options.remove("inbound.length"), "inbound.length", HOP));
+        out.write(renderOptions(0, 4, 3, options.remove("inbound.length"), "inbound.length", HOP));
         out.write("<tr><td>");
         out.write(_("Outbound Settings"));
         out.write(":<td>");
-        out.write(renderOptions(1, 6, options.remove("outbound.quantity"), "outbound.quantity", TUNNEL));
+        out.write(renderOptions(1, 6, 3, options.remove("outbound.quantity"), "outbound.quantity", TUNNEL));
         out.write("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
-        out.write(renderOptions(0, 4, options.remove("outbound.length"), "outbound.length", HOP));
+        out.write(renderOptions(0, 4, 3, options.remove("outbound.length"), "outbound.length", HOP));
 
         if (!_context.isRouterContext()) {
             out.write("<tr><td>");
@@ -2393,8 +2393,8 @@ public class I2PSnarkServlet extends BasicServlet {
     private static final String DUMMY1 = "1 ";
 
     /** modded from ConfigTunnelsHelper @since 0.7.14 */
-    private String renderOptions(int min, int max, String strNow, String selName, String name) {
+    private String renderOptions(int min, int max, int dflt, String strNow, String selName, String name) {
-        int now = 2;
+        int now = dflt;
         try {
             now = Integer.parseInt(strNow);
         } catch (Throwable t) {}

apps/i2psnark/mime.properties

@@ -8,7 +8,6 @@ epub	= application/epub+zip
 flac	= audio/flac
 flv	= video/x-flv
 iso	= application/x-iso9660-image
-js	= text/javascript
 m4a	= audio/mp4a-latm
 m4v	= video/x-m4v
 mkv	= video/x-matroska

history.txt

@@ -1,9 +1,18 @@
+2014-09-27 zzz
+ * EdDSA: Use our PRNG by default for keygen
+ * i2psnark:
+   - Increase default to 3 hops (ticket #966)
+   - Show info hash on details page
+ * NetDB: Increase max age of RIs to reduce number refreshed after restart
+ * Tests: Fix junit compile fails due to data structure moves
+ * Transport: Hooks for pluggable transports (ticket #1170)
+
 2014-09-23 zzz
 Prop from i2p.i2p.zzz.test2:
  * Addressbook: Improve parser efficiency
  * Data structures: Move several router-only classes from i2p.jar to
    net.i2p.data.router in router.jar. This will break existing
-   versions of the itoopie plugin.
+   versions of the i2pcontrol plugin.
  * HTTP Client: Add error page for unsupported encryption
  * I2CP:
    - Verify crypto key pair in LS

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 = 3;
 
     /** for example "-test" */
     public final static String EXTRA = "";