0.18.0

Enable ratchet by default
Disable pack200

CHANGES.txt

@@ -1,3 +1,7 @@
+2020-08-30 [0.18.0]
+  - Enable both encryption types
+  - Disable pack200
+
 2019-11-19 [0.17.0]
   - Add more configuration, customization, and registration info to help page
   - Add variables for $VERSION and $SITENAME
@@ -15,8 +19,8 @@
     - Enhance presentation of help page
     - Modify docroot/index.html post-install to contain b32 footer
     - Only display warning about moving help.html if necessary
-    - Add rewrite rules for /tracker, /tracker/, /tracker/index.html,
-      /help and /help/ to jetty.xml
+    - Add rewrite rules for /tracker/ and /tracker/index.html to web.xml
+    - Add rewrite rules for /help and /help/ to jetty.xml
     - Replace jetty.servlet.DefaultServlet with I2PDefaultServlet in BaseContext.xml
       (requires I2P 0.9.31 or newer)
 

build.xml

@@ -16,7 +16,7 @@
         <delete dir="plugin/eepsite/docroot/torrents/" />
         <!-- get version number -->
         <buildnumber file="scripts/build.number" />
-        <property name="release.number" value="0.17.0" />
+        <property name="release.number" value="0.18.0" />
 
         <!-- make the update xpi2p -->
         <!-- this contains everything except i2ptunnel.config -->
@@ -34,13 +34,13 @@
             <arg value="version=${release.number}-b${build.number}" />
         </exec>
         <exec executable="pack200" failonerror="true">
-            <arg value="-g" />
-            <arg value="plugin/lib/zzzot.jar.pack" />
+            <arg value="-r" />
+            <arg value="plugin/lib/zzzot.jar" />
             <arg value="src/build/zzzot.jar" />
         </exec>
         <exec executable="pack200" failonerror="true">
-            <arg value="-g" />
-            <arg value="plugin/eepsite/webapps/tracker.war.pack" />
+            <arg value="-r" />
+            <arg value="plugin/eepsite/webapps/tracker.war" />
             <arg value="src/build/tracker.war.jar" />
         </exec>
         <input message="Enter su3 signing key password:" addproperty="release.password.su3" />
@@ -87,8 +87,8 @@
         <delete file="plugin/eepsite/docroot/tracker.css" />
         <delete file="plugin/eepsite/docroot/tracker-purple.css" />
         <delete file="plugin/eepsite/docroot/favicon.png" />
-        <delete file="plugin/lib/zzzot.jar.pack" />
-        <delete file="plugin/eepsite/webapps/tracker.war.pack" />
+        <delete file="plugin/lib/zzzot.jar" />
+        <delete file="plugin/eepsite/webapps/tracker.war" />
         <delete file="plugin/CHANGES.txt" />
         <delete file="plugin/LICENSE.txt" />
         <delete file="plugin/README.txt" />

scripts/i2ptunnel.config

@@ -7,6 +7,7 @@ tunnel.0.option.crypto.tagsToSend=10
 tunnel.0.option.i2cp.destination.sigType=7
 tunnel.0.option.i2cp.enableAccessList=false
 tunnel.0.option.i2cp.encryptLeaseSet=false
+tunnel.0.option.i2cp.leaseSetEncType=4,0
 tunnel.0.option.i2cp.reduceIdleTime=1200000
 tunnel.0.option.i2cp.reduceOnIdle=true
 tunnel.0.option.i2cp.reduceQuantity=1

src/java/net/i2p/zzzot/ZzzOTController.java

@@ -75,7 +75,7 @@ public class ZzzOTController implements ClientApp {
     private static final String NAME = "ZzzOT";
     private static final String DEFAULT_SITENAME = "ZZZOT";
     private static final String PROP_SITENAME = "sitename";
-    private static final String VERSION = "0.17.0";
+    private static final String VERSION = "0.18.0";
     private static final String DEFAULT_SHOWFOOTER = "true";
     private static final String PROP_SHOWFOOTER = "showfooter";
     private static final String DEFAULT_FOOTERTEXT = "Running <a href=\"https://github.com/i2p/i2p.plugins.zzzot\" target=\"_blank\">ZZZOT</a> " + VERSION;
@@ -195,6 +195,8 @@ public class ZzzOTController implements ClientApp {
             _log.error("Cannot open " + i2ptunnelConfig.getAbsolutePath() + ' ' + ioe);
             throw new IllegalArgumentException("Cannot open " + i2ptunnelConfig.getAbsolutePath() + ' ' + ioe);
         }
+        if (i2ptunnelProps.getProperty("tunnel.0.option.i2cp.leaseSetEncType") == null)
+            i2ptunnelProps.setProperty("tunnel.0.option.i2cp.leaseSetEncType", "4,0");
         TunnelController tun = new TunnelController(i2ptunnelProps, "tunnel.0.");
         if (dest != null) {
             // start in foreground so we can get the destination