0.5 merging

* (Merged the 0.5-pre branch back into CVS HEAD)
    * Replaced the old tunnel routing crypto with the one specified in
      router/doc/tunnel-alt.html, including updates to the web console to view
      and tweak it.
    * Provide the means for routers to reject tunnel requests with a wider
      range of responses:
        probabalistic rejection, due to approaching overload
        transient rejection, due to temporary overload
        bandwidth rejection, due to persistent bandwidth overload
        critical rejection, due to general router fault (or imminent shutdown)
      The different responses are factored into the profiles accordingly.
    * Replaced the old I2CP tunnel related options (tunnels.depthInbound, etc)
      with a series of new properties, relevent to the new tunnel routing code:
        inbound.nickname (used on the console)
        inbound.quantity (# of tunnels to use in any leaseSets)
        inbound.backupQuantity (# of tunnels to keep in the ready)
        inbound.length (# of remote peers in the tunnel)
        inbound.lengthVariance (if > 0, permute the length by adding a random #
                                up to the variance.  if < 0, permute the length
                                by adding or subtracting a random # up to the
                                variance)
        outbound.* (same as the inbound, except for the, uh, outbound tunnels
                    in that client's pool)
      There are other options, and more will be added later, but the above are
      the most relevent ones.
    * Replaced Jetty 4.2.21 with Jetty 5.1.2
    * Compress all profile data on disk.
    * Adjust the reseeding functionality to work even when the JVM's http proxy
      is set.
    * Enable a poor-man's interactive-flow in the streaming lib by choking the
      max window size.
    * Reduced the default streaming lib max message size to 16KB (though still
      configurable by the user), also doubling the default maximum window
      size.
    * Replaced the RouterIdentity in a Lease with its SHA256 hash.
    * Reduced the overall I2NP message checksum from a full 32 byte SHA256 to
      the first byte of the SHA256.
    * Added a new "netId" flag to let routers drop references to other routers
      who we won't be able to talk to.
    * Extended the timestamper to get a second (or third) opinion whenever it
      wants to actually adjust the clock offset.
    * Replaced that kludge of a timestamp I2NP message with a full blown
      DateMessage.
    * Substantial memory optimizations within the router and the SDK to reduce
      GC churn.  Client apps and the streaming libs have not been tuned,
      however.
    * More bugfixes thank you can shake a stick at.

2005-02-13  jrandom
    * Updated jbigi source to handle 64bit CPUs.  The bundled jbigi.jar still
      only contains 32bit versions, so build your own, placing libjbigi.so in
      your install dir if necessary.  (thanks mule!)
    * Added support for libjbigi-$os-athlon64 to NativeBigInteger and CPUID
      (thanks spaetz!)

apps/addressbook/.classpath

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path=""/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="../jetty/jettylib/javax.servlet.jar"/>
-	<classpathentry kind="output" path=""/>
-</classpath>

apps/addressbook/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>addressbook</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

apps/addressbook/java/src/addressbook/AddressBook.java

@@ -188,7 +188,7 @@ public class AddressBook {
             String otherKey = (String) otherIter.next();
             String otherValue = (String) other.addresses.get(otherKey);
 
-            if (otherValue.length() >= 516) {
+            if (otherKey.endsWith(".i2p") && otherValue.length() >= 516) {
                 if (this.addresses.containsKey(otherKey)) {
                     if (!this.addresses.get(otherKey).equals(otherValue)
                             && log != null) {

apps/addressbook/java/src/addressbook/Daemon.java

@@ -128,8 +128,8 @@ public class Daemon {
         Map defaultSettings = new HashMap();
         defaultSettings.put("proxy_host", "localhost");
         defaultSettings.put("proxy_port", "4444");
-        defaultSettings.put("master_addressbook", "myhosts.txt");
-        defaultSettings.put("router_addressbook", "../userhosts.txt");
+        defaultSettings.put("master_addressbook", "../userhosts.txt");
+        defaultSettings.put("router_addressbook", "../hosts.txt");
         defaultSettings.put("published_addressbook", "../eepsite/docroot/hosts.txt");
         defaultSettings.put("log", "log.txt");
         defaultSettings.put("subscriptions", "subscriptions.txt");

apps/fortuna/build.xml

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project basedir="." default="all" name="fortuna">
+
+	<property name="cvs.base.dir" value="java/gnu-crypto" />
+	<property name="cvs.etc.dir" value="${cvs.base.dir}/etc" />
+	<property name="cvs.lib.dir" value="${cvs.base.dir}/lib" />
+	<property name="cvs.object.dir" value="${cvs.base.dir}/classes" />
+	<property name="cvs.base.crypto.object.dir" value="${cvs.object.dir}/gnu/crypto" />
+	<property name="cvs.cipher.object.dir" value="${cvs.base.crypto.object.dir}/cipher" />
+	<property name="cvs.hash.object.dir" value="${cvs.base.crypto.object.dir}/hash" />
+	<property name="cvs.prng.object.dir" value="${cvs.base.crypto.object.dir}/prng" />
+
+	<patternset id="fortuna.files">
+		<include name="${cvs.base.crypto.object.dir}/Registry.class"/>
+		<include name="${cvs.prng.object.dir}/Fortuna*.class"/>
+		<include name="${cvs.prng.object.dir}/BasePRNG.class"/>
+		<include name="${cvs.prng.object.dir}/RandomEventListener.class"/>
+		<include name="${cvs.prng.object.dir}/IRandom.class"/>
+		<include name="${cvs.cipher.object.dir}/CipherFactory.class"/>
+		<include name="${cvs.cipher.object.dir}/IBlockCipher.class"/>
+		<include name="${cvs.hash.object.dir}/HashFactory.class"/>
+		<include name="${cvs.hash.object.dir}/IMessageDigest.class"/>
+	</patternset>
+
+	<target name="all" depends="build,jar" 
+		description="Create and test the custom Fortuna library" />
+
+	<target name="build" depends="-init,checkout"
+		description="Build the source and tests">
+		<ant dir="${cvs.base.dir}" target="jar" />
+	</target>
+
+	<target name="builddep" />
+
+	<target name="checkout" depends="-init" unless="cvs.source.available"
+		description="Check out GNU Crypto sources from CVS HEAD">
+		<cvs cvsRoot=":ext:anoncvs@savannah.gnu.org:/cvsroot/gnu-crypto"
+			cvsRsh="ssh"
+			dest="java"
+			package="gnu-crypto" />
+	</target>
+
+	<target name="clean"
+		description="Remove generated tests and object files">
+		<ant dir="${cvs.base.dir}" target="clean" />
+	</target>
+
+	<target name="cleandep" />
+
+	<target name="compile" />
+
+	<target name="distclean" depends="clean"
+		description="Remove all generated files">
+		<delete dir="build" />
+		<delete dir="jartemp" />
+		<!--
+			Annoyingly the GNU Crypto distclean task called here doesn't clean
+			*all* derived files from java/gnu-crypto/lib like it should.....
+		-->
+		<ant dir="${cvs.base.dir}" target="distclean" />
+		<!--
+			.....and so we mop up the rest ourselves.
+		-->
+		<delete dir="${cvs.lib.dir}" />
+	</target>
+
+	<target name="-init">
+		<available property="cvs.source.available" file="${cvs.base.dir}" />
+	</target>
+
+	<target name="jar" depends="build"
+		description="Create the custom Fortuna jar library">
+		<delete dir="build" />
+		<delete dir="jartemp" />
+		<mkdir dir="build" />
+		<mkdir dir="jartemp/${cvs.object.dir}" />
+		<copy todir="jartemp">
+			<fileset dir=".">
+				<patternset refid="fortuna.files" />
+			</fileset>
+		</copy>
+		<jar basedir="jartemp/${cvs.object.dir}" jarfile="build/fortuna.jar">
+			<manifest>
+				<section name="fortuna">
+					<attribute name="Implementation-Title" value="I2P Custom GNU Crypto Fortuna Library" />
+					<attribute name="Implementation-Version" value="CVS HEAD" /> 
+					<attribute name="Implementation-Vendor" value="Free Software Foundation" />
+					<attribute name="Implementation-Vendor-Id" value="FSF" />
+					<attribute name="Implementation-URL" value="http://www.gnu.org/software/gnu-crypto" />
+				</section>
+			</manifest>
+		</jar>
+		<delete dir="jartemp" />
+	</target>
+
+	<target name="test" depends="jar"
+		description="Perform crypto tests on custom Fortuna jar library" />
+		<!--
+			Add this when Fortuna tests are added to GNU Crypto, else write some
+		-->
+
+	<target name="update" depends="checkout"
+		description="Update GNU Crypto sources to latest CVS HEAD">
+		<cvs command="update -d" cvsRsh="ssh" dest="java/gnu-crypto" />
+	</target>
+</project>

apps/i2ptunnel/java/build.xml

@@ -39,12 +39,13 @@
                 <pathelement location="../../jetty/jettylib/jasper-compiler.jar" />
                 <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
                 <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
+                <pathelement location="../../jetty/jettylib/commons-logging.jar" />
+                <pathelement location="../../jetty/jettylib/commons-el.jar" />
                 <pathelement location="../../jetty/jettylib/ant.jar" />
                 <pathelement location="build/i2ptunnel.jar" />
             </classpath>
             <arg value="-d" />
             <arg value="../jsp/WEB-INF/classes" />
-            <arg value="-v9" />
             <arg value="-p" />
             <arg value="net.i2p.i2ptunnel.jsp" />
             <arg value="-webinc" />
@@ -52,10 +53,12 @@
             <arg value="-webapp" />
             <arg value="../jsp/" />
         </java>
-        <javac destdir="../jsp/WEB-INF/classes/" srcdir="../jsp/WEB-INF/classes" includes="*.java">
+        <javac destdir="../jsp/WEB-INF/classes/" srcdir="../jsp/WEB-INF/classes" includes="**/*.java">
             <classpath>
                 <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
                 <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
+                <pathelement location="../../jetty/jettylib/commons-logging.jar" />
+                <pathelement location="../../jetty/jettylib/commons-el.jar" />
                 <pathelement location="build/i2ptunnel.jar" />
             </classpath>
         </javac>

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java

@@ -183,7 +183,8 @@ public class I2PTunnel implements Logging, EventDispatcher {
     void addSession(I2PSession session) { 
         if (session == null) return;
         synchronized (_sessions) {
-            _sessions.add(session);
+            if (!_sessions.contains(session))
+                _sessions.add(session);
         }
     }
     void removeSession(I2PSession session) { 

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java

@@ -211,7 +211,18 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
                     String request = line.substring(pos + 1);
                     if (request.startsWith("/") && getTunnel().getClientOptions().getProperty("i2ptunnel.noproxy") != null) {
                         request = "http://i2p" + request;
+                    } else if (request.startsWith("/eepproxy/")) {
+                        // /eepproxy/foo.i2p/bar/baz.html HTTP/1.0
+                        String subRequest = request.substring("/eepproxy/".length());
+                        int protopos = subRequest.indexOf(" ");
+                        String uri = subRequest.substring(0, protopos);
+                        if (uri.indexOf("/") == -1) {
+                                uri = uri + "/";
+                        }
+                        // "http://" + "foo.i2p/bar/baz.html" + " HTTP/1.0"
+                        request = "http://" + uri + subRequest.substring(protopos);
                     }
+
                     pos = request.indexOf("//");
                     if (pos == -1) {
                         method = null;

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java

@@ -102,6 +102,7 @@ public class TunnelController implements Logging {
     
     public void startTunnelBackground() {
         if (_running) return;
+        _starting = true;
         new I2PThread(new Runnable() { public void run() { startTunnel(); } }).start();
     }
     

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java

@@ -180,7 +180,7 @@ public class TunnelControllerGroup {
         List msgs = new ArrayList();
         for (int i = 0; i < _controllers.size(); i++) {
             TunnelController controller = (TunnelController)_controllers.get(i);
-            controller.startTunnel();
+            controller.startTunnelBackground();
             msgs.addAll(controller.clearMessages());
         }
 

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/WebEditPageFormGenerator.java

@@ -186,6 +186,9 @@ class WebEditPageFormGenerator {
         buf.append("<form action=\"edit.jsp\">");
         if (id != null)
             buf.append("<input type=\"hidden\" name=\"num\" value=\"").append(id).append("\" />");
+        long nonce = new Random().nextLong();
+        System.setProperty(WebEditPageHelper.class.getName() + ".nonce", nonce+"");
+        buf.append("<input type=\"hidden\" name=\"nonce\" value=\"").append(nonce).append("\" />");
             
         buf.append("<b>Name:</b> <input type=\"text\" name=\"name\" size=\"20\" ");
         if ( (controller != null) && (controller.getName() != null) )
@@ -253,9 +256,10 @@ class WebEditPageFormGenerator {
         int tunnelDepth = 2;
         int numTunnels = 2;
         int connectDelay = 0;
+        int maxWindowSize = -1;
         Properties opts = getOptions(controller);
         if (opts != null) {
-            String depth = opts.getProperty("tunnels.depthInbound");
+            String depth = opts.getProperty("inbound.length");
             if (depth != null) {
                 try {
                     tunnelDepth = Integer.parseInt(depth);
@@ -263,7 +267,7 @@ class WebEditPageFormGenerator {
                     tunnelDepth = 2;
                 }
             }
-            String num = opts.getProperty("tunnels.numInbound");
+            String num = opts.getProperty("inbound.quantity");
             if (num != null) {
                 try {
                     numTunnels = Integer.parseInt(num);
@@ -279,6 +283,14 @@ class WebEditPageFormGenerator {
                     connectDelay = 0;
                 }
             }
+            String max = opts.getProperty("i2p.streaming.maxWindowSize");
+            if (max != null) {
+                try {
+                    maxWindowSize = Integer.parseInt(max);
+                } catch (NumberFormatException nfe) {
+                    maxWindowSize = -1;
+                }
+            }
         }
         
         buf.append("<b>Tunnel depth:</b> ");
@@ -325,6 +337,14 @@ class WebEditPageFormGenerator {
             buf.append("checked=\"true\" ");
         buf.append("/> (useful for brief request/response connections)<br />\n");
         
+        buf.append("<b>Communication profile:</b>");
+        buf.append("<select name=\"profile\">");
+        if (maxWindowSize <= 0)
+            buf.append("<option value=\"interactive\">Interactive</option><option value=\"bulk\" selected=\"true\">Bulk</option>");
+        else
+            buf.append("<option value=\"interactive\" selected=\"true\">Interactive</option><option value=\"bulk\">Bulk</option>");
+        buf.append("</select><br />\n");
+        
         buf.append("<b>I2CP host:</b> ");
         buf.append("<input type=\"text\" name=\"clientHost\" size=\"20\" value=\"");
         if ( (controller != null) && (controller.getI2CPHost() != null) )
@@ -347,9 +367,14 @@ class WebEditPageFormGenerator {
             for (Iterator iter = opts.keySet().iterator(); iter.hasNext(); ) {
                 String key = (String)iter.next();
                 String val = opts.getProperty(key);
-                if ("tunnels.depthInbound".equals(key)) continue;
-                if ("tunnels.numInbound".equals(key)) continue;
+                if ("inbound.length".equals(key)) continue;
+                if ("outbound.length".equals(key)) continue;
+                if ("inbound.quantity".equals(key)) continue;
+                if ("outbound.quantity".equals(key)) continue;
+                if ("inbound.nickname".equals(key)) continue;
+                if ("outbound.nickname".equals(key)) continue;
                 if ("i2p.streaming.connectDelay".equals(key)) continue;
+                if ("i2p.streaming.maxWindowSize".equals(key)) continue;
                 if (i != 0) buf.append(' ');
                 buf.append(key).append('=').append(val);
                 i++;

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/WebEditPageHelper.java

@@ -40,9 +40,11 @@ public class WebEditPageHelper {
     private String _targetPort;
     private String _spoofedHost;
     private String _privKeyFile;
+    private String _profile;
     private boolean _startOnLoad;
     private boolean _privKeyGenerate;
     private boolean _removeConfirmed;
+    private long _nonce;
     
     public WebEditPageHelper() {
         _action = null;
@@ -52,6 +54,14 @@ public class WebEditPageHelper {
         _log = I2PAppContext.getGlobalContext().logManager().getLog(WebEditPageHelper.class);
     }
     
+    public void setNonce(String nonce) {
+        if (nonce != null) {
+            try { 
+                _nonce = Long.parseLong(nonce); 
+            } catch (NumberFormatException nfe) {}
+        }
+    }
+    
     /**
      * Used for form submit - either "Save" or Remove"
      */
@@ -173,6 +183,9 @@ public class WebEditPageHelper {
     public void setConnectDelay(String moo) {
         _connectDelay = true;
     }
+    public void setProfile(String profile) { 
+        _profile = profile; 
+    }
     
     /**
      * Process the form and display any resulting messages
@@ -224,6 +237,9 @@ public class WebEditPageHelper {
     private String processAction() {
         if ( (_action == null) || (_action.trim().length() <= 0) )
             return "";
+        String expected = System.getProperty(getClass().getName() + ".nonce");
+        if ( (expected == null) || (!expected.equals(Long.toString(_nonce))) )
+            return "<b>Invalid nonce, are you being spoofed?</b>";
         if ("Save".equals(_action))
             return save();
         else if ("Remove".equals(_action))
@@ -272,14 +288,26 @@ public class WebEditPageHelper {
                 if (c == cur) continue;
                 if ("httpclient".equals(c.getType()) || "client".equals(c.getType())) {
                     Properties cOpt = c.getConfig("");
-                    if (_tunnelCount != null)
-                        cOpt.setProperty("option.tunnels.numInbound", _tunnelCount);
-                    if (_tunnelDepth != null)
-                        cOpt.setProperty("option.tunnels.depthInbound", _tunnelDepth);
+                    if (_tunnelCount != null) {
+                        cOpt.setProperty("option.inbound.quantity", _tunnelCount);
+                        cOpt.setProperty("option.outbound.quantity", _tunnelCount);
+                    }
+                    if (_tunnelDepth != null) {
+                        cOpt.setProperty("option.inbound.length", _tunnelDepth);
+                        cOpt.setProperty("option.outbound.length", _tunnelDepth);
+                    }
                     if (_connectDelay)
                         cOpt.setProperty("option.i2p.streaming.connectDelay", "1000");
                     else
                         cOpt.setProperty("option.i2p.streaming.connectDelay", "0");
+                    if ("interactive".equals(_profile))
+                        cOpt.setProperty("option.i2p.streaming.maxWindowSize", "1");
+                    else
+                        cOpt.remove("option.i2p.streaming.maxWindowSize");
+                    if (_name != null) {
+                        cOpt.setProperty("option.inbound.nickname", _name);
+                        cOpt.setProperty("option.outbound.nickname", _name);
+                    }
                     c.setConfig(cOpt, "");
                 }
             }
@@ -339,7 +367,6 @@ public class WebEditPageHelper {
         } else {
             return null;
         }
-        
         return config;
     }
     
@@ -363,23 +390,40 @@ public class WebEditPageHelper {
                     continue;
                 String key = pair.substring(0, eq);
                 String val = pair.substring(eq+1);
-                if ("tunnels.numInbound".equals(key)) continue;
-                if ("tunnels.depthInbound".equals(key)) continue;
+                if ("inbound.length".equals(key)) continue;
+                if ("outbound.length".equals(key)) continue;
+                if ("inbound.quantity".equals(key)) continue;
+                if ("outbound.quantity".equals(key)) continue;
+                if ("inbound.nickname".equals(key)) continue;
+                if ("outbound.nickname".equals(key)) continue;
                 if ("i2p.streaming.connectDelay".equals(key)) continue;
+                if ("i2p.streaming.maxWindowSize".equals(key)) continue;
                 config.setProperty("option." + key, val);
             }
         }
 
         config.setProperty("startOnLoad", _startOnLoad + "");
         
-        if (_tunnelCount != null)
-            config.setProperty("option.tunnels.numInbound", _tunnelCount);
-        if (_tunnelDepth != null)
-            config.setProperty("option.tunnels.depthInbound", _tunnelDepth);
+        if (_tunnelCount != null) {
+            config.setProperty("option.inbound.quantity", _tunnelCount);
+            config.setProperty("option.outbound.quantity", _tunnelCount);
+        }
+        if (_tunnelDepth != null) {
+            config.setProperty("option.inbound.length", _tunnelDepth);
+            config.setProperty("option.outbound.length", _tunnelDepth);
+        }
         if (_connectDelay)
             config.setProperty("option.i2p.streaming.connectDelay", "1000");
         else
             config.setProperty("option.i2p.streaming.connectDelay", "0");
+        if (_name != null) {
+            config.setProperty("option.inbound.nickname", _name);
+            config.setProperty("option.outbound.nickname", _name);
+        }
+        if ("interactive".equals(_profile))
+            config.setProperty("option.i2p.streaming.maxWindowSize", "1");
+        else
+            config.remove("option.i2p.streaming.maxWindowSize");
     }
 
     /**

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/WebStatusPageHelper.java

@@ -14,14 +14,17 @@ import net.i2p.util.Log;
  *
  */
 public class WebStatusPageHelper {
+    private I2PAppContext _context;
     private Log _log;
     private String _action;
     private int _controllerNum;
+    private long _nonce;
     
     public WebStatusPageHelper() {
+        _context = I2PAppContext.getGlobalContext();
         _action = null;
         _controllerNum = -1;
-        _log = I2PAppContext.getGlobalContext().logManager().getLog(WebStatusPageHelper.class);
+        _log = _context.logManager().getLog(WebStatusPageHelper.class);
     }
     
     public void setAction(String action) {
@@ -36,6 +39,14 @@ public class WebStatusPageHelper {
             }
         }
     }
+    public void setNonce(long nonce) { _nonce = nonce; }
+    public void setNonce(String nonce) {
+        if (nonce != null) {
+            try { 
+                _nonce = Long.parseLong(nonce); 
+            } catch (NumberFormatException nfe) {}
+        }
+    }
     
     public String getActionResults() {
         try {
@@ -51,28 +62,44 @@ public class WebStatusPageHelper {
         if (group == null)
             return "<b>I2PTunnel instances not yet started - please be patient</b>\n";
             
+        long nonce = _context.random().nextLong();
         StringBuffer buf = new StringBuffer(4*1024);
         buf.append("<ul>");
         List tunnels = group.getControllers();
         for (int i = 0; i < tunnels.size(); i++) {
             buf.append("<li>\n");
-            getSummary(buf, i, (TunnelController)tunnels.get(i));
+            getSummary(buf, i, (TunnelController)tunnels.get(i), nonce);
             buf.append("</li>\n");
         }
         buf.append("</ul>");
+        
+        buf.append("<hr /><form action=\"index.jsp\" method=\"GET\">\n");
+        buf.append("<input type=\"hidden\" name=\"nonce\" value=\"").append(nonce).append("\" />\n");
+        buf.append("<input type=\"submit\" name=\"action\" value=\"Stop all\" />\n");
+        buf.append("<input type=\"submit\" name=\"action\" value=\"Start all\" />\n");
+        buf.append("<input type=\"submit\" name=\"action\" value=\"Restart all\" />\n");
+        buf.append("<input type=\"submit\" name=\"action\" value=\"Reload config\" />\n");        
+        buf.append("</form>\n");
+        
+        System.setProperty(getClass().getName() + ".nonce", nonce+"");
+        
         return buf.toString();
     }
     
-    private void getSummary(StringBuffer buf, int num, TunnelController controller) {
+    private void getSummary(StringBuffer buf, int num, TunnelController controller, long nonce) {
         buf.append("<b>").append(controller.getName()).append("</b>: ");
         if (controller.getIsRunning()) {
             buf.append("<i>running</i> ");
-            buf.append("<a href=\"index.jsp?num=").append(num).append("&action=stop\">stop</a> ");
+            buf.append("<a href=\"index.jsp?num=").append(num);
+            buf.append("&nonce=").append(nonce);
+            buf.append("&action=stop\">stop</a> ");
         } else if (controller.getIsStarting()) {
             buf.append("<i>startup in progress (please be patient)</i>");
         } else {
             buf.append("<i>not running</i> ");
-            buf.append("<a href=\"index.jsp?num=").append(num).append("&action=start\">start</a> ");
+            buf.append("<a href=\"index.jsp?num=").append(num);
+            buf.append("&nonce=").append(nonce);
+            buf.append("&action=start\">start</a> ");
         }
         buf.append("<a href=\"edit.jsp?num=").append(num).append("\">edit</a> ");
         buf.append("<br />\n");
@@ -82,6 +109,9 @@ public class WebStatusPageHelper {
     private String processAction() {
         if ( (_action == null) || (_action.trim().length() <= 0) )
             return getMessages();
+        String expected = System.getProperty(getClass().getName() + ".nonce");
+        if ( (expected == null) || (!expected.equals(Long.toString(_nonce))) )
+            return "<b>Invalid nonce, are you being spoofed?</b>";
         if ("Stop all".equals(_action)) 
             return stopAll();
         else if ("Start all".equals(_action))
@@ -139,7 +169,7 @@ public class WebStatusPageHelper {
         List controllers = group.getControllers();
         if (_controllerNum >= controllers.size()) return "Invalid tunnel";
         TunnelController controller = (TunnelController)controllers.get(_controllerNum);
-        controller.startTunnel();
+        controller.startTunnelBackground();
         return getMessages(controller.clearMessages());
     }
     

apps/i2ptunnel/jsp/index.jsp

@@ -11,13 +11,6 @@
 <b><jsp:getProperty name="helper" property="actionResults" /></b>
  
 <jsp:getProperty name="helper" property="summaryList" />
-<hr />
-<form action="index.jsp" method="GET">
- <input type="submit" name="action" value="Stop all" />
- <input type="submit" name="action" value="Start all" />
- <input type="submit" name="action" value="Restart all" />
- <input type="submit" name="action" value="Reload config" />
-</form>
 
 <form action="edit.jsp">
 <b>Add new:</b> 

apps/jetty/build.xml

@@ -3,18 +3,38 @@
         
     <target name="all" depends="build" />
     <target name="fetchJettylib" >
-        <available property="jetty.available" file="jettylib" />
+        <available property="jetty.available" file="jetty-5.1.2.zip" />
         <ant target="doFetchJettylib" />
     </target>
     <target name="doFetchJettylib" unless="jetty.available" >
-        <echo message="The libraries contained within the fetched file are from Jetty's 4.2.21 " />
-        <echo message="distribution (http://jetty.mortbay.org/) which we have copied to our website since" />
-        <echo message="theirs doesn't have direct HTTP access to the libs.  These are not " />
+        <echo message="The libraries contained within the fetched file are from Jetty's 5.1.2" />
+        <echo message="distribution (http://jetty.mortbay.org/).  These are not " />
         <echo message="necessary for using I2P, but are used by some applications on top of I2P," />
         <echo message="such as the routerconsole." />
-        <get src="http://dev.i2p.net/jettylib.tar.bz2" verbose="true" dest="jettylib.tar.bz2" />
-        <untar src="jettylib.tar.bz2" compression="bzip2" dest="." />
-        <delete file="jettylib.tar.bz2" />
+        <get src="http://mesh.dl.sourceforge.net/sourceforge/jetty/jetty-5.1.2.zip" verbose="true" dest="jetty-5.1.2.zip" />
+        <ant target="doExtract" />
+    </target>
+    <target name="doExtract">
+        <unzip src="jetty-5.1.2.zip" dest="." />
+        <mkdir dir="jettylib" />
+        <copy todir="jettylib">
+            <fileset dir="jetty-5.1.2/lib">
+                <include name="*.jar" />
+            </fileset>
+        </copy>
+        <copy todir="jettylib">
+            <fileset dir="jetty-5.1.2/ext">
+                <include name="ant.jar" />
+                <include name="commons-el.jar" />
+                <include name="commons-logging.jar" />
+                <include name="jasper-compiler.jar" />
+                <include name="jasper-runtime.jar" />
+                <include name="javax.servlet.jar" />
+                <include name="org.mortbay.jetty.jar" />
+                <include name="xercesImpl.jar" />
+            </fileset>
+        </copy>
+        <delete dir="jetty-5.1.2" />
     </target>
     <target name="build" depends="fetchJettylib" />
     <target name="builddep" />

apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketImpl.java

@@ -32,7 +32,7 @@ class I2PSocketImpl implements I2PSocket {
     private Object remoteIDWaiter = new Object();
     private I2PInputStream in;
     private I2POutputStream out;
-    private SocketErrorListener _socketErrorListener;
+    private I2PSocket.SocketErrorListener _socketErrorListener;
     private boolean outgoing;
     private long _socketId;
     private static long __socketId = 0;
@@ -284,7 +284,7 @@ class I2PSocketImpl implements I2PSocket {
         in.setReadTimeout(ms);
     }
     
-    public void setSocketErrorListener(SocketErrorListener lsnr) {
+    public void setSocketErrorListener(I2PSocket.SocketErrorListener lsnr) {
         _socketErrorListener = lsnr;
     }
     

apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerImpl.java

@@ -119,7 +119,7 @@ class I2PSocketManagerImpl implements I2PSocketManager, I2PSessionListener {
             _listeners.clear();
         }
         for (int i = 0; i < listeners.size(); i++) {
-            DisconnectListener lsnr = (DisconnectListener)listeners.get(i);
+            I2PSocketManager.DisconnectListener lsnr = (I2PSocketManager.DisconnectListener)listeners.get(i);
             lsnr.sessionDisconnected();
         }
     }
@@ -720,12 +720,12 @@ class I2PSocketManagerImpl implements I2PSocketManager, I2PSessionListener {
     public String getName() { return _name; }
     public void setName(String name) { _name = name; }
     
-    public void addDisconnectListener(DisconnectListener lsnr) { 
+    public void addDisconnectListener(I2PSocketManager.DisconnectListener lsnr) { 
         synchronized (_listeners) {
             _listeners.add(lsnr);
         }
     }
-    public void removeDisconnectListener(DisconnectListener lsnr) {
+    public void removeDisconnectListener(I2PSocketManager.DisconnectListener lsnr) {
         synchronized (_listeners) {
             _listeners.remove(lsnr);
         }

apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketOptionsImpl.java

@@ -35,6 +35,18 @@ class I2PSocketOptionsImpl implements I2PSocketOptions {
         init(opts);
     }
     
+    public void setProperties(Properties opts) {
+        if (opts == null) return;
+        if (opts.containsKey(PROP_BUFFER_SIZE))
+            _maxBufferSize = getInt(opts, PROP_BUFFER_SIZE, DEFAULT_BUFFER_SIZE);
+        if (opts.containsKey(PROP_CONNECT_TIMEOUT))
+            _connectTimeout = getInt(opts, PROP_CONNECT_TIMEOUT, DEFAULT_CONNECT_TIMEOUT);
+        if (opts.containsKey(PROP_READ_TIMEOUT))
+            _readTimeout = getInt(opts, PROP_READ_TIMEOUT, -1);
+        if (opts.containsKey(PROP_WRITE_TIMEOUT))
+            _writeTimeout = getInt(opts, PROP_WRITE_TIMEOUT, DEFAULT_WRITE_TIMEOUT);
+    }
+    
     protected void init(Properties opts) {
         _maxBufferSize = getInt(opts, PROP_BUFFER_SIZE, DEFAULT_BUFFER_SIZE);
         _connectTimeout = getInt(opts, PROP_CONNECT_TIMEOUT, DEFAULT_CONNECT_TIMEOUT);

apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkServer.java

@@ -115,6 +115,7 @@ public class StreamSinkServer {
         }
         public void run() {
             if (_fos == null) return;
+            long start = System.currentTimeMillis();
             try {
                 InputStream in = _sock.getInputStream();
                 byte buf[] = new byte[4096];
@@ -126,7 +127,8 @@ public class StreamSinkServer {
                     if (_log.shouldLog(Log.DEBUG))
                         _log.debug("read and wrote " + read);
                 }
-                _log.error("Got EOF from client socket [written=" + written + "]");
+                long lifetime = System.currentTimeMillis() - start;
+                _log.error("Got EOF from client socket [written=" + written + " lifetime=" + lifetime + "]");
             } catch (IOException ioe) {
                 _log.error("Error writing the sink", ioe);
             } finally {

apps/pants/build.xml

@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Ports + Ant = Pants, a simple Ant-based package manager
+
+  free (adj.): unencumbered; not under the control of others
+
+  Written by smeghead in 2005 and released into the public domain with no
+  warranty of any kind, either expressed or implied.  It probably won't make
+  your computer catch on fire, or eat your children, but it might.  Use at your
+  own risk.
+-->
+
+<project basedir="." default="help" name="pants-interface">
+
+<!-- .......................... Global Properties .......................... -->
+
+
+
+<!-- ........................... Internal Tasks ............................ -->
+
+	<target name="-fetchCvs" unless="cvs.source.available" if="using.cvs">
+		<cvs compressionlevel="${cvs.compression.level}"
+			date="${cvs.date}"
+			dest="./distfiles/cvs-src/${pbuild}"
+			failonerror="true"
+			package="${cvs.package}"
+			passfile="${cvs.passfile}"
+			port="${cvs.port}"
+			cvsRoot="${cvs.root}"
+			cvsRsh="${cvs.rsh}"
+			tag="${cvs.tag}"
+		/>
+	</target>
+
+	<target name="-fetchPackage"  unless="using.cvs">
+		<get src="${package.url}"
+			verbose="true"
+			dest="./distfiles"
+		/>
+	</target>
+
+	<target name="-init">
+		<!--
+		  TODO: Create dist/ and working/ folders for each pbuild subdir in case
+		  they've been wiped.
+		-->
+		<loadproperties srcfile="world" />
+		<taskdef name="mergetypedproperties"
+			classname="net.i2p.pants.MergeTypedPropertiesTask"
+			classpath="./lib/pants.jar"
+		/>
+		<mergetypedproperties input="./pbuilds/${pbuild}/pbuild.properties"
+			output="./pbuilds/${pbuild}/merged-properties.temp"
+			booleanList="version.latest.find.regex.canonicaleq,	version.latest.find.regex.caseinsensitive, version.latest.find.regex.comments, version.latest.find.regex.dotall, version.latest.find.regex.multiline, version.latest.find.regex.unicodecase, version.latest.find.regex.unixlines"
+			stringList="cvs.compression.level, cvs.date, cvs.package, cvs.passfile, cvs.port, cvs.root, cvs.rsh, cvs.tag, package.url, version.latest, version.latest.find.url, version.latest.find.regex"
+		/>
+		<loadproperties srcfile="./pbuilds/${pbuild}/merged-properties.temp" />
+		<delete file="./pbuilds/${pbuild}/merged-properties.temp" />
+		<!--
+		  If '-Dpbuild={name}' isn't specified, the 'build', 'fetch', 'update'
+		  and 'version' commands should default to 'world' behavior.
+		-->
+		<antcall target="-setWorld" />
+		<condition property="using.cvs">
+			<or>
+				<equals arg1="CVS" arg2="${version.using.${pbuild}}" />
+				<equals arg1="cvs" arg2="${version.using.${pbuild}}" />
+			</or>
+		</condition>
+		<!--
+		  If 'version.recommended' isn't defined in pbuild.properties, default
+		  to latest available version.
+		-->
+	</target>
+
+	<target name="-setWorld" unless="pbuild">
+		<property name="pbuild" value="world" />
+	</target>
+
+	<target name="-unpackTarBz2">
+		<untar src="${pbuild.package}"
+			compression="bzip2"
+			dest="./${pbuild}/working"
+		/>
+	</target>
+
+	<target name="-unpackTarGzip">
+		<untar src="${pbuild.package}"
+			compression="gzip"
+			dest="./${pbuild}/working"
+		/>
+	</target>
+
+	<target name="-unpackZip">
+		<unzip src="${pbuild.package}" dest="./${pbuild}/working" />
+	</target>
+
+	<target name="-updateCvs" if="using.cvs">
+		<cvs command="update -d"
+			compressionlevel="${compression.level}"
+			date="${cvs.date}"
+			dest="./distfiles/cvs-src"
+			failonerror="true"
+			package="${cvs.package}"
+			passfile="${cvs.passfile}"
+			port="${cvs.port}"
+			cvsRoot="${cvs.root}"
+			cvsRsh="${cvs.rsh}"
+			tag="${cvs.tag}"
+		/>
+	</target>
+
+	<target name="-updateConfirm" if="confirm.update" unless="no.prompts">
+		<input validargs="y,Y,n,N"
+			defaultvalue="n"
+			addproperty="confirm.update.answer">
+You currently have the recommended version installed. A newer
+version will be installed if you continue and this may break some
+applications which depend on this package. Are you sure you want
+to update? [y/N]
+		</input>
+		<condition property="abort.update">
+			<or>
+				<equals arg1="n" arg2="${confirm.update.answer}" />
+				<equals arg1="N" arg2="${confirm.update.answer}" />
+			</or>
+		</condition>
+		<fail if="abort.update">Update aborted.</fail>
+	</target>
+
+	<target name="-versionLatest">
+		<get src="${version.latest.find.url}"
+			dest="version.latest.in.temp"
+			verbose="true"
+		/>
+		<taskdef name="match"
+			classname="net.i2p.pants.MatchTask"
+			classpath="./lib/pants.jar"
+		/>
+		<match input="version.latest.in.temp"
+			output="version.latest.parsed.temp"
+			regex="${version.latest.find.regex}"
+			canonicaleq="${version.latest.find.regex.canonicaleq}"
+			caseinsensitive="${version.latest.find.regex.caseinsensitive}"
+			comments="${version.latest.find.regex.comments}"
+			dotall="${version.latest.find.regex.dotall}"
+			multiline="${version.latest.find.regex.multiline}"
+			unicodecase="${version.latest.find.regex.unicodecase}"
+			unixlines="${version.latest.find.regex.unixlines}"
+		/>
+		<loadproperties srcFile="version.latest.parsed.temp" />
+		<delete file="version.latest.in.temp" />
+		<delete file="version.latest.parsed.temp" />
+		<property name="version.latest" value="${group.1}" />
+	</target>
+
+	<target name="-versionRecommended">
+		<property name="version.recommended" value="x" />
+	</target>
+
+	<target name="-versionUsing">
+		<property name="version.using" value="x" />
+	</target>
+
+<!-- .......................... Public Interface ........................... -->
+
+	<target name="build" depends="-init,fetch"
+		description="Build a pbuild and its dependencies">
+		<ant antfile="pbuild.xml" dir="./pbuilds/${pbuild}" target="clean" />
+		<ant antfile="pbuild.xml" dir="./pbuilds/${pbuild}" target="build" />
+		<!--
+		  Perform a 'clean' on the target first (but not 'distclean')
+		-->
+	</target>
+
+	<target name="fetch" depends="-init"
+		description="Get package only">
+		<antcall target="-fetchPackage" />
+		<antcall target="-fetchCvs" />
+		<copydir dest="./pbuilds/${pbuild}/working"
+			src="./distfiles/cvs-src/${pbuild}"
+		/>
+	</target>
+
+	<target name="help"
+		description="Display usage synopsis">
+		<echo>
+Pants usage:
+
+    ant [--usejikes] [-Dpbuild={name}] [-Dpbuild.version={version}]
+        [-D{property}={value}] [-Dno.prompts=true] build | fetch |
+        help | install | uninstall | update | version
+
+    build        Build a pbuild and its dependencies
+    fetch        Get package only
+    help         Display usage synopsis
+    install      Fetch, build and install a pbuild
+    uninstall    Uninstall a pbuild
+    update       Update pbuild(s) to the latest version(s)
+    version      Display pbuild version information
+		</echo>
+	</target>
+
+	<!--
+	  Install recommended version by default unless 'version' property is set.
+	  Do not install if package is already installed.
+	-->
+	<target name="install" depends="-init, build"
+		description="Install a pbuild">
+		<ant antfile="pbuild.xml" dir="./pbuilds/${pbuild}" target="dist" />
+		<ant antfile="pbuild.xml" dir="./pbuilds/${pbuild}"
+			target="distclean"
+		/>
+	</target>
+
+	<target name="uninstall" depends="-init"
+		description="Uninstall a pbuild" />
+
+	<target name="update" depends="-init"
+		description="Update pbuild(s) to the latest version(s)">
+		<condition property="${confirm.update}">
+			<equals arg1="${version.using}" arg2="${version.recommended}" />
+		</condition>
+		<antcall target="-updateConfirm" />
+	</target>
+
+	<target name="version"
+		depends="-init, -versionRecommended, -versionUsing, -versionLatest"
+		description="Display pbuild version information">
+		<echo message="Latest version: ${version.recommended}" />
+		<echo message="Latest version: ${version.using}" />
+		<echo message="Latest version: ${version.latest}" />
+	</target>
+
+</project>

apps/pants/pants/build.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project basedir="." default="build" name="build-pants">
+
+	<target name="build"
+		description="Build the source">
+		<mkdir dir="./java/build"/>
+		<javac srcdir="./java/src" source="1.3" target="1.3" deprecation="on" destdir="./java/build" />
+	</target>
+
+	<target name="clean"
+		description="Remove all object files">
+		<delete dir="./java/build" />
+		<delete dir="./java/jartemp" />
+	</target>
+
+	<target name="dist" depends="build, jar"
+		description="Create the jar and copy it to ../lib">
+		<copy todir="../lib" file="./java/build/pants.jar" />
+	</target>
+
+	<target name="distclean" depends="clean"
+		description="Remove the jar and all object files" >
+		<delete file="../lib/pants.jar" />
+	</target>
+
+	<target name="jar">
+		<delete dir="./java/jartemp" />
+		<mkdir dir="./java/jartemp" />
+		<copy todir="./java/jartemp">
+			<fileset dir="./java/build" includes="**/*.class" />
+		</copy>
+		<jar basedir="./java/jartemp" jarfile="./java/build/pants.jar">
+			<manifest>
+				<section name="net.i2p.pants">
+					<attribute name="Implementation-Title" value="Pants" />
+					<attribute name="Implementation-Version" value="0.0.1" /> 
+					<attribute name="Implementation-Vendor" value="I2P" />
+					<attribute name="Implementation-Vendor-Id" value="I2P" />
+					<attribute name="Implementation-URL" value="http://www.i2p.net" />
+				</section>
+			</manifest>
+		</jar>
+		<delete dir="./java/jartemp" />
+	</target>
+</project>

apps/pants/pants/java/src/net/i2p/pants/MatchTask.java

@@ -0,0 +1,212 @@
+/*
+ * Ports + Ant = Pants, a simple Ant-based package manager
+ * 
+ * free (adj.): unencumbered; not under the control of others
+ * 
+ * Written by smeghead in 2005 and released into the public domain with no
+ * warranty of any kind, either expressed or implied.  It probably won't make
+ * your computer catch on fire, or eat your children, but it might.  Use at your
+ * own risk.
+ */
+
+package net.i2p.pants;
+
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+
+/**
+ * <p>Custom Ant task for matching the contents of a file against a given
+ * regular expression and writing any matching groups to a file in
+ * <code>java.util.Properties</code> format.
+ * </p>
+ * <p>Each key in the properties file is named after the number corresponding to
+ * its matching group and its value is the contents of the matching group.
+ * </p>
+ * <p>Regular expressions passed to this task must conform to the specification
+ * used by Sun's <code>java.util.regex</code> package and thus are mostly
+ * compatible with Perl 5 regular expressions.
+ * </p>
+ * <p>When calling the <code>match</code> task, the attributes
+ * <code>input</code>, <code>output</code>, and <code>regex</code> are required.
+ * </p>
+ * <p>Optional boolean attributes may be used to toggle various modes for the
+ * regular expression engine (all are set to <code>false</code> by default):
+ * </p>
+ * <table>
+ * <tr><td><code>canonicaleq</code></td><td>Enable canonical equivalence</td></tr>
+ * <tr><td><code>caseinsensitive</code></td><td>Enable case-insensitive matching</td></tr>
+ * <tr><td><code>comments</code></td><td>Permit whitespace and comments in pattern</td></tr>
+ * <tr><td><code>dotall</code></td><td>Enable dotall mode</td></tr>
+ * <tr><td><code>multiline</code></td><td>Enable multi-line mode</td></tr>
+ * <tr><td><code>unicodecase</code></td><td>Enable Unicode-aware case folding</td></tr>
+ * <tr><td><code>unixlines</code></td><td>Enable Unix lines mode</td></tr>
+ * </table>
+ * <p>There is one additional optional boolean attribute,
+ * <code>failOnNoMatch</code>. If this attribute is <code>true</code> it causes
+ * the <code>match</code> task to throw a
+ * <code>org.apache.tools.ant.BuildException</code> and fail if no matches for
+ * the regular expression are found. The default value is <code>false</code>,
+ * meaning a failed match will simply result in a warning message to
+ * <code>STDERR</code> and an empty (0 byte) <code>output</code> file being
+ * created. 
+ * </p>
+ * <p>
+ * <h4>Example</h4>
+ * </p>
+ * <p>Contents of input file <code>letter.txt</code>:
+ * <pre>
+ *      Dear Alice,
+ * 
+ *      How's about you and me gettin' together for some anonymous foo action?
+ * 
+ *      Kisses,
+ *      Bob
+ * </pre>
+ * </p>
+ * <p>Ant <code>match</code> task and a <code>taskdef</code> defining it:
+ * <pre>
+ *      &lt;taskdef name="match" classname="net.i2p.pants.MatchTask" classpath="../../lib/pants.jar" /&gt;
+ *      &lt;match input="letter.txt"
+ *             output="matches.txt"
+ *             regex="about (\S*?) and (\S*?) .+anonymous (\S*?)"
+ *             /&gt;
+ * </pre>
+ * </p>
+ * <p>Contents of properties file <code>matches.txt</code> written by this task:
+ * <pre>
+ *      group.0=about you and me gettin' together for some anonymous foo
+ *      group.1=you
+ *      group.2=me
+ *      group.3=foo
+ * </pre>
+ * </p>
+ * <p>These values can be loaded from <code>matches.txt</code> into Ant
+ * properties like so:
+ * <pre>
+ *      &lt;loadproperties srcFile="matches.txt" /&gt;
+ * </pre>
+ * </p>
+ *  
+ * @author smeghead
+ */
+public class MatchTask extends Task {
+
+	private boolean _failOnNoMatch;
+	private String  _inputFile;
+	private String  _outputFile;
+	private String  _regex;
+	private int     _regexFlags;
+
+	public void execute() throws BuildException {
+		int               charRead    = 0;
+		FileReader        fileReader  = null;
+		FileWriter        fileWriter  = null;
+		Matcher           matcher     = null;
+		Pattern           pattern     = null;
+		PrintWriter       printWriter = null;
+		StringBuffer      text        = new StringBuffer();
+
+		if (_inputFile == null)
+			throw new BuildException("Error: 'match' task requires 'input' attribute");
+
+		if (_outputFile == null)
+			throw new BuildException("Error: 'match' task requires 'output' attribute");
+
+		if (_regex == null)
+			throw new BuildException("Error: 'match' task requires 'regex' attribute");
+
+		pattern = Pattern.compile(_regex, _regexFlags);
+
+		try {
+			fileReader = new FileReader(_inputFile);
+
+			while ((charRead = fileReader.read()) != -1)
+				text.append((char) charRead);
+
+			fileReader.close();
+			matcher = pattern.matcher(text);
+
+			if (matcher.find()) {
+				printWriter = new PrintWriter(new FileWriter(_outputFile));
+
+				for (int i = 0; i <= matcher.groupCount(); i++)
+					printWriter.println("group." + Integer.toString(i) + "=" + matcher.group(i));
+
+				printWriter.flush();
+				printWriter.close();
+			} else {
+				if (_failOnNoMatch) {
+					throw new BuildException("Error: No matches found in " + _inputFile);
+				} else {
+					System.err.println("Warning: No matches found in " + _inputFile);
+					// Create 0 byte output file.
+					fileWriter = new FileWriter(_outputFile);
+					fileWriter.close();
+				}
+			}
+		} catch (FileNotFoundException fnfe) {
+			throw new BuildException("File " + _inputFile + " not found", fnfe);
+		} catch (IOException ioe) {
+			throw new BuildException(ioe);
+		}
+	}
+
+	public void setCanonicalEq(boolean enableCanonicalEq) {
+		if (enableCanonicalEq)
+			_regexFlags |= Pattern.CANON_EQ;
+	}
+
+	public void setCaseInsensitive(boolean enableCaseInsensitive) {
+		if (enableCaseInsensitive)
+			_regexFlags |= Pattern.CASE_INSENSITIVE;
+	}
+
+	public void setComments(boolean enableComments) {
+		if (enableComments)
+			_regexFlags |= Pattern.COMMENTS;
+	}
+
+	public void setDotall(boolean enableDotall) {
+		if (enableDotall)
+			_regexFlags |= Pattern.DOTALL;
+	}
+
+	public void setFailOnNoMatch(boolean failOnNoMatch) {
+		_failOnNoMatch = failOnNoMatch;
+	}
+
+	public void setInput(String inputFile) {
+		_inputFile = inputFile;
+	}
+
+	public void setMultiLine(boolean enableMultiLine) {
+		if (enableMultiLine)
+			_regexFlags |= Pattern.MULTILINE;
+	}
+
+	public void setOutput(String outputFile) {
+		_outputFile = outputFile;
+	}
+
+	public void setRegex(String regex) {
+		_regex = regex;
+	}
+
+	public void setUnicodeCase(boolean enableUnicodeCase) {
+		if (enableUnicodeCase)
+			_regexFlags |= Pattern.UNICODE_CASE;
+	}
+
+	public void setUnixLines(boolean enableUnixLines) {
+		if (enableUnixLines)
+			_regexFlags |= Pattern.UNIX_LINES;
+	}
+}

apps/pants/pants/java/src/net/i2p/pants/MergeTypedPropertiesTask.java

@@ -0,0 +1,164 @@
+/*
+ * Ports + Ant = Pants, a simple Ant-based package manager
+ * 
+ * free (adj.): unencumbered; not under the control of others
+ * 
+ * Written by smeghead in 2005 and released into the public domain with no
+ * warranty of any kind, either expressed or implied.  It probably won't make
+ * your computer catch on fire, or eat your children, but it might.  Use at your
+ * own risk.
+ */
+
+package net.i2p.pants;
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+
+/**
+ * <p>Custom Ant task for loading properties from a
+ * <code>java.util.Properties</code> file then merging them with lists of
+ * expected properties. When an expected property is found in the properties
+ * file it is set to the value given for it in the file. If an expected property
+ * from a list isn't found in the properties file its value will be set to "" or
+ * "false", depending on the property's data type.
+ * </p>
+ * <p>A property's data type is determined by membership in one of two lists
+ * which can be passed into an instance of this class: a string-typed list and a
+ * boolean-typed list. Values for string-typed properties may be any valid
+ * string accepted by <code>java.util.Properties</code>, and values for
+ * boolean-typed properties must be either "false" or "true".
+ * </p>
+ * <p>Lists holding more than one property must be comma-delimited.
+ * </p>
+ * <p>The output of this class is a temporary <code>java.util.Properties</code>
+ * file which is suitable for reading by the standard Ant
+ * <code>loadproperties</code> task.
+ * </p>
+ * <p>Note that if any properties in the given lists have already been defined
+ * before the <code>mergetypedproperties</code> task is called, their values
+ * cannot be changed since Ant properties are immutable.
+ * </p>
+ * <h4>Example</h4>
+ * </p>
+ * <p>Contents of a properties file <code>my.properties</code>:
+ * <pre>
+ *      some.property.exists=true
+ *      hasValue=false
+ *      some.property=this is a value
+ *      property0=bork bork
+ *      propertyX=this property wasn't passed in a list
+ * </pre>
+ * </p>
+ * <p>Ant <code>mergetypedproperties</code> task and a <code>taskdef</code>
+ * defining it:
+ * <pre>
+ *      &lt;taskdef name="mergetypedproperties" classname="net.i2p.pants.MergeTypedPropertiesTask" classpath="../../lib/pants.jar" /&gt;
+ *      &lt;mergetypedproperties input="my.properties"
+ *             output="merged-properties.temp"
+ *             booleanList="some.property.exists,is.valid,hasValue"
+ *             stringList="some.property,another.property,property0"
+ *             /&gt;
+ * </pre>
+ * </p>
+ * <p>Contents of properties file <code>merged-properties.temp</code> written by this task:
+ * <pre>
+ *      some.property.exists=true
+ *      is.valid=false
+ *      hasValue=false
+ *      some.property=this is a value
+ *      another.property=
+ *      property0=bork bork
+ *      propertyX=this property wasn't passed in a list
+ * </pre>
+ * </p>
+ * <p>If you don't want this task's output to include properties which weren't
+ * in the lists of expected properties, you can set the attribute
+ * <code>onlyExpected</code> to <code>true</code>. In the example, this would
+ * result in the file <code>merged-properties.temp</code> containing only the
+ * following properties:
+ * <pre>
+ *      some.property.exists=true
+ *      is.valid=false
+ *      hasValue=false
+ *      some.property=this is a value
+ *      another.property=
+ *      property0=bork bork
+ * </pre>
+ * </p>
+ *  
+ * @author smeghead
+ */
+public class MergeTypedPropertiesTask extends Task {
+
+	private String     _booleanList   = "";
+	private String     _inputFile;
+	private boolean    _onlyExpected;
+	private String     _outputFile;
+	private Properties _propertiesIn  = new Properties();
+	private Properties _propertiesOut = new Properties();
+	private String     _stringList    = "";
+
+	public void execute() throws BuildException {
+		StringTokenizer strtokBoolean = new StringTokenizer(_booleanList, ",");
+		StringTokenizer strtokString  = new StringTokenizer(_stringList, ",");
+		String          property      = "";
+
+		if (_inputFile == null)
+			throw new BuildException("Error: 'mergetypedproperties' task requires 'input' attribute");
+
+		if (_outputFile == null)
+			throw new BuildException("Error: 'mergetypedproperties' task requires 'output' attribute");
+
+		// Add some type-checking on the list elements
+
+		try {
+			_propertiesIn.load(new FileInputStream(_inputFile));
+
+			while (strtokBoolean.hasMoreTokens())
+				_propertiesOut.setProperty(strtokBoolean.nextToken().trim(), "false");
+
+			while (strtokString.hasMoreTokens())
+				_propertiesOut.setProperty(strtokString.nextToken().trim(), "");
+
+			for (Enumeration enum = _propertiesIn.elements(); enum.hasMoreElements(); ) {
+				property = (String) enum.nextElement();
+
+				if (_onlyExpected && !_propertiesOut.containsKey(property))
+					continue;
+				else
+					_propertiesOut.setProperty(property, _propertiesIn.getProperty(property));
+			}
+
+			_propertiesOut.store(new FileOutputStream(_inputFile), "This is a temporary file. It is safe to delete it.");
+		} catch (IOException ioe) {
+			throw new BuildException(ioe);
+		}
+	}
+
+	public void setBooleanList(String booleanList) {
+		_booleanList = booleanList;
+	}
+
+	public void setInput(String inputFile) {
+		_inputFile = inputFile;
+	}
+
+	public void setOnlyExpected(boolean onlyExpected) {
+		_onlyExpected = onlyExpected;
+	}
+
+	public void setOutput(String outputFile) {
+		_outputFile = outputFile;
+	}
+
+	public void setStringList(String stringList) {
+		_stringList = stringList;
+	}
+}

apps/pants/pants/resources/README

@@ -0,0 +1,116 @@
+What is Pants?
+--------------
+
+    Pants is an Apache Ant-based package manager for the management of 3rd party
+    dependencies in Java development projects. It's loosely modeled after
+    FreeBSD's Ports and Gentoo Linux's Portage, with two major differences:
+
+    * Pants isn't intended for system-wide package management. It's tailored for
+      per-project 3rd party package management. You will typically have one
+      Pants repository per project and each repository will be located somewhere
+      under your project's root directory. If you're familiar with Ports or
+      Portage, a Pants repository is roughly analogous to /usr/ports or
+      /usr/portage.
+
+    * Pants is extremely portable. It goes anywhere Apache Ant goes.
+
+    Pants takes a modular approach to the standard Ant buildfile, breaking it
+    into 3 files for functionality and convenience:
+
+    1. The Pants public interface, pants/build.xml, provides a single consistent
+       way to access and manipulate dependency packages and relieves some of the
+       developer's burden by providing implementations for some frequently-used
+       and complex Ant operations.
+
+    2. pbuild.xml is a specially-structured and slimmed-down Ant buildfile in
+       which you implement custom handling for a package your project depends
+       on. This is known as the "pbuild" and is roughly analogous to a FreeBSD
+       port or a Gentoo ebuild. A fairly explanatory template for pbuilds,
+       pbuild.template.xml, is provided.
+
+    3. pbuild.properties contains those properties for a specific pbuild which
+       are most likely to change over time. It uses the java.util.Properties
+       format which is more human-friendly for hand-editing than Ant/XML. A
+       fairly explanatory template, pbuild.template.properties, is provided.
+
+    There is one more file that completes the Pants system: the metadata file
+    pants/world is a database for keeping track of all packages managed by Pants
+    for your project.
+
+    Pants automatically handles versioning for your project's dependency
+    packages and keeps track of their recommended versions, currently used
+    versions, and latest available versions. This makes it extremely simple for
+    project developers to switch back and forth between different versions of a
+    dependency, and makes it just as easy to update a dependency. You can even
+    update all your project's Pants-managed packages with a single command.
+
+    Pbuilds are designed to automatically handle the downloading, building,
+    repackaging and deployment of source archives, binary archives, and CVS
+    sources, all in a manner that's completely transparent to the project
+    developer. Pbuilds currently support tar + gzip, tar + bzip2, and zip
+    archives.
+
+    Because it is based on Ant, Pants integrates very well with Ant buildfiles
+    and will fit easily into your project's Ant build framework. However, its
+    interface is simple enough to be called just as easily by more traditional
+    build systems such as GNU Make.
+
+
+Why Should I Use Pants?
+-----------------------
+
+    There are many applications for Pants, but a few use cases should best serve
+    to illustrate its usefulness:
+
+    1. You have a project that you ship with several 3rd party libraries but the
+       versions you're using are stale. With a single command, Pants can
+       automatically discover the latest release versions for all of these, then
+       download, build, and place the fresh libraries where your project's main
+       build system expects them to be at build time.
+
+    2. You want to test multiple versions of a 3rd party library against your
+       project. Pants only requires you to issue a single command to switch
+       library versions, so can spend more time testing and less time hunting
+       packages down, unpackaging them, symlinking, etc.
+
+    3. Pants is public domain. You can ship it with your project if you need to
+       without having to worry about petty intellectual property or licensing
+       issues.
+
+
+Minimum Requirements
+--------------------
+
+    * Apache Ant 1.6.2 or higher is recommended
+
+    * Any Java runtime and operating system that will run Ant
+
+
+Installation
+------------
+
+    Not finished yet.
+
+
+Why the Silly Name?
+-------------------
+
+    Ports + Ant = Pants. Any other explanation is purely a product of your
+    twisted imagination.
+
+
+Miscellaneous Pocket Fluff
+--------------------------
+
+    Author:  smeghead <smeghead@i2pmail.org> <smeghead@mail.i2p>
+
+    License: No license necessary. This work is released into the public domain.
+
+    Price:   Free! But if you really appreciate Pants, or you're just a sicko,
+             please send me a picture of your worst or most unusual pair of
+             pants so I can add it to the Whirling Hall of Pants on pants.i2p,
+             the official Pants eepsite (that's an anonymous website on I2P--see
+             http://www.i2p.net for more information).
+
+
+$Id$

apps/pants/pants/resources/pbuild.template.properties

@@ -0,0 +1,110 @@
+# The properties defined in this file can be overridden on the command line by
+# passing them in as parameters like so:
+#
+#     ant -Dpbuild=myapp -Dversion.recommended=2.0.5 install
+#
+# *** DO NOT DEFINE A PROPERTY BUT LEAVE ITS VALUE BLANK. PANTS WILL BREAK! ***
+
+
+#     Recommended Package Version
+#
+# Set this property's value to the package version you want Pants to use for the
+# pbuild by default. The version string specified must match the version
+# substring from the package's filename if the filename contains a version
+# number.
+#
+# Comment out this property to force use of the latest available version.
+#
+# If the pbuild is CVS-based rather than package-based, this property must be
+# set to 'CVS'.
+#
+# Example:
+#
+# version.recommended=2.0.4
+
+
+#     Latest Package Version
+#
+# There are currently two ways to inform Pants of the latest version number for
+# your package.
+#
+# Method 1: Manually modify the property 'version.latest' to reflect the latest
+#           version number.
+#
+# Method 2: Provide a URL for a page on the package's website and a regular
+#           expression with which to parse it in order to extract the version
+#           number of the latest available package. For this you must define the
+#           properties 'version.latest.find.url', 'version.latest.find.regex',
+#           and any regular expression engine mode flags needed. The pattern
+#           defined must have exactly one capturing group to encapsulate the
+#           version string, otherwise the operation will fail.
+#
+# You may use both methods, in which case the version number specified by Method
+# 1 will be used as the fallback value if Method 2 for some reason is
+# unsuccessful.
+#
+# If neither method is enabled here or they fail to return a valid value to
+# Pants, the 'ant update' operation for this pbuild may exit ungracefully unless
+# the pbuild is CVS-based (none of the version.latest.* properties are used by
+# CVS-based pbuilds).
+#
+# The following is a list of boolean properties for optional mode flags used by
+# the regular expression engine. Set a value of "true" for any you wish to use.
+#
+# version.latest.find.regex.canonicaleq      - Enable canonical equivalence
+# version.latest.find.regex.caseinsensitive  - Enable case-insensitive matching
+# version.latest.find.regex.comments         - Permit whitespace and comments
+# version.latest.find.regex.dotall           - Enable dotall mode
+# version.latest.find.regex.multiline        - Enable multi-line mode
+# version.latest.find.regex.unicodecase      - Enable Unicode-aware case folding
+# version.latest.find.regex.unixlines        - Enable Unix lines mode
+#
+# Examples:
+#
+# version.latest=5.1.2
+# version.latest.find.url=http://sourceforge.net/projects/jetty/
+# version.latest.find.regex=Stable.+?Jetty-(.+?)</A>
+
+
+#     Package URL
+#
+# Specify the URL pointing to the pbuild's package from here. The token
+# '${pbuild.version}' if used will automatically be expanded to the appropriate
+# version string.
+#
+# The package URL property is not used by CVS-based pbuilds.
+#
+# Examples:
+#
+# package.url=ftp://borkbork.se/bork-${pbuild.version}.tar.bz2
+# package.url=http://bork.borkbork.se/bork-${pbuild.version}-src.tar.gz
+
+
+#     CVS Repository
+#
+# The values expected for CVS properties here are the same as those expected by
+# their corresponding Apache Ant 'Cvs' task attributes. For details see:
+#
+#     http://ant.apache.org/manual/CoreTasks/cvs.html
+#
+# Not all of the 'Cvs' task's attributes have corresponding Pants properties.
+# The following is a list of all valid CVS properties for Pants (and their
+# default values if applicable):
+#
+#     cvs.compression.level
+#     cvs.date
+#     cvs.package
+#     cvs.passfile=~/.cvspass
+#     cvs.port=2401
+#     cvs.root
+#     cvs.rsh
+#     cvs.tag
+#
+# Of these, only the 'cvs.root' property is required for CVS-based pbuilds.
+#
+# Examples:
+#
+# cvs.root=:pserver:anoncvs@borkbork.se:/cvsroot/bork
+# cvs.rsh=ssh
+# cvs.package=borkbork
+

apps/pants/pants/resources/pbuild.template.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is a template for Pants pbuilds. Pbuilds use standard Apache Ant syntax.
+  For each target in the Public Interface section you must provide either an
+  implementation or a stub. You may also add your own custom tasks and
+  properties to this file. Be careful that none of your custom properties'
+  names clash with the properties defined in pants/build.xml.
+-->
+
+<project basedir="." default="build" name="name-of-pbuild-here">
+
+<!-- ....................... Begin Public Interface ........................ -->
+
+	<!--
+	  When this target is called, the pbuild's sources and/or binaries have
+	  already been extracted/copied by Pants into the pbuild's working/
+	  subdirectory. This target must prepare those sources and/or binaries in
+	  the working/ subdirectory into deployable form, for example by building
+	  all necessary classes and jar files.
+	  
+	  This target must not create or modify any files outside the pbuild's
+	  working/ subdirectory. (An automatic sandboxing mechanism should be added
+	  to Pants at some point.) It is however acceptable for a task called by
+	  'builddep' to modify files outside of this pbuild's working/ directory.
+	-->
+	<target name="build" depends="builddep" />
+
+	<!--
+	  Use this to call targets from other pbuilds, Ant buildfiles, Makefiles,
+	  etc. which perform tasks this pbuild's 'build' target depends on. If other
+	  pbuilds are called here, they must be called through the Pants interface
+	  or else it may leave Pants in an inconsistent state.
+	  
+	  Most pbuilds probably won't need to implement this target.
+	-->
+	<target name="builddep" />
+
+	<!--
+	  This target must undo the actions performed by the 'build' target.
+	-->
+	<target name="clean" depends="depclean" />
+
+	<!--
+	  If the 'builddep' target is implemented, this target must be implemented
+	  to undo its actions.
+	-->
+	<target name="depclean" />
+
+	<!--
+	  This target must copy all deployable files generated by the 'build' target
+	  into the pbuild's dist/ subdirectory (for use by other pbuilds or Ant
+	  processes) or to their final deployment locations outside the pants/
+	  directory hierarchy. Note that the latter may require the user to gain
+	  superuser/admin privileges.
+	-->
+	<target name="dist" depends="build" />
+
+	<!--
+	  This target must remove all files from the pbuild's dist/ subdirectory
+	  and final deployment locations, reversing the actions of the 'dist'
+	  target. Note that removal of files from their final deployment locations
+	  may require the user to gain superuser/admin privileges.
+	-->
+	<target name="distclean" depends="clean" />
+
+<!-- ........................ End Public Interface ......................... -->
+
+</project>

apps/pants/pbuilds/fortuna/pbuild.properties

@@ -0,0 +1,112 @@
+# The properties defined in this file can be overridden on the command line by
+# passing them in as parameters like so:
+#
+#     ant -Dpbuild=myapp -Dversion.recommended=2.0.5 install
+#
+# *** DO NOT DEFINE A PROPERTY BUT LEAVE ITS VALUE BLANK. PANTS WILL BREAK! ***
+
+
+#     Recommended Package Version
+#
+# Set this property's value to the package version you want Pants to use for the
+# pbuild by default. The version string specified must match the version
+# substring from the package's filename if the filename contains a version
+# number.
+#
+# Comment out this property to force use of the latest available version.
+#
+# If the pbuild is CVS-based rather than package-based, this property must be
+# set to 'CVS'.
+#
+# Example:
+#
+# version.recommended=2.0.4
+version.recommended=CVS
+
+#     Latest Package Version
+#
+# There are currently two ways to inform Pants of the latest version number for
+# your package.
+#
+# Method 1: Manually modify the property 'version.latest' to reflect the latest
+#           version number.
+#
+# Method 2: Provide a URL for a page on the package's website and a regular
+#           expression with which to parse it in order to extract the version
+#           number of the latest available package. For this you must define the
+#           properties 'version.latest.find.url', 'version.latest.find.regex',
+#           and any regular expression engine mode flags needed. The pattern
+#           defined must have exactly one capturing group to encapsulate the
+#           version string, otherwise the operation will fail.
+#
+# You may use both methods, in which case the version number specified by Method
+# 1 will be used as the fallback value if Method 2 for some reason is
+# unsuccessful.
+#
+# If neither method is enabled here or they fail to return a valid value to
+# Pants, the 'ant update' operation for this pbuild may exit ungracefully unless
+# the pbuild is CVS-based (none of the version.latest.* properties are used by
+# CVS-based pbuilds).
+#
+# The following is a list of boolean properties for optional mode flags used by
+# the regular expression engine. Set a value of "true" for any you wish to use.
+#
+# version.latest.find.regex.canonicaleq      - Enable canonical equivalence
+# version.latest.find.regex.caseinsensitive  - Enable case-insensitive matching
+# version.latest.find.regex.comments         - Permit whitespace and comments
+# version.latest.find.regex.dotall           - Enable dotall mode
+# version.latest.find.regex.multiline        - Enable multi-line mode
+# version.latest.find.regex.unicodecase      - Enable Unicode-aware case folding
+# version.latest.find.regex.unixlines        - Enable Unix lines mode
+#
+# Examples:
+#
+# version.latest=5.1.2
+# version.latest.find.url=http://sourceforge.net/projects/jetty/
+# version.latest.find.regex=Stable.+?Jetty-(.+?)</A>
+
+
+#     Package URL
+#
+# Specify the URL pointing to the pbuild's package from here. The token
+# '${pbuild.version}' if used will automatically be expanded to the appropriate
+# version string.
+#
+# The package URL property is not used by CVS-based pbuilds.
+#
+# Examples:
+#
+# package.url=ftp://borkbork.se/bork-${pbuild.version}.tar.bz2
+# package.url=http://bork.borkbork.se/bork-${pbuild.version}-src.tar.gz
+
+
+#     CVS Repository
+#
+# The values expected for CVS properties here are the same as those expected by
+# their corresponding Apache Ant 'Cvs' task attributes. For details see:
+#
+#     http://ant.apache.org/manual/CoreTasks/cvs.html
+#
+# Not all of the 'Cvs' task's attributes have corresponding Pants properties.
+# The following is a list of all valid CVS properties for Pants (and their
+# default values if applicable):
+#
+#     cvs.compression.level
+#     cvs.date
+#     cvs.package
+#     cvs.passfile=~/.cvspass
+#     cvs.port=2401
+#     cvs.root
+#     cvs.rsh
+#     cvs.tag
+#
+# Of these, only the 'cvs.root' property is required for CVS-based pbuilds.
+#
+# Examples:
+#
+# cvs.root=:pserver:anoncvs@borkbork.se:/cvsroot/bork
+# cvs.rsh=ssh
+# cvs.package=borkbork
+cvs.root=:ext:anoncvs@savannah.gnu.org:/cvsroot/gnu-crypto
+cvs.rsh=ssh
+cvs.package=gnu-crypto

apps/pants/pbuilds/fortuna/pbuild.xml

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project basedir="." default="build" name="fortuna-pbuild">
+
+	<property name="gnucrypt.base.dir" value="./working/gnu-crypto" />
+	<property name="gnucrypt.etc.dir" value="${gnucrypt.base.dir}/etc" />
+	<property name="gnucrypt.lib.dir" value="${gnucrypt.base.dir}/lib" />
+	<property name="gnucrypt.object.dir" value="${gnucrypt.base.dir}/classes" />
+	<property name="gnucrypt.base.crypto.object.dir" value="${gnucrypt.object.dir}/gnu/crypto" />
+	<property name="gnucrypt.cipher.object.dir" value="${gnucrypt.base.crypto.object.dir}/cipher" />
+	<property name="gnucrypt.hash.object.dir" value="${gnucrypt.base.crypto.object.dir}/hash" />
+	<property name="gnucrypt.prng.object.dir" value="${gnucrypt.base.crypto.object.dir}/prng" />
+
+	<patternset id="fortuna.files">
+		<include name="${gnucrypt.base.crypto.object.dir}/Registry.class" />
+		<include name="${gnucrypt.prng.object.dir}/Fortuna*.class" />
+		<include name="${gnucrypt.prng.object.dir}/BasePRNG.class" />
+		<include name="${gnucrypt.prng.object.dir}/RandomEventListener.class" />
+		<include name="${gnucrypt.prng.object.dir}/IRandom.class" />
+		<include name="${gnucrypt.cipher.object.dir}/CipherFactory.class" />
+		<include name="${gnucrypt.cipher.object.dir}/IBlockCipher.class" />
+		<include name="${gnucrypt.hash.object.dir}/HashFactory.class" />
+		<include name="${gnucrypt.hash.object.dir}/IMessageDigest.class" />
+	</patternset>
+
+	<!--
+		Add this when Fortuna tests are added to GNU Crypto, else write some
+	-->
+	<target name="-test" />
+
+<!-- ....................... Begin Public Interface ........................ -->
+
+	<!--
+	  When this target is called, the pbuild's sources and/or binaries have
+	  already been extracted/copied by Pants into the pbuild's working/
+	  subdirectory. This target must prepare those sources and/or binaries in
+	  the working/ subdirectory into deployable form, for example by building
+	  all necessary classes and jar files.
+	  
+	  This target must not create or modify any files outside the pbuild's
+	  working/ subdirectory. (An automatic sandboxing mechanism should be added
+	  to Pants at some point.) It is however acceptable for a task called by
+	  'builddep' to modify files outside of this pbuild's working/ directory.
+	-->
+	<target name="build" depends="builddep">
+		<delete dir="./working/build" />
+		<delete dir="./working/jartemp" />
+		<mkdir dir="./working/build" />
+		<mkdir dir="./working/jartemp/${gnucrypt.object.dir}" />
+		<copy todir="./working/jartemp">
+			<fileset dir=".">
+				<patternset refid="fortuna.files" />
+			</fileset>
+		</copy>
+		<jar basedir="./working/jartemp/${gnucrypt.object.dir}" jarfile="./working/build/fortuna.jar">
+			<manifest>
+				<section name="fortuna">
+					<attribute name="Implementation-Title" value="I2P Custom GNU Crypto Fortuna Library" />
+					<attribute name="Implementation-Version" value="CVS HEAD" /> 
+					<attribute name="Implementation-Vendor" value="Free Software Foundation" />
+					<attribute name="Implementation-Vendor-Id" value="FSF" />
+					<attribute name="Implementation-URL" value="http://www.gnu.org/software/gnu-crypto" />
+				</section>
+			</manifest>
+		</jar>
+		<delete dir="./working/jartemp" />
+	</target>
+
+	<!--
+	  Use this to call targets from other pbuilds, Ant buildfiles, Makefiles,
+	  etc. which perform tasks this pbuild's 'build' target depends on. If other
+	  pbuilds are called here, they must be called through the Pants interface
+	  or else it may leave Pants in an inconsistent state.
+	  
+	  Most pbuilds probably won't need to implement this target.
+	-->
+	<target name="builddep">
+		<ant dir="${gnucrypt.base.dir}" target="jar" />
+	</target>
+
+	<!--
+	  This target must undo the actions performed by the 'build' target.
+	-->
+	<target name="clean" depends="depclean">
+		<delete dir="./working/jartemp" />
+	</target>
+
+	<!--
+	  If the 'builddep' target is implemented, this target must be implemented
+	  to undo its actions.
+	-->
+	<target name="depclean">
+		<!--
+			Annoyingly the GNU Crypto distclean task called here doesn't clean
+			*all* derived files from java/gnu-crypto/lib like it should (because
+			a couple of lines are commented out).....
+		-->
+		<ant dir="${gnucrypt.base.dir}" target="distclean" />
+		<!--
+			.....and so we mop up the rest ourselves.
+		-->
+		<delete dir="${gnucrypt.lib.dir}" />
+	</target>
+
+	<!--
+	  This target must copy all deployable files generated by the 'build' target
+	  into the pbuild's dist/ subdirectory (for use by other pbuilds or Ant
+	  processes) or to their final deployment locations outside the pants/
+	  directory hierarchy. Note that the latter may require the user to gain
+	  superuser/admin privileges.
+	-->
+	<target name="dist" depends="build">
+		<copy todir="./dist/fortuna.jar" file="./working/build/fortuna.jar" />
+	</target>
+
+	<!--
+	  This target must remove all files from the pbuild's dist/ subdirectory
+	  and final deployment locations, reversing the actions of the 'dist'
+	  target. Note that removal of files from their final deployment locations
+	  may require the user to gain superuser/admin privileges.
+	-->
+	<target name="distclean" depends="clean">
+		<delete file="./dist/fortuna.jar" />
+	</target>
+
+<!-- ........................ End Public Interface ......................... -->
+
+</project>

apps/pants/pbuilds/jetty/pbuild.properties

@@ -0,0 +1,112 @@
+# The properties defined in this file can be overridden on the command line by
+# passing them in as parameters like so:
+#
+#     ant -Dpbuild=myapp -Dversion.recommended=2.0.5 install
+#
+# *** DO NOT DEFINE A PROPERTY BUT LEAVE ITS VALUE BLANK. PANTS WILL BREAK! ***
+
+
+#     Recommended Package Version
+#
+# Set this property's value to the package version you want Pants to use for the
+# pbuild by default. The version string specified must match the version
+# substring from the package's filename if the filename contains a version
+# number.
+#
+# Comment out this property to force use of the latest available version.
+#
+# If the pbuild is CVS-based rather than package-based, this property must be
+# set to 'CVS'.
+#
+# Example:
+#
+# version.recommended=2.0.4
+version.recommended=5.1.2
+
+#     Latest Package Version
+#
+# There are currently two ways to inform Pants of the latest version number for
+# your package.
+#
+# Method 1: Manually modify the property 'version.latest' to reflect the latest
+#           version number.
+#
+# Method 2: Provide a URL for a page on the package's website and a regular
+#           expression with which to parse it in order to extract the version
+#           number of the latest available package. For this you must define the
+#           properties 'version.latest.find.url', 'version.latest.find.regex',
+#           and any regular expression engine mode flags needed. The pattern
+#           defined must have exactly one capturing group to encapsulate the
+#           version string, otherwise the operation will fail.
+#
+# You may use both methods, in which case the version number specified by Method
+# 1 will be used as the fallback value if Method 2 for some reason is
+# unsuccessful.
+#
+# If neither method is enabled here or they fail to return a valid value to
+# Pants, the 'ant update' operation for this pbuild may exit ungracefully unless
+# the pbuild is CVS-based (none of the version.latest.* properties are used by
+# CVS-based pbuilds).
+#
+# The following is a list of boolean properties for optional mode flags used by
+# the regular expression engine. Set a value of "true" for any you wish to use.
+#
+# version.latest.find.regex.canonicaleq      - Enable canonical equivalence
+# version.latest.find.regex.caseinsensitive  - Enable case-insensitive matching
+# version.latest.find.regex.comments         - Permit whitespace and comments
+# version.latest.find.regex.dotall           - Enable dotall mode
+# version.latest.find.regex.multiline        - Enable multi-line mode
+# version.latest.find.regex.unicodecase      - Enable Unicode-aware case folding
+# version.latest.find.regex.unixlines        - Enable Unix lines mode
+#
+# Examples:
+#
+# version.latest=5.1.2
+# version.latest.find.url=http://sourceforge.net/projects/jetty/
+# version.latest.find.regex=Stable.+?Jetty-(.+?)</A>
+version.latest=5.1.2
+version.latest.find.url=http://sourceforge.net/projects/jetty/
+version.latest.find.regex=Stable.+?Jetty-(.+?)</A>
+
+#     Package URL
+#
+# Specify the URL pointing to the pbuild's package from here. The token
+# '${pbuild.version}' if used will automatically be expanded to the appropriate
+# version string.
+#
+# The package URL property is not used by CVS-based pbuilds.
+#
+# Examples:
+#
+# package.url=ftp://borkbork.se/bork-${pbuild.version}.tar.bz2
+# package.url=http://bork.borkbork.se/bork-${pbuild.version}-src.tar.gz
+package.url=http://mesh.dl.sourceforge.net/sourceforge/jetty/jetty-${pbuild.version}.zip
+
+#     CVS Repository
+#
+# The values expected for CVS properties here are the same as those expected by
+# their corresponding Apache Ant 'Cvs' task attributes. For details see:
+#
+#     http://ant.apache.org/manual/CoreTasks/cvs.html
+#
+# Not all of the 'Cvs' task's attributes have corresponding Pants properties.
+# The following is a list of all valid CVS properties for Pants (and their
+# default values if applicable):
+#
+#     cvs.compression.level
+#     cvs.date
+#     cvs.package
+#     cvs.passfile=~/.cvspass
+#     cvs.port=2401
+#     cvs.root
+#     cvs.rsh
+#     cvs.tag
+#
+# Of these, only the 'cvs.root' property is required for CVS-based pbuilds.
+#
+# Examples:
+#
+# cvs.root=:pserver:anoncvs@borkbork.se:/cvsroot/bork
+# cvs.rsh=ssh
+# cvs.package=borkbork
+

apps/pants/pbuilds/jetty/pbuild.xml

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project basedir="." default="all" name="jetty">
+
+	<!-- make this generic, place variables in properties file -->
+
+	<target name="all" depends="build"
+		description="Run the build target" />
+
+	<target name="assignProperties" if="group.0">
+		<property name="latest.jetty.version" value="${group.1}" />
+		<available property="jetty.package.available" file="jetty-${latest.jetty.version}.zip" />
+		<available property="jetty.package.unpacked.available" file="jettypkg/jetty-${latest.jetty.version}" />
+		<echo message="Properties assigned" />
+	</target>
+
+	<target name="build" depends="init, unpackJettyPackage" if="latest.jetty.version"
+		description="Download latest Jetty package and copy needed libs to jettylib/">
+		<property name="unpack.dir" value="jettypkg/jetty-${latest.jetty.version}" />
+		<copy todir="jettylib" overwrite="true" file="${unpack.dir}/ext/ant.jar" />
+		<copy todir="jettylib" overwrite="true" file="${unpack.dir}/ext/jasper-compiler.jar" />
+		<copy todir="jettylib" overwrite="true" file="${unpack.dir}/ext/jasper-runtime.jar" />
+		<copy todir="jettylib" overwrite="true" file="${unpack.dir}/ext/xercesImpl.jar" />
+		<copy todir="jettylib" overwrite="true" file="${unpack.dir}/ext/xml-apis.jar" />
+		<copy todir="jettylib" overwrite="true" file="${unpack.dir}/extra/lib/org.mortbay.jetty-jdk1.2.jar" />
+		<copy todir="jettylib" overwrite="true" file="${unpack.dir}/lib/javax.servlet.jar" />
+		<copy todir="jettylib" overwrite="true" file="${unpack.dir}/lib/org.mortbay.jetty.jar" />
+		<copy todir="jettylib" overwrite="true">
+			<fileset dir="${unpack.dir}/ext" includes="xmlParserAPIs*.jar" />
+		</copy>
+	</target>
+
+	<target name="builddep"
+		description="Build the custom helper Ant task for this buildfile">
+		<mkdir dir="java/build"/>
+		<javac srcdir="./java/src" source="1.3" target="1.3" deprecation="on" destdir="./java/build" />
+	</target>
+
+	<target name="clean"
+		description="Remove temp files and zip only; jettypkg/ requires manual deletion">
+		<echo message="Not actually deleting the Jetty package directory since it's so large" />
+		<delete>
+			<fileset dir="." includes="*.zip jettytemp.html parsed.temp" />
+		</delete>
+	</target>
+
+	<target name="cleandep"
+		description="Remove custom helper Ant task">
+		<delete dir="java/build" />
+	</target>
+
+	<target name="compile" />
+
+	<target name="distclean" depends="clean"
+		description="Remove temp files, zip and jettylib/ contents" >
+		<delete>
+			<fileset dir="jettylib" includes="*.jar"/>
+		</delete>
+	</target>
+
+	<target name="fetchJettyPackage" if="latest.jetty.version" unless="jetty.package.available">
+		<echo message="The Jetty libs are not necessary for using I2P, but are used by some" />
+		<echo message="applications on top of I2P such as the routerconsole." />
+		<get src="http://mesh.dl.sourceforge.net/sourceforge/jetty/jetty-${latest.jetty.version}.zip" verbose="true" dest="jetty-${latest.jetty.version}.zip" />
+	</target>
+
+	<target name="init" depends="builddep">
+		<echo message="Checking SourceForge for latest Jetty version....." />
+		<get src="http://sourceforge.net/projects/jetty/" dest="jettytemp.html" verbose="true" />
+		<taskdef name="match" classname="net.i2p.pants.MatchTask" classpath="../../lib/pants.jar" />
+		<match input="jettytemp.html"
+			output="parsed.temp"
+			regex="Stable.+?Jetty-(.+?)&lt;/A&gt;"
+			/>
+		<loadproperties srcFile="parsed.temp" />
+		<antcall target="assignProperties" />
+	</target>
+
+	<target name="jar" />
+
+	<target name="showlatest" depends="init"
+		description="Display latest version number for Jetty">
+		<echo message="Latest Jetty version: ${latest.jetty.version}" />
+	</target>
+
+	<target name="unpackJettyPackage" depends="fetchJettyPackage" if="latest.jetty.version" unless="jetty.package.unpacked.available">
+		<mkdir dir="jettypkg" />
+		<unzip src="jetty-${latest.jetty.version}.zip" dest="jettypkg" />
+	</target>
+</project>

apps/pants/world

@@ -0,0 +1,2 @@
+version.using.fortuna=CVS
+version.using.jetty=5.1.2

apps/routerconsole/java/build.xml

@@ -20,7 +20,7 @@
             <classpath>
                 <pathelement location="../../../core/java/build/i2p.jar" />
                 <pathelement location="../../../router/java/build/router.jar" />
-                <pathelement location="../../jetty/jettylib/org.mortbay.jetty-jdk1.2.jar" />
+                <pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" />
                 <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
                 <pathelement location="../../systray/java/build/systray.jar" />
                 <pathelement location="../../systray/java/lib/systray4j.jar" />
@@ -48,20 +48,24 @@
         <mkdir dir="../jsp/WEB-INF/" />
         <mkdir dir="../jsp/WEB-INF/classes" />
         <!-- there are various jspc ant tasks, but they all seem a bit flakey -->
-        <java classname="org.apache.jasper.JspC" fork="true" >
+        <java classname="org.apache.jasper.JspC" fork="true">
             <classpath>
                 <pathelement location="../../jetty/jettylib/jasper-compiler.jar" />
                 <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
                 <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
+                <pathelement location="../../jetty/jettylib/commons-logging.jar" />
+                <pathelement location="../../jetty/jettylib/commons-el.jar" />
                 <pathelement location="../../jetty/jettylib/ant.jar" />
                 <pathelement location="../../systray/java/build/obj" />
-                <pathelement location="../../systray/java/lib/systray4j.jar" /> <!-- some javacs resolve recursively... -->
-                <pathelement location="../../../installer/lib/wrapper/win32/wrapper.jar" /> <!-- we dont care if we're not on win32 -->
+                <pathelement location="../../systray/java/lib/systray4j.jar" />
+                <pathelement location="../../../installer/lib/wrapper/win32/wrapper.jar" />
                 <pathelement location="build/routerconsole.jar" />
+                <pathelement location="../../../router/java/build/router.jar" />
+                <pathelement location="../../../core/java/build/i2p.jar" />
             </classpath>
             <arg value="-d" />
             <arg value="../jsp/WEB-INF/classes" />
-            <arg value="-v9" />
+            <arg value="-v" />
             <arg value="-p" />
             <arg value="net.i2p.router.web.jsp" />
             <arg value="-webinc" />
@@ -69,10 +73,13 @@
             <arg value="-webapp" />
             <arg value="../jsp/" />
         </java>
-        <javac destdir="../jsp/WEB-INF/classes/" srcdir="../jsp/WEB-INF/classes" includes="*.java">
+        
+        <javac destdir="../jsp/WEB-INF/classes/" srcdir="../jsp/WEB-INF/classes" includes="**/*.java">
             <classpath>
                 <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
                 <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
+                <pathelement location="../../jetty/jettylib/commons-logging.jar" />
+                <pathelement location="../../jetty/jettylib/commons-el.jar" />
                 <pathelement location="build/routerconsole.jar" />
             </classpath>
         </javac>

apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java

@@ -1,84 +0,0 @@
-package net.i2p.router.web;
-
-import net.i2p.router.ClientTunnelSettings;
-
-/**
- * Handler to deal with form submissions from the client config form and act
- * upon the values.
- *
- */
-public class ConfigClientsHandler extends FormHandler {
-    private String _numClients;
-    private String _numTunnels;
-    private String _numHops;
-    private String _numHopsOutbound;
-    private boolean _shouldSave;
-    
-    public void ConfigNetHandler() {
-        _shouldSave = false;
-    }
-    
-    protected void processForm() {
-        if (_shouldSave) {
-            saveChanges();
-        } else {
-            // noop
-        }
-    }
-    
-    public void setShouldsave(String moo) { _shouldSave = true; }
-    
-    public void setClientcount(String num) {
-        _numClients = (num != null ? num.trim(): null);
-    }
-    public void setTunnelcount(String num) {
-        _numTunnels = (num != null ? num.trim() : null);
-    }
-    public void setTunneldepth(String num) {
-        _numHops = (num != null ? num.trim() : null);
-    }
-    public void setTunneldepthoutbound(String num) {
-        _numHopsOutbound = (num != null ? num.trim() : null);
-    }
-    
-    /**
-     * The user made changes to the network config and wants to save them, so
-     * lets go ahead and do so.
-     *
-     */
-    private void saveChanges() {
-        boolean saveRequired = false;
-        
-        if ( (_numClients != null) && (_numClients.length() > 0) ) {
-            _context.router().setConfigSetting("router.targetClients", _numClients);
-            addFormNotice("Updating estimated number of clients to " + _numClients);
-            saveRequired = true;
-        }
-        
-        if ( (_numTunnels != null) && (_numTunnels.length() > 0) ) {
-            _context.router().setConfigSetting(ClientTunnelSettings.PROP_NUM_INBOUND, _numTunnels);
-            addFormNotice("Updating default number of tunnels per client to " + _numTunnels);
-            saveRequired = true;
-        }
-        
-        if ( (_numHops != null) && (_numHops.length() > 0) ) {
-            _context.router().setConfigSetting(ClientTunnelSettings.PROP_DEPTH_INBOUND, _numHops);
-            addFormNotice("Updating default tunnel length to " + _numHops);
-            saveRequired = true;
-        }
-        
-        if ( (_numHopsOutbound != null) && (_numHopsOutbound.length() > 0) ) {
-            _context.router().setConfigSetting(ClientTunnelSettings.PROP_DEPTH_OUTBOUND, _numHopsOutbound);
-            addFormNotice("Updating default outbound tunnel length to " + _numHopsOutbound);
-            saveRequired = true;
-        }
-        
-        if (saveRequired) {
-            boolean saved = _context.router().saveConfig();
-            if (saved) 
-                addFormNotice("Configuration saved successfully");
-            else
-                addFormNotice("Error saving the configuration (applied but not saved) - please see the error logs");
-        }
-    }
-}

apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java

@@ -1,144 +0,0 @@
-package net.i2p.router.web;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.List;
-import java.util.Iterator;
-import java.util.TreeMap;
-
-import net.i2p.util.Log;
-
-import net.i2p.router.RouterContext;
-import net.i2p.router.ClientTunnelSettings;
-
-public class ConfigClientsHelper {
-    private RouterContext _context;
-    /**
-     * Configure this bean to query a particular router context
-     *
-     * @param contextId begging few characters of the routerHash, or null to pick
-     *                  the first one we come across.
-     */
-    public void setContextId(String contextId) {
-        try {
-            _context = ContextHelper.getContext(contextId);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-
-    /** copied from the package private {@link net.i2p.router.tunnelmanager.TunnelPool} */
-    public final static String TARGET_CLIENTS_PARAM = "router.targetClients";
-    /** copied from the package private {@link net.i2p.router.tunnelmanager.TunnelPool} */
-    public final static int TARGET_CLIENTS_DEFAULT = 3;
-
-    public ConfigClientsHelper() {}
-    
-    public String getClientCountSelectBox() {
-        int count = TARGET_CLIENTS_DEFAULT;
-        String val = _context.router().getConfigSetting(TARGET_CLIENTS_PARAM);
-        if (val != null) {
-            try {
-                count = Integer.parseInt(val);
-            } catch (NumberFormatException nfe) {
-                // ignore, use default from above
-            }
-        }
-        StringBuffer buf = new StringBuffer(1024);
-        buf.append("<select name=\"clientcount\">\n");
-        for (int i = 0; i < 5; i++) {
-            buf.append("<option value=\"").append(i).append("\" ");
-            if (count == i)
-                buf.append("selected=\"true\" ");
-            buf.append(">").append(i).append("</option>\n");
-        }
-        if (count >= 5) {
-            buf.append("<option value=\"").append(count);
-            buf.append("\" selected>").append(count);
-            buf.append("</option>\n");
-        }
-        buf.append("</select>\n");
-        return buf.toString();
-    }
-    
-    public String getTunnelCountSelectBox() {
-        int count = ClientTunnelSettings.DEFAULT_NUM_INBOUND;
-        String val = _context.router().getConfigSetting(ClientTunnelSettings.PROP_NUM_INBOUND);
-        if (val != null) {
-            try {
-                count = Integer.parseInt(val);
-            } catch (NumberFormatException nfe) {
-                // ignore, use default from above
-            }
-        }
-        StringBuffer buf = new StringBuffer(1024);
-        buf.append("<select name=\"tunnelcount\">\n");
-        for (int i = 0; i < 4; i++) {
-            buf.append("<option value=\"").append(i).append("\" ");
-            if (count == i)
-                buf.append("selected=\"true\" ");
-            buf.append(">").append(i).append("</option>\n");
-        }
-        if (count >= 4) {
-            buf.append("<option value=\"").append(count);
-            buf.append("\" selected>").append(count);
-            buf.append("</option>\n");
-        }
-        buf.append("</select>\n");
-        return buf.toString();
-    }
-    
-    public String getTunnelDepthSelectBox() {
-        int count = ClientTunnelSettings.DEFAULT_DEPTH_INBOUND;
-        String val = _context.router().getConfigSetting(ClientTunnelSettings.PROP_DEPTH_INBOUND);
-        if (val != null) {
-            try {
-                count = Integer.parseInt(val);
-            } catch (NumberFormatException nfe) {
-                // ignore, use default from above
-            }
-        }
-        StringBuffer buf = new StringBuffer(1024);
-        buf.append("<select name=\"tunneldepth\">\n");
-        for (int i = 0; i < 4; i++) {
-            buf.append("<option value=\"").append(i).append("\" ");
-            if (count == i)
-                buf.append("selected=\"true\" ");
-            buf.append(">").append(i).append("</option>\n");
-        }
-        if (count >= 4) {
-            buf.append("<option value=\"").append(count);
-            buf.append("\" selected>").append(count);
-            buf.append("</option>\n");
-        }
-        buf.append("</select>\n");
-        return buf.toString();
-    }
-    
-    public String getTunnelDepthOutboundSelectBox() {
-        int count = ClientTunnelSettings.DEFAULT_DEPTH_OUTBOUND;
-        String val = _context.router().getConfigSetting(ClientTunnelSettings.PROP_DEPTH_OUTBOUND);
-        if (val != null) {
-            try {
-                count = Integer.parseInt(val);
-            } catch (NumberFormatException nfe) {
-                // ignore, use default from above
-            }
-        }
-        StringBuffer buf = new StringBuffer(1024);
-        buf.append("<select name=\"tunneldepthoutbound\">\n");
-        for (int i = 0; i < 4; i++) {
-            buf.append("<option value=\"").append(i).append("\" ");
-            if (count == i)
-                buf.append("selected=\"true\" ");
-            buf.append(">").append(i).append("</option>\n");
-        }
-        if (count >= 4) {
-            buf.append("<option value=\"").append(count);
-            buf.append("\" selected>").append(count);
-            buf.append("</option>\n");
-        }
-        buf.append("</select>\n");
-        return buf.toString();
-    }
-}

apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java

@@ -39,6 +39,7 @@ public class ConfigNetHandler extends FormHandler {
     private String _outboundRate;
     private String _outboundBurst;
     private String _reseedFrom;
+    private String _sharePct;
     
     public void ConfigNetHandler() {
         _guessRequested = false;
@@ -85,6 +86,9 @@ public class ConfigNetHandler extends FormHandler {
     public void setReseedfrom(String url) { 
         _reseedFrom = (url != null ? url.trim() : null); 
     }
+    public void setSharePercentage(String pct) {
+        _sharePct = (pct != null ? pct.trim() : null);
+    }
 
     private static final String IP_PREFIX = "<h1>Your IP is ";
     private static final String IP_SUFFIX = " <br></h1>";
@@ -229,6 +233,14 @@ public class ConfigNetHandler extends FormHandler {
         
         updateRates();
         
+        if (_sharePct != null) {
+            String old = _context.router().getConfigSetting(ConfigNetHelper.PROP_SHARE_PERCENTAGE);
+            if ( (old == null) || (!old.equalsIgnoreCase(_sharePct)) ) {
+                _context.router().setConfigSetting(ConfigNetHelper.PROP_SHARE_PERCENTAGE, _sharePct);
+                addFormNotice("Updating bandwidth share percentage");
+            }
+        }
+        
         if (_timeSyncEnabled) {
             // Time sync enable, means NOT disabled 
             _context.router().setConfigSetting(Timestamper.PROP_DISABLED, "false");

apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java

@@ -62,6 +62,8 @@ public class ConfigNetHelper {
     public static final String PROP_OUTBOUND_KBPS = "i2np.bandwidth.outboundKBytesPerSecond";
     public static final String PROP_INBOUND_BURST = "i2np.bandwidth.inboundBurstKBytes";
     public static final String PROP_OUTBOUND_BURST = "i2np.bandwidth.outboundBurstKBytes";
+    public static final String PROP_SHARE_PERCENTAGE = "router.sharePercentage";
+    public static final int DEFAULT_SHARE_PERCENTAGE = 80;
 
     public String getInboundRate() {
         String rate = _context.getProperty(PROP_INBOUND_KBPS);
@@ -135,4 +137,26 @@ public class ConfigNetHelper {
         buf.append("</select>\n");
         return buf.toString();
     }
+    
+    public String getSharePercentageBox() {
+        String pctStr = _context.getProperty(PROP_SHARE_PERCENTAGE);
+        int pct = DEFAULT_SHARE_PERCENTAGE;
+        if (pctStr != null)
+            try { pct = Integer.parseInt(pctStr); } catch (NumberFormatException nfe) {}
+        StringBuffer buf = new StringBuffer(256);
+        buf.append("<select name=\"sharePercentage\">\n");
+        boolean found = false;
+        for (int i = 30; i <= 100; i += 10) {
+            buf.append("<option value=\"").append(i).append("\" ");
+            if (pct == i) {
+                buf.append("selected=\"true\" ");
+                found = true;
+            } else if ( (i == DEFAULT_SHARE_PERCENTAGE) && (!found) ) {
+                buf.append("selected=\"true\" ");
+            }
+            buf.append(">Up to ").append(i).append("%</option>\n");
+        }
+        buf.append("</select>\n");
+        return buf.toString();
+    }
 }

apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHandler.java

@@ -0,0 +1,154 @@
+package net.i2p.router.web;
+
+import java.util.HashMap;
+import java.util.Map;
+import net.i2p.data.Hash;
+import net.i2p.data.DataFormatException;
+import net.i2p.util.Log;
+import net.i2p.router.TunnelPoolSettings;
+
+/**
+ * Handler to deal with form submissions from the tunnel config form and act
+ * upon the values.  Holy crap, this is UUUUGLY
+ *
+ */
+public class ConfigTunnelsHandler extends FormHandler {
+    private Log _log;
+    private Map _settings;
+    private boolean _shouldSave;
+    
+    public ConfigTunnelsHandler() {
+        _shouldSave = false;
+    }
+    
+    protected void processForm() {
+        if (_shouldSave) {
+            saveChanges();
+        } else {
+            // noop
+        }
+    }
+    
+    public void setShouldsave(String moo) { 
+        if ( (moo != null) && (moo.equals("Save changes")) )
+            _shouldSave = true; 
+    }
+    
+    public void setSettings(Map settings) { _settings = new HashMap(settings); }
+    
+    /**
+     * The user made changes to the network config and wants to save them, so
+     * lets go ahead and do so.
+     *
+     */
+    private void saveChanges() {
+        _log = _context.logManager().getLog(ConfigTunnelsHandler.class);
+        boolean saveRequired = false;
+        
+        if (_log.shouldLog(Log.DEBUG))
+            _log.debug("Saving changes, with props = " + _settings);
+        
+        int updated = 0;
+        int index = 0;
+        while (true) {
+            Object val = _settings.get("pool." + index);
+            if (val == null) break;
+            Hash client = new Hash();
+            
+            String poolName = (val instanceof String ? (String)val : ((String[])val)[0]);
+            
+            TunnelPoolSettings in = null;
+            TunnelPoolSettings out = null;
+            if ("exploratory".equals(poolName)) {
+                in = _context.tunnelManager().getInboundSettings();
+                out = _context.tunnelManager().getOutboundSettings();
+            } else {
+                try {
+                    client.fromBase64(poolName);
+                } catch (DataFormatException dfe) {
+                    addFormError("Internal error (pool name could not resolve - " + poolName + ")");
+                    index++;
+                    continue;
+                }
+                in = _context.tunnelManager().getInboundSettings(client);
+                out = _context.tunnelManager().getOutboundSettings(client);
+            }
+            
+            if ( (in == null) || (out == null) ) {
+                addFormError("Internal error (pool settings cound not be fuond for " + poolName + ")");
+                index++;
+                continue;
+            }
+            
+            in.setLength(getInt(_settings.get(index + ".depthInbound")));
+            out.setLength(getInt(_settings.get(index + ".depthOutbound")));
+            in.setLengthVariance(getInt(_settings.get(index + ".varianceInbound")));
+            out.setLengthVariance(getInt(_settings.get(index + ".varianceOutbound")));
+            in.setQuantity(getInt(_settings.get(index + ".quantityInbound")));
+            out.setQuantity(getInt(_settings.get(index + ".quantityOutbound")));
+            in.setBackupQuantity(getInt(_settings.get(index + ".backupInbound")));
+            out.setBackupQuantity(getInt(_settings.get(index + ".backupOutbound")));
+            
+            if ("exploratory".equals(poolName)) {
+                _context.router().setConfigSetting(TunnelPoolSettings.PREFIX_INBOUND_EXPLORATORY + 
+                                                   TunnelPoolSettings.PROP_LENGTH, in.getLength()+"");
+                _context.router().setConfigSetting(TunnelPoolSettings.PREFIX_OUTBOUND_EXPLORATORY + 
+                                                   TunnelPoolSettings.PROP_LENGTH, out.getLength()+"");
+                _context.router().setConfigSetting(TunnelPoolSettings.PREFIX_INBOUND_EXPLORATORY + 
+                                                   TunnelPoolSettings.PROP_LENGTH_VARIANCE, in.getLengthVariance()+"");
+                _context.router().setConfigSetting(TunnelPoolSettings.PREFIX_OUTBOUND_EXPLORATORY + 
+                                                   TunnelPoolSettings.PROP_LENGTH_VARIANCE, out.getLengthVariance()+"");
+                _context.router().setConfigSetting(TunnelPoolSettings.PREFIX_INBOUND_EXPLORATORY + 
+                                                   TunnelPoolSettings.PROP_QUANTITY, in.getQuantity()+"");
+                _context.router().setConfigSetting(TunnelPoolSettings.PREFIX_OUTBOUND_EXPLORATORY + 
+                                                   TunnelPoolSettings.PROP_QUANTITY, out.getQuantity()+"");
+                _context.router().setConfigSetting(TunnelPoolSettings.PREFIX_INBOUND_EXPLORATORY + 
+                                                   TunnelPoolSettings.PROP_BACKUP_QUANTITY, in.getBackupQuantity()+"");
+                _context.router().setConfigSetting(TunnelPoolSettings.PREFIX_OUTBOUND_EXPLORATORY + 
+                                                   TunnelPoolSettings.PROP_BACKUP_QUANTITY, out.getBackupQuantity()+"");
+            }
+            
+            if ("exploratory".equals(poolName)) {
+                if (_log.shouldLog(Log.DEBUG)) {
+                    _log.debug("Inbound exploratory settings: " + in);
+                    _log.debug("Outbound exploratory settings: " + out);
+                }
+                _context.tunnelManager().setInboundSettings(in);
+                _context.tunnelManager().setOutboundSettings(out);
+            } else {
+                if (_log.shouldLog(Log.DEBUG)) {
+                    _log.debug("Inbound settings for " + client.toBase64() + ": " + in);
+                    _log.debug("Outbound settings for " + client.toBase64() + ": " + out);
+                }
+                _context.tunnelManager().setInboundSettings(client, in);
+                _context.tunnelManager().setOutboundSettings(client, out);
+            }
+            
+            updated++;
+            saveRequired = true;
+            index++;
+        }
+        
+        if (updated > 0)
+            addFormNotice("Updated settings for " + updated + " pools");
+        
+        if (saveRequired) {
+            boolean saved = _context.router().saveConfig();
+            if (saved) 
+                addFormNotice("Configuration saved successfully");
+            else
+                addFormNotice("Error saving the configuration (applied but not saved) - please see the error logs");
+        }
+    }
+    private static final int getInt(Object val) { 
+        if (val == null) return 0;
+        String str = null;
+        if (val instanceof String)
+            str = (String)val;
+        else 
+            str = ((String[])val)[0];
+            
+        if (str.trim().length() <= 0) return 0;
+        try { return Integer.parseInt(str); } catch (NumberFormatException nfe) { return 0; }
+    }
+}

apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java

@@ -0,0 +1,251 @@
+package net.i2p.router.web;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.List;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.Properties;
+import java.util.TreeMap;
+
+import net.i2p.util.Log;
+
+import net.i2p.data.Destination;
+import net.i2p.router.RouterContext;
+import net.i2p.router.TunnelPoolSettings;
+
+public class ConfigTunnelsHelper {
+    private RouterContext _context;
+    /**
+     * Configure this bean to query a particular router context
+     *
+     * @param contextId begging few characters of the routerHash, or null to pick
+     *                  the first one we come across.
+     */
+    public void setContextId(String contextId) {
+        try {
+            _context = ContextHelper.getContext(contextId);
+        } catch (Throwable t) {
+            t.printStackTrace();
+        }
+    }
+
+    public ConfigTunnelsHelper() {}
+    
+    
+    public String getForm() {
+        StringBuffer buf = new StringBuffer(1024);
+        buf.append("<table border=\"1\">\n");
+        TunnelPoolSettings exploratoryIn = _context.tunnelManager().getInboundSettings();
+        TunnelPoolSettings exploratoryOut = _context.tunnelManager().getOutboundSettings();
+        
+        buf.append("<input type=\"hidden\" name=\"pool.0\" value=\"exploratory\" >");
+        renderForm(buf, 0, "exploratory", "Exploratory tunnels", exploratoryIn, exploratoryOut);
+        
+        int cur = 1;
+        Set clients = _context.clientManager().listClients();
+        for (Iterator iter = clients.iterator(); iter.hasNext(); ) {
+            Destination dest = (Destination)iter.next();
+            TunnelPoolSettings in = _context.tunnelManager().getInboundSettings(dest.calculateHash());
+            TunnelPoolSettings out = _context.tunnelManager().getOutboundSettings(dest.calculateHash());
+            
+            String name = (in != null ? in.getDestinationNickname() : null);
+            if (name == null)
+                name = (out != null ? out.getDestinationNickname() : null);
+            if (name == null)
+                name = dest.calculateHash().toBase64().substring(0,6);
+        
+            String prefix = dest.calculateHash().toBase64().substring(0,4);
+            buf.append("<input type=\"hidden\" name=\"pool.").append(cur).append("\" value=\"");
+            buf.append(dest.calculateHash().toBase64()).append("\" >");    
+            renderForm(buf, cur, prefix, "Client tunnels for " + name, in, out);
+            cur++;
+        }
+        
+        buf.append("</table>\n");
+        return buf.toString();
+    }
+
+    private void renderForm(StringBuffer buf, int index, String prefix, String name, TunnelPoolSettings in, TunnelPoolSettings out) {
+
+        buf.append("<tr><td colspan=\"3\"><b><a name=\"").append(prefix).append("\">");
+        buf.append(name).append("</a></b></td></tr>\n");
+        buf.append("<tr><td></td><td><b>Inbound</b></td><td><b>Outbound</b></td></tr>\n");
+        
+        // tunnel depth
+        buf.append("<tr><td>Depth</td>\n");
+        buf.append("<td><select name=\"").append(index).append(".depthInbound\">\n");
+        buf.append("<option value=\"0\" ");
+        if (in.getLength() <= 0) buf.append(" selected=\"true\" ");
+        buf.append(">0 hops</option>\n");
+        buf.append("<option value=\"1\" ");
+        if (in.getLength() == 1) buf.append(" selected=\"true\" ");
+        buf.append(">1 hop</option>\n");
+        buf.append("<option value=\"2\" ");
+        if (in.getLength() == 2) buf.append(" selected=\"true\" ");
+        buf.append(">2 hops</option>\n");
+        buf.append("<option value=\"3\" ");
+        if (in.getLength() == 3) buf.append(" selected=\"true\" ");
+        buf.append(">3 hops</option>\n");
+        if (in.getLength() > 3)
+            buf.append("<option value=\"").append(in.getLength()).append("\">").append(in.getLength()).append(" hops</option>\n");
+        buf.append("</td>\n");
+
+        buf.append("<td><select name=\"").append(index).append(".depthOutbound\">\n");
+        buf.append("<option value=\"0\" ");
+        if (out.getLength() <= 0) buf.append(" selected=\"true\" ");
+        buf.append(">0 hops</option>\n");
+        buf.append("<option value=\"1\" ");
+        if (out.getLength() == 1) buf.append(" selected=\"true\" ");
+        buf.append(">1 hop</option>\n");
+        buf.append("<option value=\"2\" ");
+        if (out.getLength() == 2) buf.append(" selected=\"true\" ");
+        buf.append(">2 hops</option>\n");
+        buf.append("<option value=\"3\" ");
+        if (out.getLength() == 3) buf.append(" selected=\"true\" ");
+        buf.append(">3 hops</option>\n");
+        if (out.getLength() > 3)
+            buf.append("<option value=\"").append(out.getLength()).append("\">").append(out.getLength()).append(" hops</option>\n");
+        buf.append("</td>\n");
+        buf.append("</tr>\n");
+
+        // tunnel depth variance
+        buf.append("<tr><td>Variance</td>\n");
+        buf.append("<td><select name=\"").append(index).append(".varianceInbound\">\n");
+        buf.append("<option value=\"0\" ");
+        if (in.getLengthVariance() == 0) buf.append(" selected=\"true\" ");
+        buf.append(">0 hops</option>\n");
+        buf.append("<option value=\"-1\" ");
+        if (in.getLengthVariance() == -1) buf.append(" selected=\"true\" ");
+        buf.append(">+/- 0-1 hops</option>\n");
+        buf.append("<option value=\"-2\" ");
+        if (in.getLengthVariance() == -2) buf.append(" selected=\"true\" ");
+        buf.append(">+/- 0-2 hops</option>\n");
+        buf.append("<option value=\"1\" ");
+        if (in.getLengthVariance() == 1) buf.append(" selected=\"true\" ");
+        buf.append(">+ 0-1 hops</option>\n");
+        buf.append("<option value=\"2\" ");
+        if (in.getLengthVariance() == 2) buf.append(" selected=\"true\" ");
+        buf.append(">+ 0-2 hops</option>\n");
+        if (in.getLengthVariance() < -2)
+            buf.append("<option value=\"").append(in.getLengthVariance()).append("\">+/- 0-").append(in.getLengthVariance()).append(" hops</option>\n");
+        if (in.getLengthVariance() > 2)
+            buf.append("<option value=\"").append(in.getLengthVariance()).append("\">+ 0-").append(in.getLengthVariance()).append(" hops</option>\n");
+        buf.append("</td>\n");
+
+        buf.append("<td><select name=\"").append(index).append(".varianceOutbound\">\n");
+        buf.append("<option value=\"0\" ");
+        if (out.getLengthVariance() == 0) buf.append(" selected=\"true\" ");
+        buf.append(">0 hops</option>\n");
+        buf.append("<option value=\"-1\" ");
+        if (out.getLengthVariance() == -1) buf.append(" selected=\"true\" ");
+        buf.append(">+/- 0-1 hops</option>\n");
+        buf.append("<option value=\"-2\" ");
+        if (out.getLengthVariance() == -2) buf.append(" selected=\"true\" ");
+        buf.append(">+/- 0-2 hops</option>\n");
+        buf.append("<option value=\"1\" ");
+        if (out.getLengthVariance() == 1) buf.append(" selected=\"true\" ");
+        buf.append(">+ 0-1 hops</option>\n");
+        buf.append("<option value=\"2\" ");
+        if (out.getLengthVariance() == 2) buf.append(" selected=\"true\" ");
+        buf.append(">+ 0-2 hops</option>\n");
+        if (out.getLengthVariance() < -2)
+            buf.append("<option value=\"").append(out.getLengthVariance()).append("\">+/- 0-").append(out.getLengthVariance()).append(" hops</option>\n");
+        if (out.getLengthVariance() > 2)
+            buf.append("<option value=\"").append(out.getLengthVariance()).append("\">+ 0-").append(out.getLengthVariance()).append(" hops</option>\n");
+        buf.append("</td>\n");
+
+        // tunnel quantity
+        buf.append("<tr><td>Quantity</td>\n");
+        buf.append("<td><select name=\"").append(index).append(".quantityInbound\">\n");
+        buf.append("<option value=\"1\" ");
+        if (in.getQuantity() <= 1) buf.append(" selected=\"true\" ");
+        buf.append(">1 tunnel</option>\n");
+        buf.append("<option value=\"2\" ");
+        if (in.getQuantity() == 2) buf.append(" selected=\"true\" ");
+        buf.append(">2 tunnels</option>\n");
+        buf.append("<option value=\"3\" ");
+        if (in.getQuantity() == 3) buf.append(" selected=\"true\" ");
+        buf.append(">3 tunnels</option>\n");
+        if (in.getQuantity() > 3)
+            buf.append("<option value=\"").append(in.getQuantity()).append("\">").append(in.getQuantity()).append(" tunnels</option>\n");
+        buf.append("</td>\n");
+
+        buf.append("<td><select name=\"").append(index).append(".quantityOutbound\">\n");
+        buf.append("<option value=\"1\" ");
+        if (out.getQuantity() <= 1) buf.append(" selected=\"true\" ");
+        buf.append(">1 tunnel</option>\n");
+        buf.append("<option value=\"2\" ");
+        if (out.getQuantity() == 2) buf.append(" selected=\"true\" ");
+        buf.append(">2 tunnels</option>\n");
+        buf.append("<option value=\"3\" ");
+        if (out.getQuantity() == 3) buf.append(" selected=\"true\" ");
+        buf.append(">3 tunnels</option>\n");
+        if (out.getQuantity() > 3)
+            buf.append("<option value=\"").append(out.getQuantity()).append("\">").append(out.getQuantity()).append(" tunnels</option>\n");
+        buf.append("</td>\n");
+        buf.append("</tr>\n");
+
+        // tunnel backup quantity
+        buf.append("<tr><td>Backup quantity</td>\n");
+        buf.append("<td><select name=\"").append(index).append(".backupInbound\">\n");
+        buf.append("<option value=\"0\" ");
+        if (in.getBackupQuantity() <= 0) buf.append(" selected=\"true\" ");
+        buf.append(">0 tunnels</option>\n");
+        buf.append("<option value=\"1\" ");
+        if (in.getBackupQuantity() == 1) buf.append(" selected=\"true\" ");
+        buf.append(">1 tunnel</option>\n");
+        buf.append("<option value=\"2\" ");
+        if (in.getBackupQuantity() == 2) buf.append(" selected=\"true\" ");
+        buf.append(">2 tunnels</option>\n");
+        buf.append("<option value=\"3\" ");
+        if (in.getBackupQuantity() == 3) buf.append(" selected=\"true\" ");
+        buf.append(">3 tunnels</option>\n");
+        if (in.getBackupQuantity() > 3)
+            buf.append("<option value=\"").append(in.getBackupQuantity()).append("\">").append(in.getBackupQuantity()).append(" tunnels</option>\n");
+        buf.append("</td>\n");
+
+        buf.append("<td><select name=\"").append(index).append(".backupOutbound\">\n");
+        buf.append("<option value=\"0\" ");
+        if (out.getBackupQuantity() <= 0) buf.append(" selected=\"true\" ");
+        buf.append(">0 tunnel</option>\n");
+        buf.append("<option value=\"1\" ");
+        if (out.getBackupQuantity() == 1) buf.append(" selected=\"true\" ");
+        buf.append(">1 tunnel</option>\n");
+        buf.append("<option value=\"2\" ");
+        if (out.getBackupQuantity() == 2) buf.append(" selected=\"true\" ");
+        buf.append(">2 tunnels</option>\n");
+        buf.append("<option value=\"3\" ");
+        if (out.getBackupQuantity() == 3) buf.append(" selected=\"true\" ");
+        buf.append(">3 tunnels</option>\n");
+        if (out.getBackupQuantity() > 3)
+            buf.append("<option value=\"").append(out.getBackupQuantity()).append("\">").append(out.getBackupQuantity()).append(" tunnels</option>\n");
+        buf.append("</td>\n");
+        buf.append("</tr>\n");
+
+        // custom options
+        buf.append("<tr><td>Inbound options:</td>\n");
+        buf.append("<td colspan=\"2\"><input name=\"").append(index);
+        buf.append(".inboundOptions\" type=\"text\" size=\"40\" ");
+        buf.append("value=\"");
+        Properties props = in.getUnknownOptions();
+        for (Iterator iter = props.keySet().iterator(); iter.hasNext(); ) {
+            String prop = (String)iter.next();
+            String val = (String)props.getProperty(prop);
+            buf.append(prop).append("=").append(val).append(" ");
+        }
+        buf.append("\"/></td></tr>\n");
+        buf.append("<tr><td>Outbound options:</td>\n");
+        buf.append("<td colspan=\"2\"><input name=\"").append(index);
+        buf.append(".outboundOptions\" type=\"text\" size=\"40\" ");
+        buf.append("value=\"");
+        props = in.getUnknownOptions();
+        for (Iterator iter = props.keySet().iterator(); iter.hasNext(); ) {
+            String prop = (String)iter.next();
+            String val = (String)props.getProperty(prop);
+            buf.append(prop).append("=").append(val).append(" ");
+        }
+        buf.append("\"/></td></tr>\n");
+        buf.append("<tr><td colspan=\"3\"><hr /></td></tr>\n");
+    }
+}

apps/routerconsole/java/src/net/i2p/router/web/ReseedHandler.java

@@ -4,7 +4,9 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
+import java.io.OutputStream;
 
+import java.net.Socket;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.HashSet;
@@ -103,8 +105,17 @@ public class ReseedHandler {
     
     private static byte[] readURL(URL url) throws Exception {
         ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
-        URLConnection con = url.openConnection();
-        InputStream in = con.getInputStream();
+        String hostname = url.getHost();
+        int port = url.getPort();
+        if (port < 0)
+            port = 80;
+        Socket s = new Socket(hostname, port);
+        OutputStream out = s.getOutputStream();
+        InputStream in = s.getInputStream();
+        String request = getRequest(url);
+        System.out.println("Sending to " + hostname +":"+ port + ": " + request);
+        out.write(request.getBytes());
+        out.flush();
         byte buf[] = new byte[1024];
         while (true) {
             int read = in.read(buf);
@@ -113,9 +124,24 @@ public class ReseedHandler {
             baos.write(buf, 0, read);
         }
         in.close();
+        s.close();
         return baos.toByteArray();
     }
     
+    private static String getRequest(URL url) {
+        StringBuffer buf = new StringBuffer(512);
+        String path = url.getPath();
+        if ("".equals(path))
+            path = "/";
+        buf.append("GET ").append(path).append(" HTTP/1.0\n");
+        buf.append("Host: ").append(url.getHost());
+        int port = url.getPort();
+        if ( (port > 0) && (port != 80) )
+            buf.append(":").append(port);
+        buf.append("\nConnection: close\n\n");
+        return buf.toString();
+    }
+    
     private static void writeSeed(String name, byte data[]) throws Exception {
         String dirName = "netDb"; // _context.getProperty("router.networkDatabase.dbDir", "netDb");
         File netDbDir = new File(dirName);
@@ -126,4 +152,9 @@ public class ReseedHandler {
         fos.write(data);
         fos.close();
     }
+    
+    public static void main(String args[]) {
+        reseed();
+        System.out.println("Done reseeding");
+    }
 }

apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java

@@ -15,6 +15,7 @@ import org.mortbay.http.handler.SecurityHandler;
 import org.mortbay.http.HashUserRealm;
 import org.mortbay.http.HttpRequest;
 import org.mortbay.http.SecurityConstraint;
+import org.mortbay.http.Authenticator;
 import org.mortbay.util.MultiException;
 
 public class RouterConsoleRunner {
@@ -64,7 +65,7 @@ public class RouterConsoleRunner {
         }
         try {
             _server.start();
-        } catch (MultiException me) {
+        } catch (Exception me) {
             me.printStackTrace();
         }
         try {

apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java

@@ -4,13 +4,18 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.text.DecimalFormat;
+import java.util.Iterator;
+import java.util.Set;
 
 import net.i2p.data.DataHelper;
+import net.i2p.data.Destination;
+import net.i2p.data.LeaseSet;
 import net.i2p.stat.Rate;
 import net.i2p.stat.RateStat;
 import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
 import net.i2p.router.RouterVersion;
+import net.i2p.router.TunnelPoolSettings;
 
 /**
  * Simple helper to query the appropriate router for data necessary to render
@@ -333,16 +338,39 @@ public class SummaryHelper {
      * @return html section summary
      */
     public String getDestinations() {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
-        try {
-            OutputStreamWriter osw = new OutputStreamWriter(baos);
-            _context.clientManager().renderStatusHTML(osw);
-            osw.flush();
-            return new String(baos.toByteArray());
-        } catch (IOException ioe) {
-            _context.logManager().getLog(SummaryHelper.class).error("Error rendering client info", ioe);
-            return "";
+        Set clients = _context.clientManager().listClients();
+        
+        StringBuffer buf = new StringBuffer(512);
+        buf.append("<u><b>Local destinations</b></u><br />");
+        
+        for (Iterator iter = clients.iterator(); iter.hasNext(); ) {
+            Destination client = (Destination)iter.next();
+            TunnelPoolSettings in = _context.tunnelManager().getInboundSettings(client.calculateHash());
+            TunnelPoolSettings out = _context.tunnelManager().getOutboundSettings(client.calculateHash());
+            String name = (in != null ? in.getDestinationNickname() : null);
+            if (name == null)
+                name = (out != null ? out.getDestinationNickname() : null);
+            if (name == null)
+                name = client.calculateHash().toBase64().substring(0,6);
+            
+            buf.append("<b>*</b> ").append(name).append("<br />\n");
+            LeaseSet ls = _context.netDb().lookupLeaseSetLocally(client.calculateHash());
+            if (ls != null) {
+                long timeToExpire = ls.getEarliestLeaseDate() - _context.clock().now();
+                if (timeToExpire < 0) {
+                    buf.append("<i>expired ").append(DataHelper.formatDuration(0-timeToExpire));
+                    buf.append(" ago</i><br />\n");
+                }
+            } else {
+                buf.append("<i>No leases</i><br />\n");
+            }
+            buf.append("<a href=\"tunnels.jsp#").append(client.calculateHash().toBase64().substring(0,4));
+            buf.append("\">Details</a> ");
+            buf.append("<a href=\"configtunnels.jsp#").append(client.calculateHash().toBase64().substring(0,4));
+            buf.append("\">Config</a><br />\n");
         }
+        buf.append("<hr />\n");
+        return buf.toString();
     }
     
     /**

apps/routerconsole/java/src/net/i2p/router/web/TunnelHelper.java

@@ -0,0 +1,46 @@
+package net.i2p.router.web;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+
+import net.i2p.router.RouterContext;
+
+public class TunnelHelper {
+    private RouterContext _context;
+    private Writer _out;
+    /**
+     * Configure this bean to query a particular router context
+     *
+     * @param contextId begging few characters of the routerHash, or null to pick
+     *                  the first one we come across.
+     */
+    public void setContextId(String contextId) {
+        try {
+            _context = ContextHelper.getContext(contextId);
+        } catch (Throwable t) {
+            t.printStackTrace();
+        }
+    }
+    
+    public TunnelHelper() {}
+    
+    public void setWriter(Writer writer) { _out = writer; }
+    
+    public String getTunnelSummary() {
+        try {
+            if (_out != null) {
+                _context.tunnelManager().renderStatusHTML(_out);
+                return "";
+            } else {
+                ByteArrayOutputStream baos = new ByteArrayOutputStream(32*1024);
+                _context.tunnelManager().renderStatusHTML(new OutputStreamWriter(baos));
+                return new String(baos.toByteArray());
+            }
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+            return "";
+        }
+    }
+}

apps/routerconsole/jsp/config.jsp

@@ -39,14 +39,17 @@
  
  <b>Bandwidth limiter</b><br />
  Inbound rate: 
-    <input name="inboundrate" type="text" size="2" value="<jsp:getProperty name="nethelper" property="inboundRate" />" /> KBytes per second<br />
- Inbound burst duration:
+    <input name="inboundrate" type="text" size="2" value="<jsp:getProperty name="nethelper" property="inboundRate" />" /> KBytes per second
+ bursting up to 
     <jsp:getProperty name="nethelper" property="inboundBurstFactorBox" /><br />
  Outbound rate:
-    <input name="outboundrate" type="text" size="2" value="<jsp:getProperty name="nethelper" property="outboundRate" />" /> KBytes per second<br />
- Outbound burst duration:
+    <input name="outboundrate" type="text" size="2" value="<jsp:getProperty name="nethelper" property="outboundRate" />" /> KBytes per second
+ bursting up to 
   <jsp:getProperty name="nethelper" property="outboundBurstFactorBox" /><br />
  <i>A negative rate means there is no limit</i><br />
+ Bandwidth share percentage:
+   <jsp:getProperty name="nethelper" property="sharePercentageBox" /><br />
+ Sharing a higher percentage will improve your anonymity and help the network
  <hr />
  Enable internal time synchronization? <input type="checkbox" <jsp:getProperty name="nethelper" property="enableTimeSyncChecked" /> name="enabletimesync" /><br />
  <i>If disabled, your machine <b>must</b> be NTP synchronized - your clock must always
@@ -61,17 +64,7 @@
  <hr />
  <b>Advanced network config:</b>
  <p>
- There are two other network settings, but no one reads this text so there's no reason
- to tell you about them.  In case you actually do read this, here's the deal: by default,
- I2P will attempt to guess your IP address by having whomever it talks to tell it what 
- address they think you are.  If and only if you have no working TCP connections and you
- have not overridden the IP address, your router will believe them.  If that doesn't sound
- ok to you, thats fine - go to the <a href="configadvanced.jsp">advanced config</a> page
- and add "i2np.tcp.hostname=yourHostname", then go to the 
- <a href="configservice.jsp">service</a> page and do a graceful restart.  We used to make
- people enter a hostname/IP address on this page, but too many people got it wrong ;)</p>
- 
- <p>The other advanced network option has to do with reseeding - you should never need to 
+ One advanced network option has to do with reseeding - you should never need to 
  reseed your router as long as you can find at least one other peer on the network.  However,
  when you do need to reseed, a link will show up on the left hand side which will
  fetch all of the routerInfo-* files from http://dev.i2p.net/i2pdb/.  That URL is just an

apps/routerconsole/jsp/configclients.jsp

@@ -1,45 +0,0 @@
-<%@page contentType="text/html"%>
-<%@page pageEncoding="UTF-8"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html><head>
-<title>I2P Router Console - config clients</title>
-<link rel="stylesheet" href="default.css" type="text/css" />
-</head><body>
-
-<%@include file="nav.jsp" %>
-<%@include file="summary.jsp" %>
-
-<jsp:useBean class="net.i2p.router.web.ConfigClientsHelper" id="clientshelper" scope="request" />
-<jsp:setProperty name="clientshelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
-
-<div class="main" id="main">
- <%@include file="confignav.jsp" %>
-  
- <jsp:useBean class="net.i2p.router.web.ConfigClientsHandler" id="formhandler" scope="request" />
- <jsp:setProperty name="formhandler" property="*" />
- <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
- <font color="red"><jsp:getProperty name="formhandler" property="errors" /></font>
- <i><jsp:getProperty name="formhandler" property="notices" /></i>
- 
- <form action="configclients.jsp" method="POST">
- <% String prev = System.getProperty("net.i2p.router.web.ConfigClientsHandler.nonce");
-    if (prev != null) System.setProperty("net.i2p.router.web.ConfigClientsHandler.noncePrev", prev);
-    System.setProperty("net.i2p.router.web.ConfigClientsHandler.nonce", new java.util.Random().nextLong()+""); %>
- <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigClientsHandler.nonce")%>" />
- <input type="hidden" name="action" value="blah" />
- <b>Estimated number of clients/destinations:</b> 
-    <jsp:getProperty name="clientshelper" property="clientCountSelectBox" /><br />
- <b>Default number of inbound tunnels per client:</b>
-    <jsp:getProperty name="clientshelper" property="tunnelCountSelectBox" /><br />
- <b>Default number of hops per tunnel:</b>
-    <jsp:getProperty name="clientshelper" property="tunnelDepthSelectBox" /><br />
- <b>Hops per outbound tunnel:</b>
-    <jsp:getProperty name="clientshelper" property="tunnelDepthOutboundSelectBox" /><br />
- <hr />
- <input type="submit" name="shouldsave" value="Save changes" /> <input type="reset" value="Cancel" />
- </form>
-</div>
-
-</body>
-</html>

apps/routerconsole/jsp/confignav.jsp

@@ -2,8 +2,8 @@
  %>Network | <% } else { %><a href="config.jsp">Network</a> | <% }
  if (request.getRequestURI().indexOf("configservice.jsp") != -1) {
  %>Service | <% } else { %><a href="configservice.jsp">Service</a> | <% }
- if (request.getRequestURI().indexOf("configclients.jsp") != -1) {
- %>Clients | <% } else { %><a href="configclients.jsp">Clients</a> | <% }
+ if (request.getRequestURI().indexOf("configtunnels.jsp") != -1) {
+ %>Tunnels | <% } else { %><a href="configtunnels.jsp">Tunnels</a> | <% }
  if (request.getRequestURI().indexOf("configlogging.jsp") != -1) {
  %>Logging | <% } else { %><a href="configlogging.jsp">Logging</a> | <% }
  if (request.getRequestURI().indexOf("configadvanced.jsp") != -1) {

apps/routerconsole/jsp/configtunnels.jsp

@@ -0,0 +1,41 @@
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html><head>
+<title>I2P Router Console - config tunnels</title>
+<link rel="stylesheet" href="default.css" type="text/css" />
+</head><body>
+
+<%@include file="nav.jsp" %>
+<%@include file="summary.jsp" %>
+
+<jsp:useBean class="net.i2p.router.web.ConfigTunnelsHelper" id="tunnelshelper" scope="request" />
+<jsp:setProperty name="tunnelshelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
+
+<div class="main" id="main">
+ <%@include file="confignav.jsp" %>
+  
+ <jsp:useBean class="net.i2p.router.web.ConfigTunnelsHandler" id="formhandler" scope="request" />
+ <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
+ <jsp:setProperty name="formhandler" property="shouldsave" value="<%=request.getParameter("shouldsave")%>" />
+ <jsp:setProperty name="formhandler" property="action" value="<%=request.getParameter("action")%>" />
+ <jsp:setProperty name="formhandler" property="nonce" value="<%=request.getParameter("nonce")%>" />
+ <jsp:setProperty name="formhandler" property="settings" value="<%=request.getParameterMap()%>" />
+ <font color="red"><jsp:getProperty name="formhandler" property="errors" /></font>
+ <i><jsp:getProperty name="formhandler" property="notices" /></i>
+ 
+ <form action="configtunnels.jsp" method="POST">
+ <% String prev = System.getProperty("net.i2p.router.web.ConfigTunnelsHandler.nonce");
+    if (prev != null) System.setProperty("net.i2p.router.web.ConfigTunnelsHandler.noncePrev", prev);
+    System.setProperty("net.i2p.router.web.ConfigTunnelsHandler.nonce", new java.util.Random().nextLong()+""); %>
+ <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigTunnelsHandler.nonce")%>" />
+ <input type="hidden" name="action" value="blah" />
+ <jsp:getProperty name="tunnelshelper" property="form" />
+ <hr />
+ <input type="submit" name="shouldsave" value="Save changes" /> <input type="reset" value="Cancel" />
+ </form>
+</div>
+
+</body>
+</html>

apps/routerconsole/jsp/nav.jsp

@@ -15,6 +15,7 @@
 </div>
 
 <h4>
+ <a href="tunnels.jsp">Tunnels</a> |
  <a href="profiles.jsp">Profiles</a> |
  <a href="netdb.jsp">Network Database</a> |
  <a href="logs.jsp">Logs</a> |

apps/routerconsole/jsp/tunnels.jsp

@@ -0,0 +1,21 @@
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html><head>
+<title>I2P Router Console - tunnel summary</title>
+<link rel="stylesheet" href="default.css" type="text/css" />
+</head><body>
+
+<%@include file="nav.jsp" %>
+<%@include file="summary.jsp" %>
+
+<div class="main" id="main">
+ <jsp:useBean class="net.i2p.router.web.TunnelHelper" id="tunnelHelper" scope="request" />
+ <jsp:setProperty name="tunnelHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
+ <jsp:setProperty name="tunnelHelper" property="writer" value="<%=out%>" />
+ <jsp:getProperty name="tunnelHelper" property="tunnelSummary" />
+</div>
+
+</body>
+</html>

apps/sam/csharp/README

@@ -0,0 +1,84 @@
+sam-sharp
+
+
+DESCRIPTION
+
+  sam-sharp is a .NET SAM client library for I2P written in C#. It aims to be
+  compatible with platforms that implement .NET's base class library API (such
+  as Mono and DotGNU Portable.NET) and to be usable from all languages
+  conforming to the ECMA-standardized Common Language Infrastructure, including
+  C# and VB.NET.
+
+
+MINIMUM REQUIREMENTS
+
+  * Mono and mcs 1.0 or higher (Linux, Mac OS X, Windows)
+
+         - or -
+
+    MS .NET Framework SDK 1.0 or higher (Windows)
+
+         - or -
+
+    DotGNU Portable .NET, latest version recommended (*BSD, AIX, Cygwin, Linux,
+    Mac OS X, MinGW, Solaris)
+
+
+OPTIONAL REQUIREMENTS
+
+  * NAnt 0.85 or higher is needed to use sam-sharp.build. Sorry, NAnt does not
+    yet support Portable.NET.
+
+  * NUnit 2.2.1 or later is needed to run the (soon-to-be-added) unit tests. If
+    you have the Mono mcs package installed then you already have NUnit.
+
+
+DOCUMENTATION
+
+  Pre-generated docs will be submitted to CVS soon. In the meantime you may
+  generate standalone documentation from the embedded XML doc comments by
+  issuing the following commands from sam-sharp's src/ directory:
+
+    Mono:
+
+      mkdir ../doc
+      mcs -doc:../doc/sam-sharp_doc.xml *.cs
+
+    MS .NET:
+
+      mkdir ../doc
+      csc /doc:../doc/sam-sharp_doc.xml *.cs
+
+    DotGNU Portable.NET:
+
+      mkdir ../doc
+      csdoc -o ../doc/sam-sharp_doc.xml *.cs
+
+  The resulting XML doc can be converted to HTML using either Visual Studio .NET
+  (Tools > Build Comment Web Pages) or Portable.NET's csdoc2html tool:
+
+    csdoc2html -o ../doc ../doc/sam-sharp_doc.xml
+
+
+ACKNOWLEDGMENTS
+
+  sam-sharp is a port of jrandom's public domain Java SAM client library.
+
+
+LICENSE
+
+  This work is released into the public domain.
+
+
+AUTHORS
+
+  jrandom (original Java SAM client library)
+  smeghead (C# port of the Java SAM client library)
+
+
+MAINTAINERS
+
+  smeghead <smeghead@i2pmail.org> <smeghead@mail.i2p>
+
+
+$Id: README,v 1.1 2005/01/24 17:42:05 smeghead Exp $

apps/sam/csharp/sam-sharp.build

@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<project basedir="." default="bin" name="sam-sharp">
+
+	<target name="bin" description="Builds assemblies from source">
+		<mkdir dir="bin" />
+		<csc target="dll" output="bin/sam-sharp.dll">
+			<sources>
+				<include name="src/**/*.cs" />
+			</sources>
+		</csc>
+		<echo message="Build complete." />
+	</target>
+
+	<target name="clean" description="Deletes all built assemblies">
+		<delete dir="bin" failonerror="false" />
+		<echo message="Clean complete." />
+	</target>
+
+</project>

apps/sam/csharp/src/I2P.SAM.Client/AssemblyInfo.cs

@@ -0,0 +1,32 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly: AssemblyTitle("sam-sharp")]
+[assembly: AssemblyDescription("Mono/.NET SAM client for I2P")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("sam-sharp")]
+[assembly: AssemblyCopyright("Released into the Public Domain")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all values by your own or you can build default build and revision
+// numbers with the '*' character (the default):
+
+[assembly: AssemblyVersion("0.1")]
+
+// The following attributes specify the key for the sign of your assembly. See the
+// .NET Framework documentation for more information about signing.
+// This is not required, if you don't want signing let these attributes like they're.
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]

apps/sam/csharp/src/I2P.SAM.Client/SamBaseEventHandler.cs

@@ -0,0 +1,160 @@
+using System;
+using System.Collections.Specialized;
+using System.Threading;
+
+namespace I2P.SAM.Client
+{
+	/// <summary>
+	///   Optional base class providing basic SAM event handling and helper
+	///   methods.
+	/// </summary>
+	public class SamBaseEventHandler
+	{
+		private object              _helloLock         = new Object();
+		private string              _helloOk;
+		private NameValueCollection _namingReplies     = new NameValueCollection();
+		private object              _namingReplyLock   = new Object();
+		private SamReader           _samReader;
+		private object              _sessionCreateLock = new Object();
+		private string              _sessionCreateOk;
+
+		/// <summary>
+		///   Creates a new <c>SamBaseEventHandler</c> instance and registers
+		///   overridable handler methods for all events generated by the given
+		///   <see cref="SamReader">SamReader</see>.
+		/// </summary>
+		public SamBaseEventHandler(SamReader samReader) {
+			_samReader = samReader;
+			_samReader.DestReplyReceived       += new DestReplyReceivedHandler(OnDestReplyReceived);
+			_samReader.HelloReplyReceived      += new HelloReplyReceivedHandler(OnHelloReplyReceived);
+			_samReader.NamingReplyReceived     += new NamingReplyReceivedHandler(OnNamingReplyReceived);
+			_samReader.SessionStatusReceived   += new SessionStatusReceivedHandler(OnSessionStatusReceived);
+			_samReader.StreamClosedReceived    += new StreamClosedReceivedHandler(OnStreamClosedReceived);
+			_samReader.StreamConnectedReceived += new StreamConnectedReceivedHandler(OnStreamConnectedReceived);
+			_samReader.StreamDataReceived      += new StreamDataReceivedHandler(OnStreamDataReceived);
+			_samReader.StreamStatusReceived    += new StreamStatusReceivedHandler(OnStreamStatusReceived);
+			_samReader.UnknownMessageReceived  += new UnknownMessageReceivedHandler(OnUnknownMessageReceived);
+		}
+
+		public virtual void OnDestReplyReceived(string publicKey, string privateKey) {
+		}
+
+		public virtual void OnHelloReplyReceived(bool ok) {
+			lock (_helloLock) {
+				if (ok)
+					_helloOk = Boolean.TrueString;
+				else
+					_helloOk = Boolean.FalseString;
+
+				Monitor.PulseAll(_helloLock);
+			}
+		}
+
+		public virtual void OnNamingReplyReceived(string name, string result, string valueString, string message) {
+			lock (_namingReplyLock) {
+				if (result.Equals(SamBridgeMessages.NAMING_REPLY_OK))
+					_namingReplies.Add(name, valueString);
+				else
+					_namingReplies.Add(name, result);
+
+				Monitor.PulseAll(_namingReplyLock);
+			}
+		}
+
+		public virtual void OnSessionStatusReceived(string result, string destination, string message) {
+			lock (_sessionCreateLock) {
+				if (result.Equals(SamBridgeMessages.SESSION_STATUS_OK))
+					_sessionCreateOk = Boolean.TrueString;
+				else
+					_sessionCreateOk = Boolean.FalseString;
+
+				Monitor.PulseAll(_sessionCreateLock);
+			}
+		}
+
+		public virtual void OnStreamClosedReceived(string result, int id, string message) {
+		}
+
+		public virtual void OnStreamConnectedReceived(string remoteDestination, int id) {
+		}
+
+		public virtual void OnStreamDataReceived(int id, byte[] data, int offset, int length) {
+		}
+
+		public virtual void OnStreamStatusReceived(string result, int id, string message) {
+		}
+
+	    public virtual void OnUnknownMessageReceived(string major, string minor, NameValueCollection parameters) {
+			Console.WriteLine("wrt, [" + major + "] [" + minor + "] [" + parameters + "]");
+	    }
+	    
+	// Helper methods below.
+
+		/// <summary>
+		///   Waits for a SAM connection to be established.
+		/// </summary>
+		/// <remarks>
+		///   This method blocks until the connection is established.
+		/// </remarks>
+		/// <returns><c>true</c> if the handshake was successful.</returns>
+		public virtual bool WaitForHelloReply() {
+			while (true) {
+				lock (_helloLock) {
+					if (_helloOk == null)
+						Monitor.Wait(_helloLock);
+					else
+						return Boolean.Parse(_helloOk);
+				}
+			}
+		}
+
+		/// <summary>
+		///   Waits for a SAM naming reply message.
+		/// </summary>
+		/// <remarks>
+		///   This method blocks until all naming replies are received.
+		/// </remarks>
+		/// <param name="name">The name to be looked for, or <c>ME</c>.</param>
+		/// <returns>The matching destination for <c>name</c>, or <c>null</c> if
+		///   the key was not able to be retrieved.</returns>
+		public virtual string WaitForNamingReply(string name) {
+			while (true) {
+				lock (_namingReplyLock) {
+					try {
+						string valueString = _namingReplies[name];
+						_namingReplies.Remove(name);
+
+						if (valueString.Equals(SamBridgeMessages.NAMING_REPLY_INVALID_KEY))
+							return null;
+						else if (valueString.Equals(SamBridgeMessages.NAMING_REPLY_KEY_NOT_FOUND))
+							return null;
+						else
+							return valueString;
+
+					} catch (ArgumentNullException ane) {
+						Monitor.Wait(_namingReplyLock);
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		///   Waits for a SAM session to be created.
+		/// </summary>
+		/// <remarks>
+		///   This method blocks until a SAM session is created.
+		/// </remarks>
+		/// <returns><c>true</c> if the SAM session was created successfully.
+		//  </returns>
+		public virtual bool WaitForSessionCreateReply() {
+			while (true) {
+				lock (_sessionCreateLock) {
+					if (_sessionCreateOk == null)
+						Monitor.Wait(_sessionCreateLock);
+					else
+						return Boolean.Parse(_sessionCreateOk);
+				}
+			}
+		}
+	}
+}

apps/sam/csharp/src/I2P.SAM.Client/SamBridgeMessages.cs

@@ -0,0 +1,26 @@
+namespace I2P.SAM.Client
+{
+	public struct SamBridgeMessages
+	{
+		public const string NAMING_REPLY_INVALID_KEY      = "INVALID_KEY";
+		public const string NAMING_REPLY_KEY_NOT_FOUND    = "KEY_NOT_FOUND";
+		public const string NAMING_REPLY_OK               = "OK";
+
+		public const string SESSION_STATUS_DUPLICATE_DEST = "DUPLICATE_DEST";
+		public const string SESSION_STATUS_I2P_ERROR      = "I2P_ERROR";
+		public const string SESSION_STATUS_INVALID_KEY    = "INVALID_KEY";
+		public const string SESSION_STATUS_OK             = "OK";
+
+		public const string STREAM_CLOSED_CANT_REACH_PEER = "CANT_REACH_PEER";
+		public const string STREAM_CLOSED_I2P_ERROR       = "I2P_ERROR";
+		public const string STREAM_CLOSED_PEER_NOT_FOUND  = "PEER_NOT_FOUND";
+		public const string STREAM_CLOSED_TIMEOUT         = "CLOSED";
+		public const string STREAM_CLOSED_OK              = "OK";
+
+		public const string STREAM_STATUS_CANT_REACH_PEER = "CANT_REACH_PEER";
+		public const string STREAM_STATUS_I2P_ERROR       = "I2P_ERROR";
+		public const string STREAM_STATUS_INVALID_KEY     = "INVALID_KEY";
+		public const string STREAM_STATUS_TIMEOUT         = "TIMEOUT";
+		public const string STREAM_STATUS_OK              = "OK";
+	}
+}

apps/sam/csharp/src/I2P.SAM.Client/SamReader.cs

@@ -0,0 +1,278 @@
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.IO;
+using System.Net.Sockets;
+using System.Text;
+using System.Threading;
+
+namespace I2P.SAM.Client
+{
+	public delegate void DestReplyReceivedHandler(string publicKey, string privateKey);
+	public delegate void HelloReplyReceivedHandler(bool ok);
+	public delegate void NamingReplyReceivedHandler(string name, string result, string valueString, string message);
+	public delegate void SessionStatusReceivedHandler(string result, string destination, string message);
+	public delegate void StreamClosedReceivedHandler(string result, int id, string message);
+	public delegate void StreamConnectedReceivedHandler(string remoteDestination, int id);
+	public delegate void StreamDataReceivedHandler(int id, byte[] data, int offset, int length);
+	public delegate void StreamStatusReceivedHandler(string result, int id, string message);
+	public delegate void UnknownMessageReceivedHandler(string major, string minor, NameValueCollection parameters);
+
+	/// <summary>
+	///   Reads from a socket stream, producing events for any SAM message read.
+	/// </summary>
+	public class SamReader
+	{
+		public event DestReplyReceivedHandler       DestReplyReceived;
+		public event HelloReplyReceivedHandler      HelloReplyReceived;
+		public event NamingReplyReceivedHandler     NamingReplyReceived;
+		public event SessionStatusReceivedHandler   SessionStatusReceived;
+		public event StreamClosedReceivedHandler    StreamClosedReceived;
+		public event StreamConnectedReceivedHandler StreamConnectedReceived;
+		public event StreamDataReceivedHandler      StreamDataReceived;
+		public event StreamStatusReceivedHandler    StreamStatusReceived;
+		public event UnknownMessageReceivedHandler  UnknownMessageReceived;
+
+		private bool          _isLive;
+		private NetworkStream _samStream;
+		private StreamReader  _samStreamReader;
+
+		public SamReader(NetworkStream samStream) {
+			_samStream = samStream;
+		}
+
+		public void RunThread() {
+
+			NameValueCollection parameters = new NameValueCollection();
+
+			while (_isLive) {
+
+				string line = null;
+
+				_samStreamReader = new StreamReader(_samStream);
+
+				try {
+					line = _samStreamReader.ReadLine();
+					_samStreamReader.Close();
+				} catch (IOException ioe) {
+					Console.Error.WriteLine("Error reading from SAM: {1}", ioe);
+				} catch (OutOfMemoryException oome) {
+					Console.Error.WriteLine("Out of memory while reading from SAM: {1}", oome);
+					return;
+				}
+
+				if (line == null) {
+					break;
+				}
+
+				string[] tokens = line.Split(new char[1] { ' ' });
+
+				if (tokens.Length < 2) {
+					Console.Error.WriteLine("Invalid SAM line: [" + line + "]");
+					_isLive = false;
+					return;
+				}
+
+				IEnumerator tokensEnumerator = tokens.GetEnumerator();
+				tokensEnumerator.MoveNext();
+				string major = (string) tokensEnumerator.Current;
+				tokensEnumerator.MoveNext();
+				string minor = (string) tokensEnumerator.Current;
+
+				parameters.Clear();
+
+				while (tokensEnumerator.MoveNext()) {
+
+					string pair = (string) tokensEnumerator.Current;
+					int equalsPosition = pair.IndexOf('=');
+
+					if ( (equalsPosition > 0) && (equalsPosition < pair.Length - 1) ) {
+
+						string name = pair.Substring(0, equalsPosition);
+						string valueString = pair.Substring(equalsPosition + 1);
+
+						while ( (valueString[0] == '\"') && (valueString.Length > 0) )
+							valueString = valueString.Substring(1);
+
+						while ( (valueString.Length > 0) && (valueString[valueString.Length - 1] == '\"') )
+							valueString = valueString.Substring(0, valueString.Length - 1);
+
+						parameters.Set(name, valueString);
+					}
+				}
+
+				ProcessEvent(major, minor, parameters);
+			}
+		}
+
+		private void ProcessEvent(string major, string minor, NameValueCollection parameters) {
+
+			switch (major)
+			{
+				case "HELLO" :
+
+					if (minor.Equals("REPLY")) {
+
+						string result = parameters.Get("RESULT");
+
+						if (result.Equals("OK"))
+							HelloReplyReceived(true);
+						else
+							HelloReplyReceived(false);
+					} else {
+						UnknownMessageReceived(major, minor, parameters);
+					}
+
+					break;
+
+				case "SESSION" :
+
+					if (minor.Equals("STATUS")) {
+
+						string result = parameters.Get("RESULT");
+						string destination = parameters.Get("DESTINATION");
+						string message = parameters.Get("MESSAGE");
+
+						SessionStatusReceived(result, destination, message);
+					} else {
+						UnknownMessageReceived(major, minor, parameters);
+					}
+
+					break;
+
+				case "STREAM" :
+
+					ProcessStream(major, minor, parameters);
+					break;
+
+				case "NAMING" :
+
+					if (minor.Equals("REPLY")) {
+
+						string name = parameters.Get("NAME");
+						string result = parameters.Get("RESULT");
+						string valueString = parameters.Get("VALUE");
+						string message = parameters.Get("MESSAGE");
+
+						NamingReplyReceived(name, result, valueString, message);
+					} else {
+						UnknownMessageReceived(major, minor, parameters);
+					}
+
+					break;
+
+				case "DEST" :
+
+					if (minor.Equals("REPLY")) {
+
+						string pub = parameters.Get("PUB");
+						string priv = parameters.Get("PRIV");
+
+						DestReplyReceived(pub, priv);
+					} else {
+						UnknownMessageReceived(major, minor, parameters);
+					}
+
+					break;
+
+				default :
+
+					UnknownMessageReceived(major, minor, parameters);
+					break;
+			}
+		}
+
+		private void ProcessStream(string major, string minor, NameValueCollection parameters) {
+
+			/*
+			 * Would use another tidy switch() statement here but the Mono
+			 * compiler presently gets variable scopes confused within nested
+			 * switch() contexts. Nested switch() is broken with Mono/mcs 1.0.5,
+			 * 1.1.3, and SVN head.
+			 */
+			if (minor.Equals("STATUS")) {
+
+				string result = parameters.Get("RESULT");
+				string id = parameters.Get("ID");
+				string message = parameters.Get("MESSAGE");
+
+				try {
+					StreamStatusReceived(result, Int32.Parse(id), message);
+				} catch {
+					UnknownMessageReceived(major, minor, parameters);
+				}
+
+			} else if (minor.Equals("CONNECTED")) {
+
+				string destination = parameters.Get("DESTINATION");
+				string id = parameters.Get("ID");
+
+				try {
+					StreamConnectedReceived(destination, Int32.Parse(id));
+				} catch {
+					UnknownMessageReceived(major, minor, parameters);
+				}
+
+			} else if (minor.Equals("CLOSED")) {
+
+				string result = parameters.Get("RESULT");
+				string id = parameters.Get("ID");
+				string message = parameters.Get("MESSAGE");
+
+				try {
+					StreamClosedReceived(result, Int32.Parse(id), message);
+				} catch {
+					UnknownMessageReceived(major, minor, parameters);
+				}
+
+			} else if (minor.Equals("RECEIVED")) {
+
+				string id = parameters.Get("ID");
+				string size = parameters.Get("SIZE");
+
+				if (id != null) {
+					try {
+
+						int idValue = Int32.Parse(id);
+						int sizeValue = Int32.Parse(size);
+						byte[] data = new byte[sizeValue];
+						int bytesRead;
+
+						try {
+							bytesRead = _samStream.Read(data, 0, sizeValue);
+
+							if (bytesRead != sizeValue) {
+								UnknownMessageReceived(major, minor, parameters);
+								return;
+							}
+						} catch {
+							_isLive = false;
+							UnknownMessageReceived(major, minor, parameters);
+							return;
+						}
+
+						StreamDataReceived(idValue, data, 0, sizeValue);
+					} catch (FormatException fe) {
+						UnknownMessageReceived(major, minor, parameters);
+					}
+				} else {
+					UnknownMessageReceived(major, minor, parameters);
+				}
+			} else {
+				UnknownMessageReceived(major, minor, parameters);
+			}
+		}
+
+		public void StartReading() {
+			_isLive = true;
+			ThreadStart threadStart = new ThreadStart(RunThread);
+			Thread thread = new Thread(threadStart);
+			thread.Name = "SAM Reader";
+			thread.Start();
+		}
+
+		public void StopReading() {
+			_isLive = false;
+		}
+	}
+}

apps/sam/csharp/src/SAM.NET/SAM.NET.Test/AssemblyInfo.cs

@@ -1,58 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-//
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-//
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]		
-
-//
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-
-[assembly: AssemblyVersion("1.0.*")]
-
-//
-// In order to sign your assembly you must specify a key to use. Refer to the 
-// Microsoft .NET Framework documentation for more information on assembly signing.
-//
-// Use the attributes below to control which key is used for signing. 
-//
-// Notes: 
-//   (*) If no key is specified, the assembly is not signed.
-//   (*) KeyName refers to a key that has been installed in the Crypto Service
-//       Provider (CSP) on your machine. KeyFile refers to a file which contains
-//       a key.
-//   (*) If the KeyFile and the KeyName values are both specified, the 
-//       following processing occurs:
-//       (1) If the KeyName can be found in the CSP, that key is used.
-//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
-//           in the KeyFile is installed into the CSP and used.
-//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
-//       When specifying the KeyFile, the location of the KeyFile should be
-//       relative to the project output directory which is
-//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
-//       located in the project directory, you would specify the AssemblyKeyFile 
-//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
-//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
-//       documentation for more information on this.
-//
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
-[assembly: AssemblyKeyName("")]

apps/sam/csharp/src/SAM.NET/SAM.NET.Test/SAM.NET.Test.cs

@@ -1,50 +0,0 @@
-using System;
-using System.Net;
-using System.Threading;
-using System.Text;
-using System.Collections;
-
-namespace SAM.NET
-{
-	class SAMTester
-	{
-		[STAThread]
-		static void Main(string[] args)
-		{
-			new SAMTester();
-		}
-		public SAMTester () 
-		{
-			SAMConnection connection1 = new SAMConnection(IPAddress.Parse("127.0.0.1"),7656);
-			SAMSession session1 = new SAMSession(connection1,SAM.NET.SamSocketType.Stream,"alice");
-
-			SAMConnection connection2 = new SAMConnection(IPAddress.Parse("127.0.0.1"),7656);
-			SAMSession session2 = new SAMSession(connection2,SAM.NET.SamSocketType.Stream,"bob");
-
-			SAMStream stream1 = new SAMStream(connection1,session1,233);
-			stream1.Connect(session2.getKey());
-
-			//Wait till we are connected to destination
-			while (!stream1.isConnected) 
-				Thread.Sleep(1000);
-			
-			//Send some bytes
-			stream1.Write(Encoding.ASCII.GetBytes(DateTime.Now.ToLongTimeString() + "Hi!!!!!!"));
-
-			//Wait till a stream magically appears on the other side 
-			while (session2.getStreams().Count == 0) Thread.Sleep(1000);
-
-			Thread.Sleep(1000);
-			foreach (SAMStream stream in session2.getStreams().Values) 
-			{
-				Console.WriteLine("Text received on " + stream.getID() + " at " + DateTime.Now.ToLongTimeString());
-				Console.WriteLine(Encoding.ASCII.GetString(stream.ReadToEnd()));
-				stream.Close();
-			}
-
-			stream1.Close();
-			connection1.Close();
-			connection2.Close();
-		}
-	}
-}

apps/sam/csharp/src/SAM.NET/SAM.NET/AssemblyInfo.cs

@@ -1,58 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-//
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-//
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]		
-
-//
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-
-[assembly: AssemblyVersion("1.0.*")]
-
-//
-// In order to sign your assembly you must specify a key to use. Refer to the 
-// Microsoft .NET Framework documentation for more information on assembly signing.
-//
-// Use the attributes below to control which key is used for signing. 
-//
-// Notes: 
-//   (*) If no key is specified, the assembly is not signed.
-//   (*) KeyName refers to a key that has been installed in the Crypto Service
-//       Provider (CSP) on your machine. KeyFile refers to a file which contains
-//       a key.
-//   (*) If the KeyFile and the KeyName values are both specified, the 
-//       following processing occurs:
-//       (1) If the KeyName can be found in the CSP, that key is used.
-//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
-//           in the KeyFile is installed into the CSP and used.
-//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
-//       When specifying the KeyFile, the location of the KeyFile should be
-//       relative to the project output directory which is
-//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
-//       located in the project directory, you would specify the AssemblyKeyFile 
-//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
-//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
-//       documentation for more information on this.
-//
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
-[assembly: AssemblyKeyName("")]

apps/sam/csharp/src/SAM.NET/SAM.NET/SAM.NET.cs

@@ -1,271 +0,0 @@
-using System;
-using System.Net.Sockets;
-using System.Text;
-using System.Net;
-using System.IO;
-using System.Collections;
-using System.Threading;
-
-namespace SAM.NET
-{
-	public enum SamSocketType 
-	{
-		Stream,
-		Datagram,
-		Raw
-	} 
-
-	public class SAMConnection
-	{
-		private const string propertyMinVersion = "1.0";
-		private const string propertyMaxVersion = "1.0";
-
-		private Socket _sock;
-		private NetworkStream _sockStream;
-		private StreamReader _sockStreamIn;
-		private StreamWriter _sockStreamOut;
-
-		public SAMConnection(IPAddress routerIP, int port)
-		{
-			_sock = new Socket(AddressFamily.InterNetwork,SocketType.Stream,ProtocolType.Tcp);
-			IPEndPoint rEP = new IPEndPoint(routerIP,port);
-			_sock.Connect(rEP);
-			_sockStream = new NetworkStream(_sock);
-			_sockStreamIn = new StreamReader(_sockStream);
-			_sockStreamOut = new StreamWriter(_sockStream);
-			try 
-			{
-				sendVersion(propertyMinVersion,propertyMinVersion);
-			}
-			catch (Exception e) 
-			{
-				_sock.Close();
-				throw (new Exception("No SAM for you :("));
-			}
-			
-		}
-
-		private void sendVersion(string min, string max) 
-		{
-			_sockStreamOut.WriteLine("HELLO VERSION MIN=" + propertyMinVersion + " MAX=" + propertyMaxVersion);
-			_sockStreamOut.Flush();
-			Hashtable response = SAMUtil.parseKeyValues(_sockStreamIn.ReadLine(),2);
-			if (response["RESULT"].ToString() != "OK") throw (new Exception("Version mismatch"));
-		}
-
-		public StreamWriter getOutputStream() 
-		{
-			return _sockStreamOut;
-		}
-
-		public StreamReader getInputStream() 
-		{
-			return _sockStreamIn;
-		}
-
-		public NetworkStream getStream() 
-		{
-			return _sockStream;
-		}
-
-		public void Close() 
-		{
-			_sock.Close();
-		}
-	}
-
-	/*
-	 * Creating a SAMSession object will automatically:
-	 * 1) create a sesion on SAM
-	 * 1) query for the base64key
-	 * 2) start a listening thread to catch all stream commands
-	 */
-	public class SAMSession 
-	{
-		private Hashtable _streams;
-		private string _sessionKey;
-		
-		public SAMSession (SAMConnection connection, SamSocketType type, string destination) 
-		{
-			_streams = new Hashtable();
-			StreamWriter writer = connection.getOutputStream();
-			StreamReader reader = connection.getInputStream();
-			writer.WriteLine("SESSION CREATE STYLE=STREAM DESTINATION=" + destination);
-			writer.Flush();
-			Hashtable response = SAMUtil.parseKeyValues(reader.ReadLine(),2);
-			if (response["RESULT"].ToString() != "OK") 
-			{
-				throw (new Exception(response["MESSAGE"].ToString()));
-			}
-			else 
-			{
-				writer.WriteLine("NAMING LOOKUP NAME=ME");
-				writer.Flush();
-				response = SAMUtil.parseKeyValues(reader.ReadLine(),2);
-				_sessionKey = response["VALUE"].ToString();
-				SAMSessionListener listener = new SAMSessionListener(connection,this,_streams);
-				new Thread(new ThreadStart(listener.startListening)).Start();
-			}
-		}
-		public void addStream(SAMStream stream) 
-		{
-			_streams.Add(stream.getID(),stream);
-		}
-		public string getKey() 
-		{
-			return _sessionKey;
-		}
-		public Hashtable getStreams() 
-		{
-			return _streams;
-		}
-	}
-
-	public class SAMSessionListener
-	{
-		private Hashtable _streams;
-		private SAMConnection _connection;
-		private SAMSession _session;
-		private bool stayAlive = true;
-
-		public SAMSessionListener(SAMConnection connection,SAMSession session, Hashtable streams) 
-		{
-			_streams = streams;
-			_connection = connection;
-			_session = session;
-		}
-		public void startListening() 
-		{
-			StreamReader reader = _connection.getInputStream();
-			while (stayAlive) 
-			{
-				string response = reader.ReadLine();
-				if (response.StartsWith("STREAM STATUS")) 
-				{
-					Hashtable values = SAMUtil.parseKeyValues(response,2);
-					SAMStream theStream = (SAMStream)_streams[int.Parse(values["ID"].ToString())];
-					if (theStream != null) theStream.ReceivedStatus(values);
-				}
-				if (response.StartsWith("STREAM CONNECTED")) 
-				{
-					Hashtable values = SAMUtil.parseKeyValues(response,2);
-					SAMStream theStream = (SAMStream)_streams[int.Parse(values["ID"].ToString())];
-					if (theStream != null) theStream.isConnected = true;
-				}
-				if (response.StartsWith("STREAM RECEIVED")) 
-				{
-					Hashtable values = SAMUtil.parseKeyValues(response,2);
-					int streamID = int.Parse(values["ID"].ToString());
-					SAMStream theStream = (SAMStream)_streams[streamID];
-					if (theStream == null) new SAMStream(_connection,_session,streamID);  
-					theStream = (SAMStream)_streams[streamID];
-					theStream.ReceivedData(int.Parse(values["SIZE"].ToString()));
-				}
-				if (response.StartsWith("STREAM CLOSE")) 
-				{
-					Hashtable values = SAMUtil.parseKeyValues(response,2);
-					SAMStream theStream = (SAMStream)_streams[int.Parse(values["ID"].ToString())];
-					if (theStream != null) theStream.isConnected = false;
-				}
-			}
-		}
-	}
-
-	public class SAMStream 
-	{
-		private int _ID;
-		private byte[] _data;
-		private int _position=0;
-		private int _size=0;
-		private SAMSession _session;
-		private SAMConnection _connection;
-		public bool isConnected=false;
-		
-		public SAMStream (SAMConnection connection,SAMSession session, int ID) 
-		{
-			_data = new byte[100000]; //FIXME: change to non-static structure for storing stream data
-			_ID = ID;
-			_connection = connection;
-			_session = session;
-			_session.addStream(this);
-		}
-
-		public void Connect(string destination) 
-		{
-			StreamWriter writer = _connection.getOutputStream();
-			writer.WriteLine("STREAM CONNECT ID=" + _ID.ToString() + " DESTINATION=" + destination);
-			writer.Flush();
-		}
-
-		public void ReceivedData(int size) //FIXME: WTF is going on when reading the payload here? All zeros and way too many of them.
-		{
-			NetworkStream stream = _connection.getStream();
-			int bytesRead = stream.Read(_data,_size,size);
-			_size = _size + bytes;
-		}
-
-		public void ReceivedStatus(Hashtable response) 
-		{
-			if (response["RESULT"].ToString() != "OK") 
-			{
-				throw (new Exception(response["RESULT"].ToString()));
-			}
-			else 
-			{
-				isConnected = true;
-			}
-		}
-
-		public int getID() {return _ID;}
-
-		public bool DataAvailable() 
-		{
-			return _position != _size;
-		}
-
-		public void Write(byte[] buf) 
-		{
-			NetworkStream stream = _connection.getStream();
-			int sent = 0;
-			while (sent < buf.Length) 
-			{
-				int toSend = Math.Min(buf.Length - sent,32768);
-				string header = "STREAM SEND ID=" + _ID.ToString() + " SIZE=" + toSend.ToString() + "\n";
-				byte[] headerbytes = Encoding.ASCII.GetBytes(header);
-				stream.Write(headerbytes,0,headerbytes.Length);
-				stream.Write(buf,sent,toSend);
-				sent = sent + toSend;
-			}
-		}
-
-		public byte[] ReadToEnd() 
-		{
-			byte[] ret = new byte[_size - _position];
-			Array.Copy(_data,_position,ret,0,_size - _position);
-			_position = _size;
-			return ret;
-		}
-
-		public void Close() 
-		{
-			StreamWriter writer = _connection.getOutputStream();
-			writer.WriteLine("STREAM CLOSE " + _ID.ToString());
-			writer.Flush();
-		}
-	}
-
-	public class SAMUtil 
-	{
-		public static Hashtable parseKeyValues(string str, int startingWord) 
-		{
-			Hashtable hash = new Hashtable();
-			string strTruncated = string.Join(" ",str.Split(' '),startingWord,str.Split(' ').Length - startingWord);
-			string[] sets = strTruncated.Split('=',' ');
-			for (int i=0; i<sets.Length; i=i+2)
-			{
-				hash.Add(sets[i],sets[i+1]);
-			}
-			return hash;
-		}
-	}
-}

apps/sam/java/src/net/i2p/sam/SAMv1Handler.java

@@ -111,6 +111,11 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
                     _log.debug("New message received: [" + msg + "]");
                 }
 
+                if(msg.equals("")) {
+                    _log.debug("Ignoring newline");
+                    continue;
+                }
+
                 tok = new StringTokenizer(msg, " ");
                 if (tok.countTokens() < 2) {
                     // This is not a correct message, for sure

apps/streaming/java/src/net/i2p/client/streaming/Connection.java

@@ -12,6 +12,7 @@ import java.util.TreeMap;
 import net.i2p.I2PAppContext;
 import net.i2p.client.I2PSession;
 import net.i2p.data.Base64;
+import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
 import net.i2p.data.SessionTag;
 import net.i2p.util.Log;
@@ -61,6 +62,8 @@ public class Connection {
     private ActivityTimer _activityTimer;
     /** window size when we last saw congestion */
     private int _lastCongestionSeenAt;
+    private long _lastCongestionTime;
+    private long _lastCongestionHighestUnacked;
     private boolean _ackSinceCongestion;
     /** Notify this on connection (or connection failure) */
     private Object _connectLock;
@@ -78,8 +81,8 @@ public class Connection {
     /** wait up to 5 minutes after disconnection so we can ack/close packets */
     public static int DISCONNECT_TIMEOUT = 5*60*1000;
     
-    /** lets be sane- no more than 32 packets in the air in each dir */
-    public static final int MAX_WINDOW_SIZE = 32;
+    /** lets be sane- no more than 64 packets in the air in each dir */
+    public static final int MAX_WINDOW_SIZE = 64;
     
     public Connection(I2PAppContext ctx, ConnectionManager manager, SchedulerChooser chooser, PacketQueue queue, ConnectionPacketHandler handler) {
         this(ctx, manager, chooser, queue, handler, null);
@@ -89,7 +92,7 @@ public class Connection {
         _log = ctx.logManager().getLog(Connection.class);
         _receiver = new ConnectionDataReceiver(ctx, this);
         _inputStream = new MessageInputStream(ctx);
-        _outputStream = new MessageOutputStream(ctx, _receiver);
+        _outputStream = new MessageOutputStream(ctx, _receiver, (opts == null ? Packet.MAX_PAYLOAD_SIZE : opts.getMaxMessageSize()));
         _chooser = chooser;
         _outboundPackets = new TreeMap();
         _outboundQueue = queue;
@@ -104,7 +107,9 @@ public class Connection {
         _unackedPacketsReceived = 0;
         _congestionWindowEnd = 0;
         _highestAckedThrough = -1;
-        _lastCongestionSeenAt = MAX_WINDOW_SIZE;
+        _lastCongestionSeenAt = MAX_WINDOW_SIZE*2; // lets allow it to grow
+        _lastCongestionTime = -1;
+        _lastCongestionHighestUnacked = -1;
         _connectionManager = manager;
         _resetReceived = false;
         _connected = true;
@@ -599,6 +604,8 @@ public class Connection {
         // dont set the size to (winSize >> 4).  only set the
         if (_ackSinceCongestion) {
             _lastCongestionSeenAt = _options.getWindowSize();
+            _lastCongestionTime = _context.clock().now();
+            _lastCongestionHighestUnacked = _lastSendId;
             _ackSinceCongestion = false;
         }
     }
@@ -761,6 +768,21 @@ public class Connection {
                     buf.append(" ").append(nacks[i]);
             buf.append("]");
         }
+        
+        if (getResetSent())
+            buf.append(" reset sent");
+        if (getResetReceived())
+            buf.append(" reset received");
+        if (getCloseSentOn() > 0) {
+            buf.append(" close sent ");
+            long timeSinceClose = _context.clock().now() - getCloseSentOn();
+            buf.append(DataHelper.formatDuration(timeSinceClose));
+            buf.append(" ago");
+        }
+        if (getCloseReceivedOn() > 0)
+            buf.append(" close received");
+        buf.append(" acked packets ").append(getAckedPackets());
+        
         buf.append("]");
         return buf.toString();
     }
@@ -813,14 +835,24 @@ public class Connection {
                 _packet.setReceiveStreamId(_receiveStreamId);
                 _packet.setSendStreamId(_sendStreamId);
                 
-                // shrink the window
                 int newWindowSize = getOptions().getWindowSize();
-                congestionOccurred();
-                _context.statManager().addRateData("stream.con.windowSizeAtCongestion", newWindowSize, _packet.getLifetime());
-                newWindowSize /= 2;
-                if (newWindowSize <= 0)
-                    newWindowSize = 1;
-                getOptions().setWindowSize(newWindowSize);
+
+                if (_ackSinceCongestion) {
+                    // only shrink the window once per window
+                    if (_packet.getSequenceNum() > _lastCongestionHighestUnacked) {
+                        congestionOccurred();
+                        _context.statManager().addRateData("stream.con.windowSizeAtCongestion", newWindowSize, _packet.getLifetime());
+                        newWindowSize /= 2;
+                        if (newWindowSize <= 0)
+                            newWindowSize = 1;
+
+                        if (_log.shouldLog(Log.WARN))
+                            _log.warn("Congestion resending packet " + _packet.getSequenceNum() + ": new windowSize " + newWindowSize 
+                                      + ") for " + Connection.this.toString());
+
+                        getOptions().setWindowSize(newWindowSize);
+                    }
+                }
                 
                 int numSends = _packet.getNumSends() + 1;
                 
@@ -831,7 +863,7 @@ public class Connection {
                 
                 // in case things really suck, the other side may have lost thier
                 // session tags (e.g. they restarted), so jump back to ElGamal.
-                int failTagsAt = _options.getMaxResends() - 1;
+                int failTagsAt = _options.getMaxResends() - 2;
                 if ( (newWindowSize == 1) && (numSends == failTagsAt) ) {
                     if (_log.shouldLog(Log.WARN))
                         _log.warn("Optimistically failing tags at resend " + numSends);

apps/streaming/java/src/net/i2p/client/streaming/ConnectionDataReceiver.java

@@ -146,7 +146,6 @@ class ConnectionDataReceiver implements MessageOutputStream.DataReceiver {
         
         con.getInputStream().updateAcks(packet);
         packet.setOptionalDelay(con.getOptions().getChoke());
-        packet.setOptionalMaxSize(con.getOptions().getMaxMessageSize());
         packet.setResendDelay(con.getOptions().getResendDelay());
         
         if (con.getOptions().getProfile() == ConnectionOptions.PROFILE_INTERACTIVE)
@@ -159,6 +158,7 @@ class ConnectionDataReceiver implements MessageOutputStream.DataReceiver {
         if ( (!ackOnly) && (packet.getSequenceNum() <= 0) ) {
             packet.setFlag(Packet.FLAG_SYNCHRONIZE);
             packet.setOptionalFrom(con.getSession().getMyDestination());
+            packet.setOptionalMaxSize(con.getOptions().getMaxMessageSize());
         }
         
         // don't set the closed flag if this is a plain ACK and there are outstanding

apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java

@@ -37,10 +37,11 @@ public class ConnectionManager {
     private Map _pendingPings;
     private boolean _allowIncoming;
     private int _maxConcurrentStreams;
+    private ConnectionOptions _defaultOptions;
     private volatile int _numWaiting;
     private Object _connectionLock;
     
-    public ConnectionManager(I2PAppContext context, I2PSession session, int maxConcurrent) {
+    public ConnectionManager(I2PAppContext context, I2PSession session, int maxConcurrent, ConnectionOptions defaultOptions) {
         _context = context;
         _log = context.logManager().getLog(ConnectionManager.class);
         _connectionByInboundId = new HashMap(32);
@@ -56,6 +57,7 @@ public class ConnectionManager {
         _outboundQueue = new PacketQueue(context, session, this);
         _allowIncoming = false;
         _maxConcurrentStreams = maxConcurrent;
+        _defaultOptions = defaultOptions;
         _numWaiting = 0;
         _context.statManager().createRateStat("stream.con.lifetimeMessagesSent", "How many messages do we send on a stream?", "Stream", new long[] { 60*60*1000, 24*60*60*1000 });
         _context.statManager().createRateStat("stream.con.lifetimeMessagesReceived", "How many messages do we receive on a stream?", "Stream", new long[] { 60*60*1000, 24*60*60*1000 });
@@ -103,7 +105,7 @@ public class ConnectionManager {
      *         it, or null if the syn's streamId was already taken
      */
     public Connection receiveConnection(Packet synPacket) {
-        Connection con = new Connection(_context, this, _schedulerChooser, _outboundQueue, _conPacketHandler);
+        Connection con = new Connection(_context, this, _schedulerChooser, _outboundQueue, _conPacketHandler, new ConnectionOptions(_defaultOptions));
         byte receiveId[] = new byte[4];
         _context.random().nextBytes(receiveId);
         boolean reject = false;

apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java

@@ -9,7 +9,7 @@ import java.util.Properties;
 public class ConnectionOptions extends I2PSocketOptionsImpl {
     private int _connectDelay;
     private boolean _fullySigned;
-    private int _windowSize;
+    private volatile int _windowSize;
     private int _receiveWindow;
     private int _profile;
     private int _rtt;
@@ -21,6 +21,7 @@ public class ConnectionOptions extends I2PSocketOptionsImpl {
     private int _inactivityTimeout;
     private int _inactivityAction;
     private int _inboundBufferSize;
+    private int _maxWindowSize;
 
     public static final int PROFILE_BULK = 1;
     public static final int PROFILE_INTERACTIVE = 2;
@@ -43,6 +44,7 @@ public class ConnectionOptions extends I2PSocketOptionsImpl {
     public static final String PROP_INITIAL_RECEIVE_WINDOW = "i2p.streaming.initialReceiveWindow";
     public static final String PROP_INACTIVITY_TIMEOUT = "i2p.streaming.inactivityTimeout";
     public static final String PROP_INACTIVITY_ACTION = "i2p.streaming.inactivityAction";
+    public static final String PROP_MAX_WINDOW_SIZE = "i2p.streaming.maxWindowSize";
     
     public ConnectionOptions() {
         super();
@@ -71,6 +73,7 @@ public class ConnectionOptions extends I2PSocketOptionsImpl {
             setInactivityTimeout(opts.getInactivityTimeout());
             setInactivityAction(opts.getInactivityAction());
             setInboundBufferSize(opts.getInboundBufferSize());
+            setMaxWindowSize(opts.getMaxWindowSize());
         }
     }
     
@@ -78,11 +81,11 @@ public class ConnectionOptions extends I2PSocketOptionsImpl {
         super.init(opts);
         setConnectDelay(getInt(opts, PROP_CONNECT_DELAY, -1));
         setProfile(getInt(opts, PROP_PROFILE, PROFILE_BULK));
-        setMaxMessageSize(getInt(opts, PROP_MAX_MESSAGE_SIZE, Packet.MAX_PAYLOAD_SIZE));
+        setMaxMessageSize(getInt(opts, PROP_MAX_MESSAGE_SIZE, 16*1024));
         setRTT(getInt(opts, PROP_INITIAL_RTT, 30*1000));
         setReceiveWindow(getInt(opts, PROP_INITIAL_RECEIVE_WINDOW, 1));
-        setResendDelay(getInt(opts, PROP_INITIAL_RESEND_DELAY, 5*1000));
-        setSendAckDelay(getInt(opts, PROP_INITIAL_ACK_DELAY, 2*1000));
+        setResendDelay(getInt(opts, PROP_INITIAL_RESEND_DELAY, 1000));
+        setSendAckDelay(getInt(opts, PROP_INITIAL_ACK_DELAY, 1000));
         setWindowSize(getInt(opts, PROP_INITIAL_WINDOW_SIZE, 1));
         setMaxResends(getInt(opts, PROP_MAX_RESENDS, 5));
         setWriteTimeout(getInt(opts, PROP_WRITE_TIMEOUT, -1));
@@ -91,6 +94,42 @@ public class ConnectionOptions extends I2PSocketOptionsImpl {
         setInboundBufferSize((getMaxMessageSize() + 2) * Connection.MAX_WINDOW_SIZE);
         
         setConnectTimeout(getInt(opts, PROP_CONNECT_TIMEOUT, Connection.DISCONNECT_TIMEOUT));
+        setMaxWindowSize(getInt(opts, PROP_MAX_WINDOW_SIZE, Connection.MAX_WINDOW_SIZE));
+    }
+    
+    public void setProperties(Properties opts) {
+        super.setProperties(opts);
+        if (opts == null) return;
+        if (opts.containsKey(PROP_CONNECT_DELAY))
+            setConnectDelay(getInt(opts, PROP_CONNECT_DELAY, -1));
+        if (opts.containsKey(PROP_PROFILE))
+            setProfile(getInt(opts, PROP_PROFILE, PROFILE_BULK));
+        if (opts.containsKey(PROP_MAX_MESSAGE_SIZE))
+            setMaxMessageSize(getInt(opts, PROP_MAX_MESSAGE_SIZE, Packet.MAX_PAYLOAD_SIZE));
+        if (opts.containsKey(PROP_INITIAL_RTT))
+            setRTT(getInt(opts, PROP_INITIAL_RTT, 30*1000));
+        if (opts.containsKey(PROP_INITIAL_RECEIVE_WINDOW))
+            setReceiveWindow(getInt(opts, PROP_INITIAL_RECEIVE_WINDOW, 1));
+        if (opts.containsKey(PROP_INITIAL_RESEND_DELAY))
+            setResendDelay(getInt(opts, PROP_INITIAL_RESEND_DELAY, 500));
+        if (opts.containsKey(PROP_INITIAL_ACK_DELAY))
+            setSendAckDelay(getInt(opts, PROP_INITIAL_ACK_DELAY, 500));
+        if (opts.containsKey(PROP_INITIAL_WINDOW_SIZE))
+            setWindowSize(getInt(opts, PROP_INITIAL_WINDOW_SIZE, 1));
+        if (opts.containsKey(PROP_MAX_RESENDS))
+            setMaxResends(getInt(opts, PROP_MAX_RESENDS, 5));
+        if (opts.containsKey(PROP_WRITE_TIMEOUT))
+            setWriteTimeout(getInt(opts, PROP_WRITE_TIMEOUT, -1));
+        if (opts.containsKey(PROP_INACTIVITY_TIMEOUT))
+            setInactivityTimeout(getInt(opts, PROP_INACTIVITY_TIMEOUT, 5*60*1000));
+        if (opts.containsKey(PROP_INACTIVITY_ACTION))
+            setInactivityAction(getInt(opts, PROP_INACTIVITY_ACTION, INACTIVITY_ACTION_DISCONNECT));
+        setInboundBufferSize((getMaxMessageSize() + 2) * Connection.MAX_WINDOW_SIZE);
+        
+        if (opts.containsKey(PROP_CONNECT_TIMEOUT))
+            setConnectTimeout(getInt(opts, PROP_CONNECT_TIMEOUT, Connection.DISCONNECT_TIMEOUT));
+        if (opts.containsKey(PROP_MAX_WINDOW_SIZE))
+            setMaxWindowSize(getInt(opts, PROP_MAX_WINDOW_SIZE, Connection.MAX_WINDOW_SIZE));
     }
     
     /** 
@@ -119,8 +158,8 @@ public class ConnectionOptions extends I2PSocketOptionsImpl {
      */
     public int getWindowSize() { return _windowSize; }
     public void setWindowSize(int numMsgs) { 
-        if (numMsgs > Connection.MAX_WINDOW_SIZE)
-            numMsgs = Connection.MAX_WINDOW_SIZE;
+        if (numMsgs > _maxWindowSize)
+            numMsgs = _maxWindowSize;
         _windowSize = numMsgs; 
     }
     
@@ -199,6 +238,16 @@ public class ConnectionOptions extends I2PSocketOptionsImpl {
     public int getInactivityAction() { return _inactivityAction; }
     public void setInactivityAction(int action) { _inactivityAction = action; }
     
+    public int getMaxWindowSize() { return _maxWindowSize; }
+    public void setMaxWindowSize(int msgs) { 
+        if (msgs > Connection.MAX_WINDOW_SIZE)
+            _maxWindowSize = Connection.MAX_WINDOW_SIZE;
+        else if (msgs < 1)
+            _maxWindowSize = 1;
+        else
+            _maxWindowSize = msgs; 
+    }
+    
     /** 
      * how much data are we willing to accept in our buffer?
      *
@@ -219,6 +268,7 @@ public class ConnectionOptions extends I2PSocketOptionsImpl {
         buf.append(" writeTimeout=").append(getWriteTimeout());
         buf.append(" inactivityTimeout=").append(_inactivityTimeout);
         buf.append(" inboundBuffer=").append(_inboundBufferSize);
+        buf.append(" maxWindowSize=").append(_maxWindowSize);
         return buf.toString();
     }
     

apps/streaming/java/src/net/i2p/client/streaming/ConnectionPacketHandler.java

@@ -49,7 +49,16 @@ public class ConnectionPacketHandler {
             }
             return;
         }
-        
+
+        if (packet.isFlagSet(Packet.FLAG_MAX_PACKET_SIZE_INCLUDED)) {
+            if (packet.getOptionalMaxSize() < con.getOptions().getMaxMessageSize()) {
+                if (_log.shouldLog(Log.INFO))
+                    _log.info("Reducing our max message size to " + packet.getOptionalMaxSize() 
+                              + " from " + con.getOptions().getMaxMessageSize());
+                con.getOptions().setMaxMessageSize(packet.getOptionalMaxSize());
+                con.getOutputStream().setBufferSize(packet.getOptionalMaxSize());
+            }
+        }
 
         con.packetReceived();
         
@@ -185,20 +194,21 @@ public class ConnectionPacketHandler {
             oldSize >>>= 1;
             if (oldSize <= 0)
                 oldSize = 1;
-            con.getOptions().setWindowSize(oldSize);
-            
             if (_log.shouldLog(Log.DEBUG))
                 _log.debug("Congestion occurred - new windowSize " + oldSize + " congestionSeenAt: "
                            + con.getLastCongestionSeenAt() + " (#resends: " + numResends 
                            + ") for " + con);
 
+            con.getOptions().setWindowSize(oldSize);
+            
             congested = true;
         } 
         
         long lowest = con.getHighestAckedThrough();
         if (lowest >= con.getCongestionWindowEnd()) {
             // new packet that ack'ed uncongested data, or an empty ack
-            int newWindowSize = con.getOptions().getWindowSize();
+            int oldWindow = con.getOptions().getWindowSize();
+            int newWindowSize = oldWindow;
 
             if ( (!congested) && (acked > 0) && (numResends <= 0) ) {
                 if (newWindowSize > con.getLastCongestionSeenAt() / 2) {
@@ -216,7 +226,7 @@ public class ConnectionPacketHandler {
             }
                     
             if (_log.shouldLog(Log.DEBUG))
-                _log.debug("New window size " + newWindowSize + " congestionSeenAt: "
+                _log.debug("New window size " + newWindowSize + "/" + oldWindow + " congestionSeenAt: "
                            + con.getLastCongestionSeenAt() + " (#resends: " + numResends 
                            + ") for " + con);
             con.getOptions().setWindowSize(newWindowSize);

apps/streaming/java/src/net/i2p/client/streaming/I2PSocketManagerFull.java

@@ -77,10 +77,10 @@ public class I2PSocketManagerFull implements I2PSocketManager {
                 _log.warn("Invalid max # of concurrent streams, defaulting to unlimited", nfe);
             _maxStreams = -1;
         }
-        _connectionManager = new ConnectionManager(_context, _session, _maxStreams);
         _name = name + " " + (++__managerId);
         _acceptTimeout = ACCEPT_TIMEOUT_DEFAULT;
         _defaultOptions = new ConnectionOptions(opts);
+        _connectionManager = new ConnectionManager(_context, _session, _maxStreams, _defaultOptions);
         _serverSocket = new I2PServerSocketFull(this);
         
         if (_log.shouldLog(Log.INFO)) {
@@ -91,7 +91,9 @@ public class I2PSocketManagerFull implements I2PSocketManager {
 
     public I2PSocketOptions buildOptions() { return buildOptions(null); }
     public I2PSocketOptions buildOptions(Properties opts) {
-        return new ConnectionOptions(opts);
+        ConnectionOptions curOpts = new ConnectionOptions(_defaultOptions);
+        curOpts.setProperties(opts);
+        return curOpts;
     }
     
     public I2PSession getSession() {
@@ -164,9 +166,13 @@ public class I2PSocketManagerFull implements I2PSocketManager {
             options = _defaultOptions;
         ConnectionOptions opts = null;
         if (options instanceof ConnectionOptions)
-            opts = (ConnectionOptions)options;
+            opts = new ConnectionOptions((ConnectionOptions)options);
         else
             opts = new ConnectionOptions(options);
+        
+        if (_log.shouldLog(Log.INFO))
+            _log.info("Connecting to " + peer.calculateHash().toBase64().substring(0,6) 
+                      + " with options: " + opts);
         Connection con = _connectionManager.connect(peer, opts);
         if (con == null)
             throw new TooManyStreamsException("Too many streams (max " + _maxStreams + ")");
@@ -229,10 +235,10 @@ public class I2PSocketManagerFull implements I2PSocketManager {
     public void setName(String name) { _name = name; }
     
     
-    public void addDisconnectListener(DisconnectListener lsnr) { 
+    public void addDisconnectListener(I2PSocketManager.DisconnectListener lsnr) { 
         _connectionManager.getMessageHandler().addDisconnectListener(lsnr);
     }
-    public void removeDisconnectListener(DisconnectListener lsnr) {
+    public void removeDisconnectListener(I2PSocketManager.DisconnectListener lsnr) {
         _connectionManager.getMessageHandler().removeDisconnectListener(lsnr);
     }
 }

apps/streaming/java/src/net/i2p/client/streaming/MessageOutputStream.java

@@ -32,6 +32,12 @@ public class MessageOutputStream extends OutputStream {
     private long _lastBuffered;
     /** if we enqueue data but don't flush it in this period, flush it passively */
     private int _passiveFlushDelay;
+    /** 
+     * if we are changing the buffer size during operation, set this to the new 
+     * buffer size, and next time we are flushing, update the _buf array to the new 
+     * size
+     */
+    private volatile int _nextBufferSize;
     
     public MessageOutputStream(I2PAppContext ctx, DataReceiver receiver) {
         this(ctx, receiver, Packet.MAX_PAYLOAD_SIZE);
@@ -48,6 +54,7 @@ public class MessageOutputStream extends OutputStream {
         _closed = false;
         _writeTimeout = -1;
         _passiveFlushDelay = 500;
+        _nextBufferSize = -1;
         _flusher = new Flusher();
         if (_log.shouldLog(Log.DEBUG))
             _log.debug("MessageOutputStream created");
@@ -55,6 +62,7 @@ public class MessageOutputStream extends OutputStream {
     
     public void setWriteTimeout(int ms) { _writeTimeout = ms; }
     public int getWriteTimeout() { return _writeTimeout; }
+    public void setBufferSize(int size) { _nextBufferSize = size; }
     
     public void write(byte b[]) throws IOException {
         write(b, 0, b.length);
@@ -103,6 +111,8 @@ public class MessageOutputStream extends OutputStream {
                     _valid = 0;                       
                     throwAnyError();
                     _lastFlushed = _context.clock().now();
+                    
+                    locked_updateBufferSize();
                 }
             }
             if (ws != null) {
@@ -134,6 +144,22 @@ public class MessageOutputStream extends OutputStream {
         throwAnyError();
     }
     
+    /**
+     * If the other side requested we shrink our buffer, do so.
+     *
+     */
+    private final void locked_updateBufferSize() {
+        int size = _nextBufferSize;
+        if (size > 0) {
+            // update the buffer size to the requested amount
+            _dataCache.release(new ByteArray(_buf));
+            _dataCache = ByteCache.getInstance(128, size);
+            ByteArray ba = _dataCache.acquire();
+            _buf = ba.getData();
+            _nextBufferSize = -1;
+        }
+    }
+    
     /**
      * Flush data that has been enqued but not flushed after a certain 
      * period of inactivity
@@ -172,7 +198,7 @@ public class MessageOutputStream extends OutputStream {
             WriteStatus ws = null;
             synchronized (_dataLock) {
                 long flushTime = _lastBuffered + _passiveFlushDelay;
-                if ( (_valid > 0) && (flushTime < _context.clock().now()) ) {
+                if ( (_valid > 0) && (flushTime <= _context.clock().now()) ) {
                     if (_log.shouldLog(Log.DEBUG))
                         _log.debug("doFlush() valid = " + _valid);
                     if ( (_buf != null) && (_dataReceiver != null) ) {
@@ -180,6 +206,7 @@ public class MessageOutputStream extends OutputStream {
                         _written += _valid;
                         _valid = 0;
                         _lastFlushed = _context.clock().now();
+                        locked_updateBufferSize();
                         _dataLock.notifyAll();
                         sent = true;
                     }
@@ -213,6 +240,7 @@ public class MessageOutputStream extends OutputStream {
             ws = _dataReceiver.writeData(_buf, 0, _valid);
             _written += _valid;
             _valid = 0;
+            locked_updateBufferSize();
             _lastFlushed = _context.clock().now();
             _dataLock.notifyAll();
         }
@@ -251,6 +279,7 @@ public class MessageOutputStream extends OutputStream {
                 ba = new ByteArray(_buf);
                 _buf = null;
                 _valid = 0;
+                locked_updateBufferSize();
             }
         }
         if (ba != null) {
@@ -314,6 +343,7 @@ public class MessageOutputStream extends OutputStream {
             ws = target.writeData(_buf, 0, _valid);
             _written += _valid;
             _valid = 0;
+            locked_updateBufferSize();
             _dataLock.notifyAll();
             _lastFlushed = _context.clock().now();
         }

apps/streaming/java/src/net/i2p/client/streaming/Packet.java

@@ -563,7 +563,7 @@ public class Packet {
         if (isFlagSet(FLAG_DELAY_REQUESTED)) buf.append(" DELAY ").append(_optionDelay);
         if (isFlagSet(FLAG_ECHO)) buf.append(" ECHO");
         if (isFlagSet(FLAG_FROM_INCLUDED)) buf.append(" FROM");
-        if (isFlagSet(FLAG_MAX_PACKET_SIZE_INCLUDED)) buf.append(" MS");
+        if (isFlagSet(FLAG_MAX_PACKET_SIZE_INCLUDED)) buf.append(" MS ").append(_optionMaxSize);
         if (isFlagSet(FLAG_PROFILE_INTERACTIVE)) buf.append(" INTERACTIVE");
         if (isFlagSet(FLAG_RESET)) buf.append(" RESET");
         if (isFlagSet(FLAG_SIGNATURE_INCLUDED)) buf.append(" SIG");

apps/streaming/java/src/net/i2p/client/streaming/PacketHandler.java

@@ -35,7 +35,7 @@ public class PacketHandler {
             // artificial choke: 2% random drop and a 0-30s
             // random tiered delay from 0-30s
             if (_context.random().nextInt(100) >= 95) {
-                displayPacket(packet, "DROP");
+                displayPacket(packet, "DROP", null);
                 return false;
             } else {
                 // if (true) return true; // no lag, just drop
@@ -87,8 +87,8 @@ public class PacketHandler {
     }
     
     private void receivePacketDirect(Packet packet) {
-        if (_log.shouldLog(Log.DEBUG))
-            _log.debug("packet received: " + packet);
+        //if (_log.shouldLog(Log.DEBUG))
+        //    _log.debug("packet received: " + packet);
         
         byte sendId[] = packet.getSendStreamId();
         if (!isNonZero(sendId))
@@ -97,18 +97,18 @@ public class PacketHandler {
         Connection con = (sendId != null ? _manager.getConnectionByInboundId(sendId) : null); 
         if (con != null) {
             receiveKnownCon(con, packet);
-            displayPacket(packet, "RECV");
+            displayPacket(packet, "RECV", "wsize " + con.getOptions().getWindowSize());
         } else {
             receiveUnknownCon(packet, sendId);
-            displayPacket(packet, "UNKN");
+            displayPacket(packet, "UNKN", null);
         }
     }
     
     private static final SimpleDateFormat _fmt = new SimpleDateFormat("HH:mm:ss.SSS");
-    void displayPacket(Packet packet, String prefix) {
+    void displayPacket(Packet packet, String prefix, String suffix) {
         String msg = null;
         synchronized (_fmt) {
-            msg = _fmt.format(new Date()) + ": " + prefix + " " + packet.toString();
+            msg = _fmt.format(new Date()) + ": " + prefix + " " + packet.toString() + (suffix != null ? " " + suffix : "");
         }
         if (_log.shouldLog(Log.DEBUG))
             System.out.println(msg);
@@ -118,8 +118,8 @@ public class PacketHandler {
         // the packet is pointed at a stream ID we're receiving on
         if (isValidMatch(con.getSendStreamId(), packet.getReceiveStreamId())) {
             // the packet's receive stream ID also matches what we expect
-            if (_log.shouldLog(Log.DEBUG))
-                _log.debug("receive valid: " + packet);
+            //if (_log.shouldLog(Log.DEBUG))
+            //    _log.debug("receive valid: " + packet);
             try {
                 con.getPacketHandler().receivePacket(packet, con);
             } catch (I2PException ie) {

apps/streaming/java/src/net/i2p/client/streaming/PacketQueue.java

@@ -121,7 +121,9 @@ class PacketQueue {
                              + " con: " + conStr;
                 _log.debug(msg);
             }
-            _connectionManager.getPacketHandler().displayPacket(packet, "SEND");
+            Connection c = packet.getConnection();
+            String suffix = (c != null ? "wsize " + c.getOptions().getWindowSize() : null);
+            _connectionManager.getPacketHandler().displayPacket(packet, "SEND", suffix);
         }
     }
     

apps/streaming/java/src/net/i2p/client/streaming/SchedulerClosed.java

@@ -36,7 +36,7 @@ class SchedulerClosed extends SchedulerImpl {
         long timeSinceClose = _context.clock().now() - con.getCloseSentOn();
         boolean ok = (con.getCloseSentOn() > 0) &&
                      (con.getCloseReceivedOn() > 0) &&
-                     (con.getUnackedPacketsReceived() <= 0) &&
+                     //(con.getUnackedPacketsReceived() <= 0) &&
                      (con.getUnackedPacketsSent() <= 0) &&
                      (!con.getResetReceived()) &&
                      (timeSinceClose < Connection.DISCONNECT_TIMEOUT);

apps/streaming/java/src/net/i2p/client/streaming/SchedulerClosing.java

@@ -34,9 +34,12 @@ class SchedulerClosing extends SchedulerImpl {
     }
     
     public boolean accept(Connection con) {
+        long timeSinceClose = _context.clock().now() - con.getCloseSentOn();
         boolean ok = (con != null) && 
-                     (con.getCloseSentOn() > 0) &&
-                     (con.getCloseReceivedOn() > 0) &&
+                     (!con.getResetSent()) && 
+                     (!con.getResetReceived()) &&
+                     ( (con.getCloseSentOn() > 0) || (con.getCloseReceivedOn() > 0) ) &&
+                     (timeSinceClose < Connection.DISCONNECT_TIMEOUT) &&
                      ( (con.getUnackedPacketsReceived() > 0) || (con.getUnackedPacketsSent() > 0) );
         return ok;
     }

apps/streaming/java/test/net/i2p/client/streaming/PingTest.java

@@ -19,7 +19,7 @@ public class PingTest {
         try {
             I2PAppContext context = I2PAppContext.getGlobalContext();
             I2PSession session = createSession();
-            ConnectionManager mgr = new ConnectionManager(context, session, -1);
+            ConnectionManager mgr = new ConnectionManager(context, session, -1, null);
             Log log = context.logManager().getLog(PingTest.class);
             for (int i = 0; i < 10; i++) {
                 log.debug("ping " + i);

build.xml

@@ -34,13 +34,12 @@
         <copy file="apps/routerconsole/java/build/routerconsole.jar" todir="build/" />
         <copy file="apps/routerconsole/java/build/routerconsole.war" todir="build/" />
         <copy file="apps/jetty/jettylib/org.mortbay.jetty.jar" todir="build/" />
-        <copy file="apps/jetty/jettylib/org.mortbay.jetty-jdk1.2.jar" todir="build/" />
         <copy file="apps/jetty/jettylib/ant.jar" todir="build/" />
         <copy file="apps/jetty/jettylib/jasper-compiler.jar" todir="build/" />
         <copy file="apps/jetty/jettylib/jasper-runtime.jar" todir="build/" />
-        <copy file="apps/jetty/jettylib/jnet.jar" todir="build/" />
+        <copy file="apps/jetty/jettylib/commons-logging.jar" todir="build/" />
+        <copy file="apps/jetty/jettylib/commons-el.jar" todir="build/" />
         <copy file="apps/jetty/jettylib/xercesImpl.jar" todir="build/" />
-        <copy file="apps/jetty/jettylib/xml-apis.jar" todir="build/" />
         <copy file="apps/jetty/jettylib/javax.servlet.jar" todir="build/" />
     </target>
     <target name="compile" />
@@ -161,13 +160,13 @@
         <copy file="build/i2ptunnel.jar" todir="pkg-temp/lib/" />
         <copy file="build/jasper-compiler.jar" todir="pkg-temp/lib/" />
         <copy file="build/jasper-runtime.jar" todir="pkg-temp/lib/" />
+        <copy file="build/commons-logging.jar" todir="pkg-temp/lib/" />
+        <copy file="build/commons-el.jar" todir="pkg-temp/lib/" />
         <copy file="build/javax.servlet.jar" todir="pkg-temp/lib/" />
         <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
-        <copy file="build/jnet.jar" todir="pkg-temp/lib/" />
         <copy file="build/mstreaming.jar" todir="pkg-temp/lib/" />
         <copy file="build/streaming.jar" todir="pkg-temp/lib/" />
         <copy file="build/netmonitor.jar" todir="pkg-temp/lib/" />
-        <copy file="build/org.mortbay.jetty-jdk1.2.jar" todir="pkg-temp/lib/" />
         <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
         <copy file="build/router.jar" todir="pkg-temp/lib/" />
         <copy file="build/routerconsole.jar" todir="pkg-temp/lib/" />
@@ -178,7 +177,6 @@
         <copy file="apps/systray/java/resources/iggy.ico" todir="pkg-temp/icons" />
         <copy file="apps/systray/java/resources/iggy.xpm" todir="pkg-temp/icons" />
         <copy file="build/xercesImpl.jar" todir="pkg-temp/lib/" />
-        <copy file="build/xml-apis.jar" todir="pkg-temp/lib/" />
         <copy file="build/i2ptunnel.war" todir="pkg-temp/webapps/" />
         <copy file="build/routerconsole.war" todir="pkg-temp/webapps/" />
         <copy file="build/addressbook.war" todir="pkg-temp/webapps/" />
@@ -213,6 +211,10 @@
         <copy file="hosts.txt" todir="pkg-temp/" />
         <copy file="install-headless.txt" todir="pkg-temp/" />
         <copy file="history.txt" todir="pkg-temp/" />
+        <mkdir dir="pkg-temp/scripts" />
+        <copy file="apps/proxyscript/i2pProxy.pac" todir="pkg-temp/scripts/" />
+        <copy file="core/perl/i2pbench.sh" todir="pkg-temp/scripts/" />
+        <copy file="core/perl/i2ptest.sh" todir="pkg-temp/scripts/" />
         <mkdir dir="pkg-temp/docs" />
         <copy file="readme.html" todir="pkg-temp/docs/" />
         <copy file="installer/resources/startconsole.html" todir="pkg-temp/docs/" />
@@ -223,6 +225,7 @@
         <mkdir dir="pkg-temp/eepsite/webapps" />
         <mkdir dir="pkg-temp/eepsite/logs" />
         <mkdir dir="pkg-temp/eepsite/docroot" />
+        <mkdir dir="pkg-temp/eepsite/cgi-bin" />
         <copy file="installer/resources/eepsite_index.html" tofile="pkg-temp/eepsite/docroot/index.html" />
         <copy file="installer/resources/favicon.ico" tofile="pkg-temp/eepsite/docroot/favicon.ico" />
         <copy file="installer/resources/jetty.xml" tofile="pkg-temp/eepsite/jetty.xml" />
@@ -241,6 +244,18 @@
         <copy file="build/sam.jar" todir="pkg-temp/lib/" />
         <copy file="build/router.jar" todir="pkg-temp/lib/" />
         <copy file="build/routerconsole.jar" todir="pkg-temp/lib/" />
+        
+        <!-- for the i2p 0.5 release, push jetty 5.2.1 -->
+        <copy file="build/jasper-compiler.jar" todir="pkg-temp/lib/" />
+        <copy file="build/jasper-runtime.jar" todir="pkg-temp/lib/" />
+        <copy file="build/commons-logging.jar" todir="pkg-temp/lib/" />
+        <copy file="build/commons-el.jar" todir="pkg-temp/lib/" />
+        <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
+        <copy file="build/javax.servlet.jar" todir="pkg-temp/lib/" />
+        <!-- requires commons-* to be added to the classpath (boo, hiss) -->
+        <copy file="installer/resources/wrapper.config" todir="pkg-temp/" />
+        <touch file="pkg-temp/wrapper.config.updated" />
+        
         <copy file="build/i2ptunnel.war" todir="pkg-temp/webapps/" />
         <copy file="build/routerconsole.war" todir="pkg-temp/webapps/" />
         <copy file="build/addressbook.war" todir="pkg-temp/webapps/" />
@@ -248,7 +263,7 @@
         <copy file="hosts.txt" todir="pkg-temp/" />
         <mkdir dir="pkg-temp/eepsite" />
         <mkdir dir="pkg-temp/eepsite/webapps" />
-        <copy file="installer/resources/jetty.xml" tofile="pkg-temp/eepsite/jetty.xml" />
+        <mkdir dir="pkg-temp/eepsite/cgi-bin" />
         <zip destfile="i2pupdate.zip" basedir="pkg-temp" />
     </target>
     <taskdef name="izpack" classpath="${basedir}/installer/lib/izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />

core/c/jbigi/build.sh

@@ -8,7 +8,13 @@ echo "Building..."
 mkdir -p lib/
 mkdir -p bin/local
 cd bin/local
-../../gmp-4.1.4/configure
+case `uname -sr` in
+Darwin*)
+# --with-pic is required for static linking
+../../gmp-4.1.4/configure --with-pic;;
+*)
+../../gmp-4.1.4/configure;;
+esac
 make
 sh ../../build_jbigi.sh static
 cp *jbigi???* ../../lib/

core/c/jbigi/build_jbigi.sh

@@ -17,6 +17,12 @@ CYGWIN*)
 	INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include/win32/ -I$JAVA_HOME/include/"
 	LINKFLAGS="-shared -Wl,--kill-at"
 	LIBFILE="jbigi.dll";;
+Darwin*)
+        JAVA_HOME="/Library/Java/Home"
+        COMPILEFLAGS="-Wall"
+        INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include"
+        LINKFLAGS="-dynamiclib -framework JavaVM"
+        LIBFILE="libjbigi.jnilib";;
 *)
 	COMPILEFLAGS="-fPIC -Wall"
 	INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"

core/c/jbigi/jbigi/src/jbigi.c

@@ -143,7 +143,9 @@ void convert_j2mp(JNIEnv* env, jbyteArray jvalue, mpz_t* mvalue)
 
 void convert_mp2j(JNIEnv* env, mpz_t mvalue, jbyteArray* jvalue)
 {
-        jsize size;
+        // size_t not jsize to work with 64bit CPUs (do we need to update this
+        // elsewhere, and/or adjust memory alloc sizes?)
+        size_t size; 
         jbyte* buffer;
         jboolean copy;
 		//int i;

core/java/src/freenet/support/CPUInformation/CPUID.java

@@ -252,6 +252,10 @@ public class CPUID {
                             return "Athlon 64";
                         case 5:
                             return "Athlon 64 FX Opteron";
+                        case 12:
+                            return "Athlon 64";
+                        default: // is this safe?
+                            return "Athlon 64 (unknown)";
                     }
                 }
             }

core/java/src/net/i2p/CoreVersion.java

@@ -14,8 +14,8 @@ package net.i2p;
  *
  */
 public class CoreVersion {
-    public final static String ID = "$Revision: 1.25 $ $Date: 2004/11/06 22:00:57 $";
-    public final static String VERSION = "0.4.2";
+    public final static String ID = "$Revision: 1.26.2.1 $ $Date: 2005/02/09 13:46:58 $";
+    public final static String VERSION = "0.5-pre";
 
     public static void main(String args[]) {
         System.out.println("I2P Core version: " + VERSION);

core/java/src/net/i2p/client/ConnectionRunner.java

@@ -1,395 +0,0 @@
-package net.i2p.client;
-
-/*
- * free (adj.): unencumbered; not under the control of others
- * Written by jrandom in 2003 and released into the public domain 
- * with no warranty of any kind, either expressed or implied.  
- * It probably won't  make your computer catch on fire, or eat 
- * your children, but it might.  Use at your own risk.
- *
- */
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import net.i2p.crypto.KeyGenerator;
-import net.i2p.data.Certificate;
-import net.i2p.data.Destination;
-import net.i2p.data.Payload;
-import net.i2p.data.PublicKey;
-import net.i2p.data.RouterIdentity;
-import net.i2p.data.SigningPublicKey;
-import net.i2p.data.TunnelId;
-import net.i2p.data.i2cp.CreateSessionMessage;
-import net.i2p.data.i2cp.DisconnectMessage;
-import net.i2p.data.i2cp.I2CPMessage;
-import net.i2p.data.i2cp.I2CPMessageException;
-import net.i2p.data.i2cp.I2CPMessageReader;
-import net.i2p.data.i2cp.MessageId;
-import net.i2p.data.i2cp.MessagePayloadMessage;
-import net.i2p.data.i2cp.MessageStatusMessage;
-import net.i2p.data.i2cp.ReceiveMessageBeginMessage;
-import net.i2p.data.i2cp.ReceiveMessageEndMessage;
-import net.i2p.data.i2cp.RequestLeaseSetMessage;
-import net.i2p.data.i2cp.SendMessageMessage;
-import net.i2p.data.i2cp.SessionConfig;
-import net.i2p.data.i2cp.SessionId;
-import net.i2p.data.i2cp.SessionStatusMessage;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
-
-/**
- * Run the server side of a connection as part of the TestServer.  This class 
- * actually manages the state of that system too, but this is a very, very, very
- * rudimentary implementation.  And not a very clean one at that. 
- *
- * @author jrandom
- */
-class ConnectionRunner implements I2CPMessageReader.I2CPMessageEventListener {
-    private final static Log _log = new Log(ConnectionRunner.class);
-    /** 
-     * static mapping of Destination to ConnectionRunner, allowing connections to pass 
-     * messages to each other
-     */
-    private static Map _connections = Collections.synchronizedMap(new HashMap());
-    /**
-     * static mapping of MessageId to Payload, storing messages for retrieval
-     *
-     */
-    private static Map _messages = Collections.synchronizedMap(new HashMap());
-    /** socket for this particular peer connection */
-    private Socket _socket;
-    /** 
-     * output stream of the socket that I2CP messages bound to the client 
-     * should be written to
-     */
-    private OutputStream _out;
-    /** session ID of the current client */
-    private SessionId _sessionId;
-    /** next available session id */
-    private static int _id = 0;
-    /** next available message id */
-    private static int _messageId = 0;
-    private SessionConfig _config;
-
-    private Object _sessionIdLock = new Object();
-    private Object _messageIdLock = new Object();
-
-    // this *should* be mod 65536, but UnsignedInteger is still b0rked.  FIXME
-    protected int getNextSessionId() {
-        synchronized (_sessionIdLock) {
-            int id = (++_id) % 32767;
-            _id = id;
-            return id;
-        }
-    }
-
-    // this *should* be mod 65536, but UnsignedInteger is still b0rked.  FIXME
-    protected int getNextMessageId() {
-        synchronized (_messageIdLock) {
-            int id = (++_messageId) % 32767;
-            _messageId = id;
-            return id;
-        }
-    }
-
-    protected SessionId getSessionId() {
-        return _sessionId;
-    }
-
-    protected ConnectionRunner getRunner(Destination dest) {
-        return (ConnectionRunner) _connections.get(dest);
-    }
-
-    protected Set getRunnerDestinations() {
-        return new HashSet(_connections.keySet());
-    }
-
-    /**
-     * Create a new runner against the given socket
-     *
-     */
-    public ConnectionRunner(Socket socket) {
-        _socket = socket;
-        _config = null;
-    }
-
-    /**
-     * Actually run the connection - listen for I2CP messages and respond.  This
-     * is the main driver for this class, though it gets all its meat from the
-     * {@link net.i2p.data.i2cp.I2CPMessageReader I2CPMessageReader}
-     *
-     */
-    public void doYourThing() throws IOException {
-        I2CPMessageReader reader = new I2CPMessageReader(_socket.getInputStream(), this);
-        _out = _socket.getOutputStream();
-        reader.startReading();
-    }
-
-    /**
-     * Receive notifiation that the peer disconnected
-     */
-    public void disconnected(I2CPMessageReader reader) {
-        _log.info("Disconnected");
-    }
-
-    /**
-     * Handle an incoming message and dispatch it to the appropriate handler
-     *
-     */
-    public void messageReceived(I2CPMessageReader reader, I2CPMessage message) {
-        _log.info("Message received: \n" + message);
-        switch (message.getType()) {
-        case CreateSessionMessage.MESSAGE_TYPE:
-            handleCreateSession(reader, (CreateSessionMessage) message);
-            break;
-        case SendMessageMessage.MESSAGE_TYPE:
-            handleSendMessage(reader, (SendMessageMessage) message);
-            break;
-        case ReceiveMessageBeginMessage.MESSAGE_TYPE:
-            handleReceiveBegin(reader, (ReceiveMessageBeginMessage) message);
-            break;
-        case ReceiveMessageEndMessage.MESSAGE_TYPE:
-            handleReceiveEnd(reader, (ReceiveMessageEndMessage) message);
-            break;
-        }
-    }
-
-    /** 
-     * Handle a CreateSessionMessage
-     *
-     */
-    protected void handleCreateSession(I2CPMessageReader reader, CreateSessionMessage message) {
-        if (message.getSessionConfig().verifySignature()) {
-            _log.debug("Signature verified correctly on create session message");
-        } else {
-            _log.error("Signature verification *FAILED* on a create session message.  Hijack attempt?");
-            DisconnectMessage msg = new DisconnectMessage();
-            msg.setReason("Invalid signature on CreateSessionMessage");
-            try {
-                doSend(msg);
-            } catch (I2CPMessageException ime) {
-                _log.error("Error writing out the disconnect message", ime);
-            } catch (IOException ioe) {
-                _log.error("Error writing out the disconnect message", ioe);
-            }
-            return;
-        }
-        SessionStatusMessage msg = new SessionStatusMessage();
-        SessionId id = new SessionId();
-        id.setSessionId(getNextSessionId()); // should be mod 65535, but UnsignedInteger isn't fixed yet.  FIXME.
-        _sessionId = id;
-        msg.setSessionId(id);
-        msg.setStatus(SessionStatusMessage.STATUS_CREATED);
-        try {
-            doSend(msg);
-            _connections.put(message.getSessionConfig().getDestination(), this);
-            _config = message.getSessionConfig();
-            sessionCreated();
-        } catch (I2CPMessageException ime) {
-            _log.error("Error writing out the session status message", ime);
-        } catch (IOException ioe) {
-            _log.error("Error writing out the session status message", ioe);
-        }
-
-        // lets also request a new fake lease
-        RequestLeaseSetMessage rlsm = new RequestLeaseSetMessage();
-        rlsm.setEndDate(new Date(Clock.getInstance().now() + 60 * 60 * 1000));
-        rlsm.setSessionId(id);
-        RouterIdentity ri = new RouterIdentity();
-        Object rikeys[] = KeyGenerator.getInstance().generatePKIKeypair();
-        Object riSigningkeys[] = KeyGenerator.getInstance().generateSigningKeypair();
-        ri.setCertificate(new Certificate(Certificate.CERTIFICATE_TYPE_NULL, null));
-        ri.setPublicKey((PublicKey) rikeys[0]);
-        ri.setSigningPublicKey((SigningPublicKey) riSigningkeys[0]);
-        TunnelId tunnel = new TunnelId();
-        tunnel.setTunnelId(42);
-        rlsm.addEndpoint(ri, tunnel);
-        try {
-            doSend(rlsm);
-        } catch (I2CPMessageException ime) {
-            _log.error("Error writing out the request for a lease set", ime);
-        } catch (IOException ioe) {
-            _log.error("Error writing out the request for a lease set", ioe);
-        }
-
-    }
-
-    protected void sessionCreated() { // nop
-    }
-
-    protected SessionConfig getConfig() {
-        return _config;
-    }
-
-    /**
-     * Handle a SendMessageMessage
-     *
-     */
-    protected void handleSendMessage(I2CPMessageReader reader, SendMessageMessage message) {
-        _log.debug("handleSendMessage called");
-        Payload payload = message.getPayload();
-        Destination dest = message.getDestination();
-        MessageId id = new MessageId();
-        id.setMessageId(getNextMessageId());
-        _log.debug("** Receiving message [" + id.getMessageId() + "] with payload: " + "[" + payload + "]");
-        _messages.put(id, payload);
-        MessageStatusMessage status = new MessageStatusMessage();
-        status.setMessageId(id);
-        status.setSessionId(message.getSessionId());
-        status.setSize(0L);
-        status.setNonce(message.getNonce());
-        status.setStatus(MessageStatusMessage.STATUS_SEND_ACCEPTED);
-        try {
-            doSend(status);
-        } catch (I2CPMessageException ime) {
-            _log.error("Error writing out the message status message", ime);
-        } catch (IOException ioe) {
-            _log.error("Error writing out the message status message", ioe);
-        }
-        distributeMessageToPeer(status, dest, id);
-    }
-
-    /** 
-     * distribute the message to the destination, passing on the appropriate status
-     * messages to the sender of the SendMessageMessage
-     *
-     */
-    private void distributeMessageToPeer(MessageStatusMessage status, Destination dest, MessageId id) {
-        ConnectionRunner runner = (ConnectionRunner) _connections.get(dest);
-        if (runner == null) {
-            distributeNonLocal(status, dest, id);
-        } else {
-            distributeLocal(runner, status, dest, id);
-        }
-        _log.debug("Done handling send message");
-    }
-
-    protected void distributeLocal(ConnectionRunner runner, MessageStatusMessage status, Destination dest, MessageId id) {
-        if (runner.messageAvailable(id, 0L)) {
-            status.setStatus(MessageStatusMessage.STATUS_SEND_GUARANTEED_SUCCESS);
-            status.setNonce(2);
-            try {
-                doSend(status);
-            } catch (I2CPMessageException ime) {
-                _log.error("Error writing out the success status message", ime);
-            } catch (IOException ioe) {
-                _log.error("Error writing out the success status message", ioe);
-            }
-            _log.debug("Guaranteed success with the status message sent");
-        } else {
-            status.setStatus(MessageStatusMessage.STATUS_SEND_GUARANTEED_FAILURE);
-            try {
-                doSend(status);
-            } catch (I2CPMessageException ime) {
-                _log.error("Error writing out the failure status message", ime);
-            } catch (IOException ioe) {
-                _log.error("Error writing out the failure status message", ioe);
-            }
-            _log.debug("Guaranteed failure since messageAvailable failed");
-        }
-    }
-
-    protected void distributeNonLocal(MessageStatusMessage status, Destination dest, MessageId id) {
-        status.setStatus(MessageStatusMessage.STATUS_SEND_GUARANTEED_FAILURE);
-        try {
-            doSend(status);
-        } catch (I2CPMessageException ime) {
-            _log.error("Error writing out the failure status message", ime);
-        } catch (IOException ioe) {
-            _log.error("Error writing out the failure status message", ioe);
-        }
-        _log.debug("Guaranteed failure!");
-    }
-
-    /**
-     * The client asked for a message, so we send it to them.  This currently
-     * does not do any security checking (like making sure they're the one to
-     * whom the message ID is destined, but its encrypted, so why not...
-     * (bad attitude, I know.  consider this a bug to be fixed)
-     *
-     */
-    public void handleReceiveBegin(I2CPMessageReader reader, ReceiveMessageBeginMessage message) {
-        _log.debug("Handling receive begin: id = " + message.getMessageId());
-        MessagePayloadMessage msg = new MessagePayloadMessage();
-        msg.setMessageId(message.getMessageId());
-        msg.setSessionId(_sessionId);
-        Payload payload = (Payload) _messages.get(message.getMessageId());
-        if (payload == null) {
-            _log.error("Payload for message id [" + message.getMessageId() + "] is null!  Unknown message id?",
-                       new Exception("Error, null payload"));
-            StringBuffer buf = new StringBuffer();
-            for (Iterator iter = _messages.keySet().iterator(); iter.hasNext();) {
-                buf.append("messageId: ").append(iter.next()).append(", ");
-            }
-            _log.error("Known message IDs: " + buf.toString());
-            return;
-        }
-        msg.setPayload(payload);
-        try {
-            doSend(msg);
-        } catch (IOException ioe) {
-            _log.error("Error delivering the payload", ioe);
-        } catch (I2CPMessageException ime) {
-            _log.error("Error delivering the payload", ime);
-        }
-    }
-
-    /**
-     * The client told us that the message has been received completely.  This currently
-     * does not do any security checking prior to removing the message from the 
-     * pending queue, though it should.
-     *
-     */
-    public void handleReceiveEnd(I2CPMessageReader reader, ReceiveMessageEndMessage message) {
-        _messages.remove(message.getMessageId());
-    }
-
-    /**
-     * Deliver notification to the client that the given message is available.
-     * This is called from the ConnectionRunner the message was sent from.
-     *
-     */
-    public boolean messageAvailable(MessageId id, long size) {
-        MessageStatusMessage msg = new MessageStatusMessage();
-        msg.setMessageId(id);
-        msg.setSessionId(_sessionId);
-        msg.setSize(size);
-        msg.setNonce(1);
-        msg.setStatus(MessageStatusMessage.STATUS_AVAILABLE);
-        try {
-            doSend(msg);
-            return true;
-        } catch (I2CPMessageException ime) {
-            _log.error("Error writing out the message status message", ime);
-        } catch (IOException ioe) {
-            _log.error("Error writing out the message status message", ioe);
-        }
-        return false;
-    }
-
-    /**
-     * Handle notifiation that there was an error
-     *
-     */
-    public void readError(I2CPMessageReader reader, Exception error) {
-        _log.info("Error occurred", error);
-    }
-
-    private Object _sendLock = new Object();
-
-    protected void doSend(I2CPMessage msg) throws I2CPMessageException, IOException {
-        synchronized (_sendLock) {
-            msg.writeMessage(_out);
-            _out.flush();
-        }
-    }
-}

core/java/src/net/i2p/client/I2CPMessageProducer.java

@@ -103,8 +103,9 @@ class I2CPMessageProducer {
         if (payload == null) throw new I2PSessionException("No payload specified");
 
         Payload data = new Payload();
-        // randomize padding
-        int size = payload.length + RandomSource.getInstance().nextInt(1024);
+        // no padding at this level
+        // the garlic may pad, and the tunnels may pad, and the transports may pad
+        int size = payload.length;
         byte encr[] = _context.elGamalAESEngine().encrypt(payload, dest.getPublicKey(), key, tags, tag, newKey, size);
         // yes, in an intelligent component, newTags would be queued for confirmation along with key, and
         // generateNewTags would only generate tags if necessary

core/java/src/net/i2p/client/I2PSessionImpl.java

@@ -111,6 +111,8 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa
         }
     }
 
+    public static final int LISTEN_PORT = 7654;
+    
     /**
      * Create a new session, reading the Destination, PrivateKey, and SigningPrivateKey
      * from the destKeyStream, and using the specified options to connect to the router
@@ -145,14 +147,14 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa
         _options = new Properties();
         _options.putAll(filter(options));
         _hostname = _options.getProperty(I2PClient.PROP_TCP_HOST, "localhost");
-        String portNum = _options.getProperty(I2PClient.PROP_TCP_PORT, TestServer.LISTEN_PORT + "");
+        String portNum = _options.getProperty(I2PClient.PROP_TCP_PORT, LISTEN_PORT + "");
         try {
             _portNum = Integer.parseInt(portNum);
         } catch (NumberFormatException nfe) {
             if (_log.shouldLog(Log.WARN))
                 _log.warn(getPrefix() + "Invalid port number specified, defaulting to "
-                          + TestServer.LISTEN_PORT, nfe);
-            _portNum = TestServer.LISTEN_PORT;
+                          + LISTEN_PORT, nfe);
+            _portNum = LISTEN_PORT;
         }
     }
 

core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java

@@ -46,7 +46,7 @@ class RequestLeaseSetMessageHandler extends HandlerImpl {
         LeaseSet leaseSet = new LeaseSet();
         for (int i = 0; i < msg.getEndpoints(); i++) {
             Lease lease = new Lease();
-            lease.setRouterIdentity(msg.getRouter(i));
+            lease.setGateway(msg.getRouter(i));
             lease.setTunnelId(msg.getTunnelId(i));
             lease.setEndDate(msg.getEndDate());
             //lease.setStartDate(msg.getStartDate());

core/java/src/net/i2p/client/TestClient.java

@@ -1,145 +0,0 @@
-package net.i2p.client;
-
-/*
- * free (adj.): unencumbered; not under the control of others
- * Written by jrandom in 2003 and released into the public domain 
- * with no warranty of any kind, either expressed or implied.  
- * It probably won't  make your computer catch on fire, or eat 
- * your children, but it might.  Use at your own risk.
- *
- */
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.util.Properties;
-
-import net.i2p.data.Destination;
-import net.i2p.util.I2PThread;
-import net.i2p.util.Log;
-
-/**
- * Quick and dirty test harness for sending messages from one destination to another.
- * This will print out some debugging information and containg the statement
- * "Hello other side.  I am dest1" if the router and the client libraries work.
- * This class bootstraps itself each time - creating new keys and destinations
- *
- * @author jrandom
- */
-public class TestClient implements I2PSessionListener {
-    private final static Log _log = new Log(TestClient.class);
-    private static Destination _dest1;
-    private static Destination _dest2;
-    private boolean _stillRunning;
-
-    public void runTest(String keyfile, boolean isDest1) {
-        _stillRunning = true;
-        try {
-            I2PClient client = I2PClientFactory.createClient();
-            File file = new File(keyfile);
-            Destination d = client.createDestination(new FileOutputStream(file));
-            if (isDest1)
-                _dest1 = d;
-            else
-                _dest2 = d;
-            _log.debug("Destination written to " + file.getAbsolutePath());
-            Properties options = new Properties();
-
-            if (System.getProperty(I2PClient.PROP_TCP_HOST) == null)
-                options.setProperty(I2PClient.PROP_TCP_HOST, "localhost");
-            else
-                options.setProperty(I2PClient.PROP_TCP_HOST, System.getProperty(I2PClient.PROP_TCP_HOST));
-            if (System.getProperty(I2PClient.PROP_TCP_PORT) == null)
-                options.setProperty(I2PClient.PROP_TCP_PORT, "7654");
-            else
-                options.setProperty(I2PClient.PROP_TCP_PORT, System.getProperty(I2PClient.PROP_TCP_PORT));
-
-            I2PSession session = client.createSession(new FileInputStream(file), options);
-            session.setSessionListener(this);
-            _log.debug("Before connect...");
-            session.connect();
-            _log.debug("Connected");
-
-            // wait until the other one is connected
-            while ((_dest1 == null) || (_dest2 == null))
-                try {
-                    Thread.sleep(500);
-                } catch (InterruptedException ie) { // nop
-                }
-
-            if (isDest1) {
-                Destination otherD = (isDest1 ? _dest2 : _dest1);
-                boolean accepted = session
-                                          .sendMessage(
-                                                       otherD,
-                                                       ("Hello other side.  I am" + (isDest1 ? "" : " NOT") + " dest1")
-                                                                                                                       .getBytes());
-            } else {
-                while (_stillRunning) {
-                    try {
-                        _log.debug("waiting for a message...");
-                        Thread.sleep(1000);
-                    } catch (InterruptedException ie) { // nop
-                    }
-                }
-                try {
-                    Thread.sleep(5000);
-                } catch (InterruptedException ie) { // nop
-                }
-                System.exit(0);
-            }
-            //session.destroySession();
-        } catch (Exception e) {
-            _log.error("Error running the test for isDest1? " + isDest1, e);
-        }
-    }
-
-    public static void main(String args[]) {
-        doTest();
-        try {
-            Thread.sleep(30 * 1000);
-        } catch (InterruptedException ie) { // nop
-        }
-    }
-
-    static void doTest() {
-        Thread test1 = new I2PThread(new Runnable() {
-            public void run() {
-                (new TestClient()).runTest("test1.keyfile", true);
-            }
-        });
-        Thread test2 = new I2PThread(new Runnable() {
-            public void run() {
-                (new TestClient()).runTest("test2.keyfile", false);
-            }
-        });
-        test1.start();
-        test2.start();
-        _log.debug("Test threads started");
-    }
-
-    public void disconnected(I2PSession session) {
-        _log.debug("Disconnected");
-        _stillRunning = false;
-    }
-
-    public void errorOccurred(I2PSession session, String message, Throwable error) {
-        _log.debug("Error occurred: " + message, error);
-    }
-
-    public void messageAvailable(I2PSession session, int msgId, long size) {
-        _log.debug("Message available for us!  id = " + msgId + " of size " + size);
-        try {
-            byte msg[] = session.receiveMessage(msgId);
-            _log.debug("Content of message " + msgId + ":\n" + new String(msg));
-            _stillRunning = false;
-        } catch (I2PSessionException ise) {
-            _log.error("Error fetching available message", ise);
-        }
-    }
-
-    public void reportAbuse(I2PSession session, int severity) {
-        _log.debug("Abuse reported of severity " + severity);
-    }
-
-}

core/java/src/net/i2p/client/TestServer.java

@@ -1,89 +0,0 @@
-package net.i2p.client;
-
-/*
- * free (adj.): unencumbered; not under the control of others
- * Written by jrandom in 2003 and released into the public domain 
- * with no warranty of any kind, either expressed or implied.  
- * It probably won't  make your computer catch on fire, or eat 
- * your children, but it might.  Use at your own risk.
- *
- */
-
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.Socket;
-
-import net.i2p.util.I2PThread;
-import net.i2p.util.Log;
-
-/**
- * Implement a local only router for testing purposes.  This router is minimal
- * in that it doesn't verify signatures, communicate with other routers, or handle 
- * failures very gracefully.  It is simply a test harness to allow I2CP based 
- * applications to run.
- *
- * @author jrandom
- */
-public class TestServer implements Runnable {
-    private final static Log _log = new Log(TestServer.class);
-    private ServerSocket _socket;
-    public static int LISTEN_PORT = 7654;
-
-    protected void setPort(int port) {
-        LISTEN_PORT = port;
-    }
-
-    /** 
-     * Start up the socket listener, listens for connections, and
-     * fires those connections off via {@link #runConnection runConnection}.  
-     * This only returns if the socket cannot be opened or there is a catastrophic
-     * failure.
-     *
-     */
-    public void runServer() {
-        try {
-            _socket = new ServerSocket(LISTEN_PORT);
-        } catch (IOException ioe) {
-            _log.error("Error listening", ioe);
-            return;
-        }
-        while (true) {
-            try {
-                Socket socket = _socket.accept();
-                runConnection(socket);
-            } catch (IOException ioe) {
-                _log.error("Server error accepting", ioe);
-            }
-        }
-    }
-
-    /**
-     * Handle the connection by passing it off to a ConnectionRunner
-     *
-     */
-    protected void runConnection(Socket socket) throws IOException {
-        ConnectionRunner runner = new ConnectionRunner(socket);
-        runner.doYourThing();
-    }
-
-    public void run() {
-        runServer();
-    }
-
-    /** 
-     * Fire up the router
-     */
-    public static void main(String args[]) {
-        if (args.length == 1) { // nop
-        } else if (args.length == 2) {
-            try {
-                LISTEN_PORT = Integer.parseInt(args[1]);
-            } catch (NumberFormatException nfe) {
-                _log.error("Invalid port number specified (" + args[1] + "), using " + LISTEN_PORT, nfe);
-            }
-        }
-        TestServer server = new TestServer();
-        Thread t = new I2PThread(server);
-        t.start();
-    }
-}

core/java/src/net/i2p/crypto/DHSessionKeyBuilder.java

@@ -48,6 +48,7 @@ import net.i2p.util.RandomSource;
  * @author jrandom
  */
 public class DHSessionKeyBuilder {
+    private static I2PAppContext _context = I2PAppContext.getGlobalContext();
     private final static Log _log = new Log(DHSessionKeyBuilder.class);
     private static int MIN_NUM_BUILDERS = -1;
     private static int MAX_NUM_BUILDERS = -1;
@@ -68,7 +69,7 @@ public class DHSessionKeyBuilder {
     public final static String DEFAULT_DH_PRECALC_DELAY = "1000";
 
     static {
-        I2PAppContext ctx = I2PAppContext.getGlobalContext();
+        I2PAppContext ctx = _context;
         try {
             int val = Integer.parseInt(ctx.getProperty(PROP_DH_PRECALC_MIN, DEFAULT_DH_PRECALC_MIN));
             MIN_NUM_BUILDERS = val;
@@ -305,6 +306,8 @@ public class DHSessionKeyBuilder {
                 _log.debug("Storing " + remaining.length + " bytes from the DH exchange by SHA256 the session key");
         } else { // (buf.length >= val.length) 
             System.arraycopy(buf, 0, val, 0, val.length);
+            // feed the extra bytes into the PRNG
+            _context.random().harvester().feedEntropy("DH", buf, val.length, buf.length-val.length); 
             byte remaining[] = new byte[buf.length - val.length];
             System.arraycopy(buf, val.length, remaining, 0, remaining.length);
             _extraExchangedBytes.setData(remaining);

core/java/src/net/i2p/crypto/ElGamalAESEngine.java

@@ -154,11 +154,14 @@ public class ElGamalAESEngine {
 
         byte preIV[] = null;
         
+        int offset = 0;
         byte key[] = new byte[SessionKey.KEYSIZE_BYTES];
-        System.arraycopy(elgDecr, 0, key, 0, SessionKey.KEYSIZE_BYTES);
+        System.arraycopy(elgDecr, offset, key, 0, SessionKey.KEYSIZE_BYTES);
+        offset += SessionKey.KEYSIZE_BYTES;
         usedKey.setData(key);
         preIV = new byte[32];
-        System.arraycopy(elgDecr, SessionKey.KEYSIZE_BYTES, preIV, 0, 32);
+        System.arraycopy(elgDecr, offset, preIV, 0, 32);
+        offset += 32;
 
         //_log.debug("Pre IV for decryptNewSession: " + DataHelper.toString(preIV, 32));
         //_log.debug("SessionKey for decryptNewSession: " + DataHelper.toString(key.getData(), 32));
@@ -168,6 +171,9 @@ public class ElGamalAESEngine {
         System.arraycopy(ivHash.getData(), 0, iv, 0, 16);
         _context.sha().cache().release(cache);
 
+        // feed the extra bytes into the PRNG
+        _context.random().harvester().feedEntropy("ElG/AES", elgDecr, offset, elgDecr.length - offset); 
+
         byte aesDecr[] = decryptAESBlock(data, 514, data.length-514, usedKey, iv, null, foundTags, foundKey);
 
         if (_log.shouldLog(Log.DEBUG))
@@ -403,6 +409,8 @@ public class ElGamalAESEngine {
             elgEncr = elg;
         }
         //_log.debug("ElGamal encrypted length: " + elgEncr.length + " elGamal source length: " + elgSrc.toByteArray().length);
+        
+        // should we also feed the encrypted elG block into the harvester?
 
         SHA256EntryCache.CacheEntry cache = _context.sha().cache().acquire(preIV.length);
         Hash ivHash = _context.sha().calculateHash(preIV, cache);

core/java/src/net/i2p/crypto/EntropyHarvester.java

@@ -0,0 +1,30 @@
+package net.i2p.crypto;
+
+/**
+ * Allow various components with some entropy to feed that entropy back
+ * into some PRNG.  The quality of the entropy provided varies, so anything
+ * harvesting should discriminate based on the offered "source" of the 
+ * entropy, silently discarding insufficient entropy sources.
+ *
+ */
+public interface EntropyHarvester {
+    /** 
+     * Feed the entropy pools with data[offset:offset+len] 
+     *
+     * @param source origin of the entropy, allowing the harvester to 
+     *               determine how much to value the data
+     * @param offset index into the data array to start
+     * @param len how many bytes to use
+     */
+    void feedEntropy(String source, byte data[], int offset, int len);
+    /** 
+     * Feed the entropy pools with the bits in the data
+     *
+     * @param source origin of the entropy, allowing the harvester to 
+     *               determine how much to value the data
+     * @param bitoffset bit index into the data array to start 
+     *                  (using java standard big-endian)
+     * @param bits how many bits to use
+     */
+    void feedEntropy(String source, long data, int bitoffset, int bits);
+}

core/java/src/net/i2p/crypto/TransientSessionKeyManager.java

@@ -51,8 +51,8 @@ class TransientSessionKeyManager extends SessionKeyManager {
      * can cause failed decrypts)
      *
      */
-    public final static long SESSION_LIFETIME_MAX_MS = SESSION_TAG_DURATION_MS + 5 * 60 * 1000;
-    public final static int MAX_INBOUND_SESSION_TAGS = 100 * 1000; // this will consume at most 3.2M
+    public final static long SESSION_LIFETIME_MAX_MS = SESSION_TAG_DURATION_MS + 2 * 60 * 1000;
+    public final static int MAX_INBOUND_SESSION_TAGS = 500 * 1000; // this will consume at most a few MB
 
     /** 
      * The session key manager should only be constructed and accessed through the 
@@ -602,14 +602,15 @@ class TransientSessionKeyManager extends SessionKeyManager {
             long rv = 0;
             if (_key != null) rv = rv * 7 + _key.hashCode();
             rv = rv * 7 + _date;
-            if (_sessionTags != null) rv = rv * 7 + DataHelper.hashCode(_sessionTags);
+            // no need to hashCode the tags, key + date should be enough
             return (int) rv;
         }
 
         public boolean equals(Object o) {
             if ((o == null) || !(o instanceof TagSet)) return false;
             TagSet ts = (TagSet) o;
-            return DataHelper.eq(ts.getAssociatedKey(), getAssociatedKey()) && DataHelper.eq(ts.getTags(), getTags())
+            return DataHelper.eq(ts.getAssociatedKey(), getAssociatedKey()) 
+                   //&& DataHelper.eq(ts.getTags(), getTags())
                    && ts.getDate() == getDate();
         }
     }

core/java/src/net/i2p/data/ByteArray.java

@@ -19,6 +19,7 @@ import java.io.Serializable;
 public class ByteArray implements Serializable, Comparable {
     private byte[] _data;
     private int _valid;
+    private int _offset;
 
     public ByteArray() {
         this(null);
@@ -28,6 +29,11 @@ public class ByteArray implements Serializable, Comparable {
         _data = data;
         _valid = 0;
     }
+    public ByteArray(byte[] data, int offset, int length) {
+        _data = data;
+        _offset = offset;
+        _valid = length;
+    }
 
     public final byte[] getData() {
         return _data;
@@ -44,6 +50,8 @@ public class ByteArray implements Serializable, Comparable {
      */
     public final int getValid() { return _valid; }
     public final void setValid(int valid) { _valid = valid; }
+    public final int getOffset() { return _offset; }
+    public final void setOffset(int offset) { _offset = offset; }
 
     public final boolean equals(Object o) {
         if (o == null) return false;

core/java/src/net/i2p/data/DataHelper.java

@@ -35,6 +35,7 @@ import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
 import net.i2p.util.ByteCache;
+import net.i2p.util.CachingByteArrayOutputStream;
 import net.i2p.util.OrderedProperties;
 
 /**
@@ -123,7 +124,70 @@ public class DataHelper {
             writeLong(rawStream, 2, 0);
         }
     }
+    
+    public static int toProperties(byte target[], int offset, Properties props) throws DataFormatException, IOException {
+        if (props != null) {
+            OrderedProperties p = new OrderedProperties();
+            p.putAll(props);
+            ByteArrayOutputStream baos = new ByteArrayOutputStream(32);
+            for (Iterator iter = p.keySet().iterator(); iter.hasNext();) {
+                String key = (String) iter.next();
+                String val = p.getProperty(key);
+                // now make sure they're in UTF-8
+                //key = new String(key.getBytes(), "UTF-8");
+                //val = new String(val.getBytes(), "UTF-8");
+                writeString(baos, key);
+                baos.write(_equalBytes);
+                writeString(baos, val);
+                baos.write(_semicolonBytes);
+            }
+            baos.close();
+            byte propBytes[] = baos.toByteArray();
+            toLong(target, offset, 2, propBytes.length);
+            offset += 2;
+            System.arraycopy(propBytes, 0, target, offset, propBytes.length);
+            offset += propBytes.length;
+            return offset;
+        } else {
+            toLong(target, offset, 2, 0);
+            return offset + 2;
+        }
+    }
+    
+    public static int fromProperties(byte source[], int offset, Properties target) throws DataFormatException, IOException {
+        int size = (int)fromLong(source, offset, 2);
+        offset += 2;
+        ByteArrayInputStream in = new ByteArrayInputStream(source, offset, size);
+        byte eqBuf[] = new byte[_equalBytes.length];
+        byte semiBuf[] = new byte[_semicolonBytes.length];
+        while (in.available() > 0) {
+            String key = readString(in);
+            int read = read(in, eqBuf);
+            if ((read != eqBuf.length) || (!eq(eqBuf, _equalBytes))) {
+                break;
+            }
+            String val = readString(in);
+            read = read(in, semiBuf);
+            if ((read != semiBuf.length) || (!eq(semiBuf, _semicolonBytes))) {
+                break;
+            }
+            target.put(key, val);
+        }
+        return offset + size;
+    }
 
+    public static byte[] toProperties(Properties opts) {
+        try {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream(2);
+            writeProperties(baos, opts);
+            return baos.toByteArray();
+        } catch (DataFormatException dfe) {
+            throw new RuntimeException("Format error writing to memory?! " + dfe.getMessage());
+        } catch (IOException ioe) {
+            throw new RuntimeException("IO error writing to memory?! " + ioe.getMessage());
+        }
+    }
+    
     /**
      * Pretty print the mapping
      *
@@ -147,9 +211,12 @@ public class DataHelper {
      *
      */
     public static void loadProps(Properties props, File file) throws IOException {
+        loadProps(props, new FileInputStream(file));
+    }
+    public static void loadProps(Properties props, InputStream inStr) throws IOException {
         BufferedReader in = null;
         try {
-            in = new BufferedReader(new InputStreamReader(new FileInputStream(file)), 16*1024);
+            in = new BufferedReader(new InputStreamReader(inStr), 16*1024);
             String line = null;
             while ( (line = in.readLine()) != null) {
                 if (line.trim().length() <= 0) continue;
@@ -258,15 +325,32 @@ public class DataHelper {
         throws DataFormatException, IOException {
         if (numBytes > 8)
             throw new DataFormatException("readLong doesn't currently support reading numbers > 8 bytes [as thats bigger than java's long]");
-        byte data[] = new byte[numBytes];
-        int num = read(rawStream, data);
-        if (num != numBytes)
-            throw new DataFormatException("Not enough bytes [" + num + "] as required for the field [" + numBytes + "]");
 
-        UnsignedInteger val = new UnsignedInteger(data);
-        return val.getLong();
+        long rv = 0;
+        for (int i = 0; i < numBytes; i++) {
+            long cur = rawStream.read() & 0xFF;
+            if (cur == -1) throw new DataFormatException("Not enough bytes for the field");
+            // we loop until we find a nonzero byte (or we reach the end)
+            if (cur != 0) {
+                // ok, data found, now iterate through it to fill the rv
+                long remaining = numBytes - i;
+                for (int j = 0; j < remaining; j++) {
+                    long shiftAmount = 8 * (remaining-j-1);
+                    cur = cur << shiftAmount;
+                    rv += cur;
+                    if (j + 1 < remaining) {
+                        cur = rawStream.read() & 0xFF;
+                        if (cur == -1)
+                            throw new DataFormatException("Not enough bytes for the field");
+                    }
+                }
+                break;
+            }
+        }
+        
+        return rv;
     }
-
+    
     /** Write an integer as defined by the I2P data structure specification to the stream.
      * Integers are a fixed number of bytes (numBytes), stored as unsigned integers in network byte order.
      * @param value value to write out
@@ -277,12 +361,10 @@ public class DataHelper {
      */
     public static void writeLong(OutputStream rawStream, int numBytes, long value) 
         throws DataFormatException, IOException {
-        try {
-            UnsignedInteger.writeBytes(rawStream, numBytes, value);
-            //UnsignedInteger i = new UnsignedInteger(value);
-            //rawStream.write(i.getBytes(numBytes));
-        } catch (IllegalArgumentException iae) {
-            throw new DataFormatException("Invalid value (must be positive)", iae);
+            
+        for (int i = numBytes - 1; i >= 0; i--) {
+            byte cur = (byte)( (value >>> (i*8) ) & 0xFF);
+            rawStream.write(cur);
         }
     }
     
@@ -322,7 +404,7 @@ public class DataHelper {
         for (long i = 0; i <= 0xFFFF; i++)
             testLong(2, i);
         System.out.println("Test 2byte passed");
-        for (long i = 0; i <= 0xFFFFFF; i++)
+        for (long i = 0; i <= 0xFFFFFF; i ++)
             testLong(3, i);
         System.out.println("Test 3byte passed");
         for (long i = 0; i <= 0xFFFFFFFF; i++)
@@ -344,6 +426,9 @@ public class DataHelper {
             long read = fromLong(extract, 0, extract.length);
             if (read != value)
                 throw new RuntimeException("testLong("+numBytes+","+value+") FAILED on read (" + read + ")");
+            read = readLong(new ByteArrayInputStream(written), numBytes);
+            if (read != value)
+                throw new RuntimeException("testLong("+numBytes+","+value+") FAILED on readLong (" + read + ")");
         } catch (Exception e) {
             throw new RuntimeException(e.getMessage());
         }
@@ -384,6 +469,9 @@ public class DataHelper {
         else
             return toLong(DATE_LENGTH, date.getTime());
     }
+    public static void toDate(byte target[], int offset, long when) throws IllegalArgumentException {
+        toLong(target, offset, DATE_LENGTH, when);
+    }
     public static Date fromDate(byte src[], int offset) throws DataFormatException {
         if ( (src == null) || (offset + DATE_LENGTH > src.length) )
             throw new DataFormatException("Not enough data to read a date");
@@ -479,9 +567,29 @@ public class DataHelper {
             writeLong(out, 1, BOOLEAN_FALSE);
     }
     
+    public static Boolean fromBoolean(byte data[], int offset) {
+        if (data[offset] == BOOLEAN_TRUE)
+            return Boolean.TRUE;
+        else if (data[offset] == BOOLEAN_FALSE)
+            return Boolean.FALSE;
+        else
+            return null;
+    }
+    
+    public static void toBoolean(byte data[], int offset, boolean value) {
+        data[offset] = (value ? BOOLEAN_TRUE : BOOLEAN_FALSE);
+    }
+    public static void toBoolean(byte data[], int offset, Boolean value) {
+        if (value == null)
+            data[offset] = BOOLEAN_UNKNOWN;
+        else
+            data[offset] = (value.booleanValue() ? BOOLEAN_TRUE : BOOLEAN_FALSE);
+    }
+    
     public static final byte BOOLEAN_TRUE = 0x1;
     public static final byte BOOLEAN_FALSE = 0x0;
     public static final byte BOOLEAN_UNKNOWN = 0x2;
+    public static final int BOOLEAN_LENGTH = 1;
 
     //
     // The following comparator helpers make it simpler to write consistently comparing
@@ -762,12 +870,13 @@ public class DataHelper {
     public static byte[] compress(byte orig[], int offset, int size) {
         if ((orig == null) || (orig.length <= 0)) return orig;
         try {
-            ByteArrayOutputStream baos = new ByteArrayOutputStream(size);
+            CachingByteArrayOutputStream baos = new CachingByteArrayOutputStream(16, 40*1024);
             GZIPOutputStream out = new GZIPOutputStream(baos, size);
             out.write(orig, offset, size);
             out.finish();
             out.flush();
             byte rv[] = baos.toByteArray();
+            baos.releaseBuffer();
             //if (_log.shouldLog(Log.DEBUG))
             //    _log.debug("Compression of " + orig.length + " into " + rv.length + " (or " + 100.0d
             //               * (((double) orig.length) / ((double) rv.length)) + "% savings)");
@@ -785,7 +894,7 @@ public class DataHelper {
     public static byte[] decompress(byte orig[], int offset, int length) throws IOException {
         if ((orig == null) || (orig.length <= 0)) return orig;
         GZIPInputStream in = new GZIPInputStream(new ByteArrayInputStream(orig, offset, length), length);
-        ByteArrayOutputStream baos = new ByteArrayOutputStream(length * 2);
+        CachingByteArrayOutputStream baos = new CachingByteArrayOutputStream(16, 40*1024);
         ByteCache cache = ByteCache.getInstance(10, 4*1024);
         ByteArray ba = cache.acquire();
         byte buf[] = ba.getData(); // new byte[4 * 1024];
@@ -796,6 +905,7 @@ public class DataHelper {
         }
         byte rv[] = baos.toByteArray();
         cache.release(ba);
+        baos.releaseBuffer();
         //if (_log.shouldLog(Log.DEBUG))
         //    _log.debug("Decompression of " + orig.length + " into " + rv.length + " (or " + 100.0d
         //               * (((double) rv.length) / ((double) orig.length)) + "% savings)");

core/java/src/net/i2p/data/Lease.java

@@ -25,14 +25,14 @@ import net.i2p.util.Log;
  */
 public class Lease extends DataStructureImpl {
     private final static Log _log = new Log(Lease.class);
-    private RouterIdentity _routerIdentity;
+    private Hash _gateway;
     private TunnelId _tunnelId;
     private Date _end;
     private int _numSuccess;
     private int _numFailure;
 
     public Lease() {
-        setRouterIdentity(null);
+        setGateway(null);
         setTunnelId(null);
         setEndDate(null);
         setNumSuccess(0);
@@ -42,15 +42,15 @@ public class Lease extends DataStructureImpl {
     /** Retrieve the router at which the destination can be contacted
      * @return identity of the router acting as a gateway
      */
-    public RouterIdentity getRouterIdentity() {
-        return _routerIdentity;
+    public Hash getGateway() {
+        return _gateway;
     }
 
     /** Configure the router at which the destination can be contacted
      * @param ident router acting as the gateway
      */
-    public void setRouterIdentity(RouterIdentity ident) {
-        _routerIdentity = ident;
+    public void setGateway(Hash ident) {
+        _gateway = ident;
     }
 
     /** Tunnel on the gateway to communicate with
@@ -113,18 +113,18 @@ public class Lease extends DataStructureImpl {
     }
 
     public void readBytes(InputStream in) throws DataFormatException, IOException {
-        _routerIdentity = new RouterIdentity();
-        _routerIdentity.readBytes(in);
+        _gateway = new Hash();
+        _gateway.readBytes(in);
         _tunnelId = new TunnelId();
         _tunnelId.readBytes(in);
         _end = DataHelper.readDate(in);
     }
 
     public void writeBytes(OutputStream out) throws DataFormatException, IOException {
-        if ((_routerIdentity == null) || (_tunnelId == null))
+        if ((_gateway == null) || (_tunnelId == null))
             throw new DataFormatException("Not enough data to write out a Lease");
 
-        _routerIdentity.writeBytes(out);
+        _gateway.writeBytes(out);
         _tunnelId.writeBytes(out);
         DataHelper.writeDate(out, _end);
     }
@@ -133,12 +133,13 @@ public class Lease extends DataStructureImpl {
         if ((object == null) || !(object instanceof Lease)) return false;
         Lease lse = (Lease) object;
         return DataHelper.eq(getEndDate(), lse.getEndDate())
-               && DataHelper.eq(getRouterIdentity(), lse.getRouterIdentity());
+               && DataHelper.eq(getTunnelId(), lse.getTunnelId())
+               && DataHelper.eq(getGateway(), lse.getGateway());
 
     }
 
     public int hashCode() {
-        return DataHelper.hashCode(getEndDate()) + DataHelper.hashCode(getRouterIdentity())
+        return DataHelper.hashCode(getEndDate()) + DataHelper.hashCode(getGateway())
                + DataHelper.hashCode(getTunnelId());
     }
 
@@ -146,7 +147,7 @@ public class Lease extends DataStructureImpl {
         StringBuffer buf = new StringBuffer(128);
         buf.append("[Lease: ");
         buf.append("\n\tEnd Date: ").append(getEndDate());
-        buf.append("\n\tRouter Identity: ").append(getRouterIdentity());
+        buf.append("\n\tGateway: ").append(getGateway());
         buf.append("\n\tTunnelId: ").append(getTunnelId());
         buf.append("]");
         return buf.toString();

core/java/src/net/i2p/data/LeaseSet.java

@@ -74,12 +74,18 @@ public class LeaseSet extends DataStructureImpl {
     }
 
     public void addLease(Lease lease) {
+        if (lease == null) throw new IllegalArgumentException("erm, null lease");
+        if (lease.getGateway() == null) throw new IllegalArgumentException("erm, lease has no gateway");
+        if (lease.getTunnelId() == null) throw new IllegalArgumentException("erm, lease has no tunnel");
         _leases.add(lease);
     }
 
     public void removeLease(Lease lease) {
         _leases.remove(lease);
     }
+    public void removeLease(int index) {
+        _leases.remove(index);
+    }
 
     public int getLeaseCount() {
         return _leases.size();
@@ -208,16 +214,19 @@ public class LeaseSet extends DataStructureImpl {
         for (int i = 0; i < cnt; i++) {
             Lease l = getLease(i);
             if (l.getEndDate().getTime() > insane) {
-                _log.warn("LeaseSet" + calculateHash() + " expires an insane amount in the future - skip it: " + l);
+                if (_log.shouldLog(Log.WARN))
+                    _log.warn("LeaseSet" + calculateHash() + " expires an insane amount in the future - skip it: " + l);
                 return false;
             }
             // if it hasn't finished, we're current
             if (l.getEndDate().getTime() > now) {
-                _log.debug("LeaseSet " + calculateHash() + " isn't exired: " + l);
+                if (_log.shouldLog(Log.DEBUG))
+                    _log.debug("LeaseSet " + calculateHash() + " isn't exired: " + l);
                 return true;
             } else if (l.getEndDate().getTime() > now - fudge) {
-                _log.debug("LeaseSet " + calculateHash()
-                           + " isn't quite expired, but its within the fudge factor so we'll let it slide: " + l);
+                if (_log.shouldLog(Log.DEBUG))
+                    _log.debug("LeaseSet " + calculateHash()
+                               + " isn't quite expired, but its within the fudge factor so we'll let it slide: " + l);
                 return true;
             }
         }
@@ -225,7 +234,14 @@ public class LeaseSet extends DataStructureImpl {
     }
 
     private byte[] getBytes() {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        int len = PublicKey.KEYSIZE_BYTES  // dest
+                + SigningPublicKey.KEYSIZE_BYTES // dest
+                + 4 // cert
+                + PublicKey.KEYSIZE_BYTES // encryptionKey
+                + SigningPublicKey.KEYSIZE_BYTES // signingKey
+                + 1
+                + _leases.size() * 44; // leases
+        ByteArrayOutputStream out = new ByteArrayOutputStream(len);
         try {
             if ((_destination == null) || (_encryptionKey == null) || (_signingKey == null) || (_leases == null))
                 return null;
@@ -244,7 +260,8 @@ public class LeaseSet extends DataStructureImpl {
         } catch (DataFormatException dfe) {
             return null;
         }
-        return out.toByteArray();
+        byte rv[] = out.toByteArray();
+        return rv;
     }
 
     public void readBytes(InputStream in) throws DataFormatException, IOException {

core/java/src/net/i2p/data/RouterInfo.java

@@ -49,6 +49,8 @@ public class RouterInfo extends DataStructureImpl {
     private volatile int _hashCode;
     private volatile boolean _hashCodeInitialized;
 
+    public static final String PROP_NETWORK_ID = "netId";
+    
     public RouterInfo() {
         setIdentity(null);
         setPublished(0);
@@ -243,7 +245,7 @@ public class RouterInfo extends DataStructureImpl {
         if (_options == null) throw new DataFormatException("Router options isn't set? wtf!");
 
         long before = Clock.getInstance().now();
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        ByteArrayOutputStream out = new ByteArrayOutputStream(6*1024);
         try {
             _identity.writeBytes(out);
             DataHelper.writeDate(out, new Date(_published));
@@ -279,6 +281,24 @@ public class RouterInfo extends DataStructureImpl {
         return _isValid;
     }
 
+    /**
+     * which network is this routerInfo a part of.  configured through the property
+     * PROP_NETWORK_ID
+     */
+    public int getNetworkId() {
+        if (_options == null) return -1;
+        String id = null;
+        synchronized (_options) {
+            id = _options.getProperty(PROP_NETWORK_ID);
+        }
+        if (id != null) {
+            try {
+                return Integer.parseInt(id);
+            } catch (NumberFormatException nfe) {}
+        }
+        return -1;
+    }
+        
     /**
      * Get the routing key for the structure using the current modifier in the RoutingKeyGenerator.
      * This only calculates a new one when necessary though (if the generator's key modifier changes)
@@ -422,19 +442,17 @@ public class RouterInfo extends DataStructureImpl {
     public boolean equals(Object object) {
         if ((object == null) || !(object instanceof RouterInfo)) return false;
         RouterInfo info = (RouterInfo) object;
-        return DataHelper.eq(_addresses, info.getAddresses()) 
-               && DataHelper.eq(_identity, info.getIdentity())
-               && DataHelper.eq(_options, info.getOptions()) 
-               && DataHelper.eq(_peers, info.getPeers())
+        return DataHelper.eq(_identity, info.getIdentity())
                && DataHelper.eq(_signature, info.getSignature())
-               && DataHelper.eq(getPublished(), info.getPublished());
+               && DataHelper.eq(getPublished(), info.getPublished())
+               && DataHelper.eq(_addresses, info.getAddresses())
+               && DataHelper.eq(_options, info.getOptions()) 
+               && DataHelper.eq(_peers, info.getPeers());
     }
 
     public int hashCode() {
         if (!_hashCodeInitialized) {
-            _hashCode = DataHelper.hashCode(_addresses) + DataHelper.hashCode(_identity)
-                        + DataHelper.hashCode(_options) + DataHelper.hashCode(_peers)
-                        + DataHelper.hashCode(_signature) + (int) getPublished();
+            _hashCode = DataHelper.hashCode(_identity) + (int) getPublished();
             _hashCodeInitialized = true;
         }
         return _hashCode;

core/java/src/net/i2p/data/TunnelId.java

@@ -27,13 +27,15 @@ public class TunnelId extends DataStructureImpl {
     private long _tunnelId;
     private int _type;
     
-    public static final long MAX_ID_VALUE = (1l<<32l)-1l;
-
+    public static final long MAX_ID_VALUE = (1l<<32l)-2l;
+    
     public final static int TYPE_UNSPECIFIED = 0;
     public final static int TYPE_INBOUND = 1;
     public final static int TYPE_OUTBOUND = 2;
     public final static int TYPE_PARTICIPANT = 3;
     
+    public static final TunnelId INVALID = new TunnelId(0, true);
+    
     public TunnelId() { 
         _tunnelId = -1;
         _type = TYPE_UNSPECIFIED;
@@ -48,6 +50,9 @@ public class TunnelId extends DataStructureImpl {
         _tunnelId = id;
         _type = type;
     }
+    private TunnelId(long id, boolean forceInvalid) {
+        _tunnelId = id;
+    }
     
     public long getTunnelId() { return _tunnelId; }
     public void setTunnelId(long id) { 
@@ -87,7 +92,5 @@ public class TunnelId extends DataStructureImpl {
         return (int)getTunnelId(); 
     }
     
-    public String toString() {
-        return "[TunnelID: " + getTunnelId() + "]";
-    }
+    public String toString() { return String.valueOf(getTunnelId()); }
 }

core/java/src/net/i2p/data/UnsignedInteger.java

@@ -1,290 +0,0 @@
-package net.i2p.data;
-
-/*
- * free (adj.): unencumbered; not under the control of others
- * Written by jrandom in 2003 and released into the public domain 
- * with no warranty of any kind, either expressed or implied.  
- * It probably won't make your computer catch on fire, or eat 
- * your children, but it might.  Use at your own risk.
- *
- */
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.math.BigInteger;
-
-import net.i2p.util.Log;
-
-/**
- * Manage an arbitrarily large unsigned integer, using the first bit and first byte
- * as the most significant one.  Also allows the exporting to byte arrays with whatever
- * padding is requested.
- *
- * WARNING: Range is currently limited to 0 through 2^63-1, due to Java's two's complement
- *          format.  Fix when we need it.
- *
- * @author jrandom
- */
-public class UnsignedInteger {
-    private final static Log _log = new Log(UnsignedInteger.class);
-    private byte[] _data;
-    private long _value;
-
-    /**
-     * Construct the integer from the bytes given, making the value accessible 
-     * immediately.
-     *
-     * @param data unsigned number in network byte order (first bit, first byte 
-     *          is the most significant)
-     */
-    public UnsignedInteger(byte[] data) {
-        // strip off excess bytes
-        int start = 0;
-        for (int i = 0; i < data.length; i++) {
-            if (data[i] == 0) {
-                start++;
-            } else {
-                break;
-            }
-        }
-        _data = new byte[data.length - start];
-        for (int i = 0; i < _data.length; i++)
-            _data[i] = data[i + start];
-        // done stripping excess bytes, now calc
-        _value = calculateValue(_data);
-    }
-
-    /**
-     * Construct the integer with the java number given, making the bytes
-     * available immediately.
-     *
-     * @param value number to represent
-     * @throws IllegalArgumentException if the value is negative
-     */
-    public UnsignedInteger(long value) throws IllegalArgumentException {
-        _value = value;
-        _data = calculateBytes(value);
-    }
-
-    /**
-     * Calculate the value of the array of bytes, treating it as an unsigned integer 
-     * with the most significant bit and byte first
-     *
-     */
-    private static long calculateValue(byte[] data) {
-        if (data == null) {
-            _log.error("Null data to be calculating for", new Exception("Argh"));
-            return 0;
-        } else if (data.length == 0) { return 0; }
-        long rv = 0;
-        for (int i = 0; i < data.length; i++) {
-            long cur = data[i] & 0xFF;
-            if (cur < 0) cur = cur+256;
-            cur = (cur << (8*(data.length-i-1)));
-            rv += cur;
-        }
-        // only fire up this expensive assert if we're worried about it
-        if (_log.shouldLog(Log.DEBUG)) {
-            BigInteger bi = new BigInteger(1, data);
-            long biVal = bi.longValue();
-            if (biVal != rv) {
-                _log.log(Log.CRIT, "ERR: " + bi.toString(2) + " /\t" + bi.toString(16) + " /\t" + bi.toString() 
-                                   + " != \n     " + Long.toBinaryString(rv) + " /\t" + Long.toHexString(rv) 
-                                   + " /\t" + rv);
-                for (int i = 0; i < data.length; i++) {
-                    long cur = data[i] & 0xFF;
-                    if (cur < 0) cur = cur+256;
-                    long shiftBy = (8*(data.length-i-1));
-                    long old = cur;
-                    cur = (cur << shiftBy);
-                    _log.log(Log.CRIT, "cur["+ i+"]=" + Long.toHexString(cur) + " data = " 
-                                       + Long.toHexString((data[i]&0xFF)) + " shiftBy: " + shiftBy 
-                                       + " old: " + Long.toHexString(old));
-                }
-                throw new RuntimeException("b0rked on " + bi.toString() + " / " + rv);
-            }
-        }
-        return rv;
-        
-    }
-
-    /**
-     * hexify the byte array
-     *
-     */
-    private final static String toString(byte[] val) {
-        return "0x" + DataHelper.toString(val, val.length);
-    }
-
-    /**
-     * Calculate the bytes as an unsigned integer with the most significant 
-     * bit and byte in the first position.  The return value always has at least
-     * one byte in it.
-     *
-     * @throws IllegalArgumentException if the value is negative
-     */
-    private static byte[] calculateBytes(long value) throws IllegalArgumentException {
-        if (value < 0) 
-            throw new IllegalArgumentException("unsigned integer, and you want a negative? " + value);
-        byte val[] = new byte[8];
-        val[0] = (byte)(value >>> 56);
-        val[1] = (byte)(value >>> 48);
-        val[2] = (byte)(value >>> 40);
-        val[3] = (byte)(value >>> 32);
-        val[4] = (byte)(value >>> 24);
-        val[5] = (byte)(value >>> 16);
-        val[6] = (byte)(value >>> 8);
-        val[7] = (byte)value;
-        
-        int firstNonZero = -1;
-        for (int i = 0; i < val.length; i++) {
-            if (val[i] != 0x00) {
-                firstNonZero = i;
-                break;
-            }
-        }
-        
-        if (firstNonZero == 0) 
-            return val; 
-        if (firstNonZero == -1)
-            return new byte[1]; // initialized as 0
-        
-        byte rv[] = new byte[8-firstNonZero];
-        System.arraycopy(val, firstNonZero, rv, 0, rv.length);
-        return rv;
-        /*
-        BigInteger bi = new BigInteger("" + value);
-        byte buf[] = bi.toByteArray();
-        if ((buf == null) || (buf.length <= 0))
-            throw new IllegalArgumentException("Value [" + value + "] cannot be transformed");
-        int trim = 0;
-        while ((trim < buf.length) && (buf[trim] == 0x00))
-            trim++;
-        byte rv[] = new byte[buf.length - trim];
-        System.arraycopy(buf, trim, rv, 0, rv.length);
-        return rv;
-         */
-    }
-
-    /**
-     * Get the unsigned bytes, most significant bit and bytes first, without any padding
-     *
-     */
-    public byte[] getBytes() {
-        return _data;
-    }
-
-    /**
-     * Get the unsigned bytes, most significant bit and bytes first, zero padded to the
-     * specified number of bytes
-     *
-     * @throws IllegalArgumentException if numBytes < necessary number of bytes
-     */
-    public byte[] getBytes(int numBytes) throws IllegalArgumentException {
-        if ((_data == null) || (numBytes < _data.length))
-            throw new IllegalArgumentException("Value (" + _value + ") is greater than the requested number of bytes ("
-                                               + numBytes + ")");
-
-        if (numBytes == _data.length) return _data;
-        
-        byte[] data = new byte[numBytes];
-        System.arraycopy(_data, 0, data, numBytes - _data.length, _data.length);
-        return data;
-    }
-    
-    
-    public static void writeBytes(OutputStream rawStream, int numBytes, long value) 
-        throws DataFormatException, IOException {
-        if (value < 0) throw new DataFormatException("Invalid value (" + value + ")");
-        for (int i = numBytes - 1; i >= 0; i--) {
-            byte cur = (byte)( (value >>> (i*8) ) & 0xFF);
-            rawStream.write(cur);
-        }
-    }
-
-    public BigInteger getBigInteger() {
-        return new BigInteger(1, _data);
-    }
-
-    public long getLong() {
-        return _value;
-    }
-
-    public int getInt() {
-        return (int) _value;
-    }
-
-    public short getShort() {
-        return (short) _value;
-    }
-
-    public boolean equals(Object obj) {
-        if ((obj != null) && (obj instanceof UnsignedInteger)) {
-            return DataHelper.eq(_data, ((UnsignedInteger) obj)._data)
-                   && DataHelper.eq(_value, ((UnsignedInteger) obj)._value);
-        }
-        return false;
-    }
-
-    public int hashCode() {
-        return DataHelper.hashCode(_data) + (int) _value;
-    }
-
-    public String toString() {
-        return "UnsignedInteger: " + getLong() + "/" + toString(getBytes());
-    }
-
-    public static void main(String args[]) {
-        try {
-        _log.debug("Testing 1024");
-        testNum(1024L);
-        _log.debug("Testing 1025");
-        testNum(1025L);
-        _log.debug("Testing 2Gb-1");
-        testNum(1024 * 1024 * 1024 * 2L - 1L);
-        _log.debug("Testing 4Gb-1");
-        testNum(1024 * 1024 * 1024 * 4L - 1L);
-        _log.debug("Testing 4Gb");
-        testNum(1024 * 1024 * 1024 * 4L);
-        _log.debug("Testing 4Gb+1");
-        testNum(1024 * 1024 * 1024 * 4L + 1L);
-        _log.debug("Testing MaxLong");
-        testNum(Long.MAX_VALUE);
-        testWrite();
-        } catch (Throwable t) { t.printStackTrace(); }
-        try {
-            Thread.sleep(1000);
-        } catch (Throwable t) { // nop
-        }
-    }
-
-    private static void testNum(long num) {
-        UnsignedInteger i = new UnsignedInteger(num);
-        _log.debug(num + " turned into an unsigned integer: " + i + " (" + i.getLong() + "/" + toString(i.getBytes())
-                   + ")");
-        _log.debug(num + " turned into an BigInteger: " + i.getBigInteger());
-        byte[] val = i.getBytes();
-        UnsignedInteger val2 = new UnsignedInteger(val);
-        _log.debug(num + " turned into a byte array and back again: " + val2 + " (" + val2.getLong() + "/"
-                   + toString(val2.getBytes()) + ")");
-        _log.debug(num + " As an 8 byte array: " + toString(val2.getBytes(8)));
-        BigInteger bi = new BigInteger(num+"");
-        _log.debug(num + " As a bigInteger: 0x" + bi.toString(16));
-        BigInteger tbi = new BigInteger(1, calculateBytes(num));
-        _log.debug(num + " As a shifted   : 0x" + tbi.toString(16));
-    }
-    
-    private static void testWrite() throws Exception {
-        java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream(8);
-        UnsignedInteger i = new UnsignedInteger(12345);
-        baos.write(i.getBytes(8));
-        byte v1[] = baos.toByteArray();
-        baos.reset();
-        UnsignedInteger.writeBytes(baos, 8, 12345);
-        byte v2[] = baos.toByteArray();
-        System.out.println("v1 len: " + v1.length + " v2 len: " + v2.length);
-        System.out.println("v1: " + DataHelper.toHexString(v1));
-        System.out.println("v2: " + DataHelper.toHexString(v2));
-        
-    }
-}

core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java

@@ -18,7 +18,7 @@ import java.util.List;
 
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
-import net.i2p.data.RouterIdentity;
+import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;
 import net.i2p.util.Log;
 
@@ -53,7 +53,7 @@ public class RequestLeaseSetMessage extends I2CPMessageImpl {
         return _endpoints.size();
     }
 
-    public RouterIdentity getRouter(int endpoint) {
+    public Hash getRouter(int endpoint) {
         if ((endpoint < 0) || (_endpoints.size() < endpoint)) return null;
         return ((TunnelEndpoint) _endpoints.get(endpoint)).getRouter();
     }
@@ -67,7 +67,9 @@ public class RequestLeaseSetMessage extends I2CPMessageImpl {
         if ((endpoint >= 0) && (endpoint < _endpoints.size())) _endpoints.remove(endpoint);
     }
 
-    public void addEndpoint(RouterIdentity router, TunnelId tunnel) {
+    public void addEndpoint(Hash router, TunnelId tunnel) {
+        if (router == null) throw new IllegalArgumentException("Null router (tunnel=" + tunnel +")");
+        if (tunnel == null) throw new IllegalArgumentException("Null tunnel (router=" + router +")");
         _endpoints.add(new TunnelEndpoint(router, tunnel));
     }
 
@@ -86,7 +88,7 @@ public class RequestLeaseSetMessage extends I2CPMessageImpl {
             int numTunnels = (int) DataHelper.readLong(in, 1);
             _endpoints.clear();
             for (int i = 0; i < numTunnels; i++) {
-                RouterIdentity router = new RouterIdentity();
+                Hash router = new Hash();
                 router.readBytes(in);
                 TunnelId tunnel = new TunnelId();
                 tunnel.readBytes(in);
@@ -106,7 +108,7 @@ public class RequestLeaseSetMessage extends I2CPMessageImpl {
             _sessionId.writeBytes(os);
             DataHelper.writeLong(os, 1, _endpoints.size());
             for (int i = 0; i < _endpoints.size(); i++) {
-                RouterIdentity router = getRouter(i);
+                Hash router = getRouter(i);
                 router.writeBytes(os);
                 TunnelId tunnel = getTunnelId(i);
                 tunnel.writeBytes(os);
@@ -151,7 +153,7 @@ public class RequestLeaseSetMessage extends I2CPMessageImpl {
     }
 
     private class TunnelEndpoint {
-        private RouterIdentity _router;
+        private Hash _router;
         private TunnelId _tunnelId;
 
         public TunnelEndpoint() {
@@ -159,16 +161,16 @@ public class RequestLeaseSetMessage extends I2CPMessageImpl {
             _tunnelId = null;
         }
 
-        public TunnelEndpoint(RouterIdentity router, TunnelId id) {
+        public TunnelEndpoint(Hash router, TunnelId id) {
             _router = router;
             _tunnelId = id;
         }
 
-        public RouterIdentity getRouter() {
+        public Hash getRouter() {
             return _router;
         }
 
-        public void setRouter(RouterIdentity router) {
+        public void setRouter(Hash router) {
             _router = router;
         }
 

core/java/src/net/i2p/time/NtpClient.java

@@ -33,6 +33,8 @@ import java.io.InterruptedIOException;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
 import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.Collections;
 
 
 /**
@@ -62,8 +64,12 @@ public class NtpClient {
     public static long currentTime(String serverNames[]) {
         if (serverNames == null) 
             throw new IllegalArgumentException("No NTP servers specified");
-        for (int i = 0; i < serverNames.length; i++) {
-            long now = currentTime(serverNames[i]);
+        ArrayList names = new ArrayList(serverNames.length);
+        for (int i = 0; i < serverNames.length; i++)
+            names.add(serverNames[i]);
+        Collections.shuffle(names);
+        for (int i = 0; i < names.size(); i++) {
+            long now = currentTime((String)names.get(i));
             if (now > 0)
                 return now;
         }
@@ -112,8 +118,9 @@ public class NtpClient {
                                        (msg.transmitTimestamp - destinationTimestamp)) / 2;
             socket.close();
             
-            //System.out.println("host: " + serverName + " rtt: " + roundTripDelay + " offset: " + localClockOffset + " seconds");
-            return (long)(System.currentTimeMillis() + localClockOffset*1000);
+            long rv = (long)(System.currentTimeMillis() + localClockOffset*1000);
+            //System.out.println("host: " + address.getHostAddress() + " rtt: " + roundTripDelay + " offset: " + localClockOffset + " seconds");
+            return rv;
         } catch (IOException ioe) {
             //ioe.printStackTrace();
             return -1;

core/java/src/net/i2p/time/Timestamper.java

@@ -20,17 +20,25 @@ public class Timestamper implements Runnable {
     private List _servers;
     private List _listeners;
     private int _queryFrequency;
+    private int _concurringServers;
     private volatile boolean _disabled;
     private boolean _daemon;
+    private boolean _initialized;
     
     private static final int DEFAULT_QUERY_FREQUENCY = 5*60*1000;
     private static final String DEFAULT_SERVER_LIST = "pool.ntp.org, pool.ntp.org";
     private static final boolean DEFAULT_DISABLED = true;
+    /** how many times do we have to query if we are changing the clock? */
+    private static final int DEFAULT_CONCURRING_SERVERS = 2;
     
     public static final String PROP_QUERY_FREQUENCY = "time.queryFrequencyMs";
     public static final String PROP_SERVER_LIST = "time.sntpServerList";
     public static final String PROP_DISABLED = "time.disabled";
+    public static final String PROP_CONCURRING_SERVERS = "time.concurringServers";
     
+    /** if different SNTP servers differ by more than 10s, someone is b0rked */
+    private static final int MAX_VARIANCE = 10*1000;
+        
     public Timestamper(I2PAppContext ctx) {
         this(ctx, null, true);
     }
@@ -41,6 +49,7 @@ public class Timestamper implements Runnable {
     public Timestamper(I2PAppContext ctx, UpdateListener lsnr, boolean daemon) {
         _context = ctx;
         _daemon = daemon;
+        _initialized = false;
         _servers = new ArrayList(1);
         _listeners = new ArrayList(1);
         if (lsnr != null)
@@ -114,10 +123,7 @@ public class Timestamper implements Runnable {
                     if (_log.shouldLog(Log.DEBUG))
                         _log.debug("Querying servers " + _servers);
                     try {
-                        long now = NtpClient.currentTime(serverList);
-                        if (_log.shouldLog(Log.DEBUG))
-                            _log.debug("Stamp time");
-                        stampTime(now);
+                        queryTime(serverList);
                     } catch (IllegalArgumentException iae) {
                         if (!alreadyBitched) 
                             _log.log(Log.CRIT, "Unable to reach any of the NTP servers - network disconnected?");
@@ -132,6 +138,35 @@ public class Timestamper implements Runnable {
         }
     }
     
+    private void queryTime(String serverList[]) throws IllegalArgumentException {
+        long localTime = -1;
+        long now = -1;
+        long expectedDelta = 0;
+        for (int i = 0; i < _concurringServers; i++) {
+            localTime = _context.clock().now();
+            now = NtpClient.currentTime(serverList);
+            
+            long delta = now - localTime;
+            if (i == 0) {
+                if (Math.abs(delta) < MAX_VARIANCE) {
+                    if (_log.shouldLog(Log.INFO))
+                        _log.info("a single SNTP query was within the tolerance (" + delta + "ms)");
+                    return;
+                } else {
+                    // outside the tolerance, lets iterate across the concurring queries
+                    expectedDelta = delta;
+                }
+            } else {
+                if (Math.abs(delta - expectedDelta) > MAX_VARIANCE) {
+                    if (_log.shouldLog(Log.ERROR))
+                        _log.error("SNTP client variance exceeded at query " + i + ".  expected = " + expectedDelta + ", found = " + delta);
+                    return;
+                }
+            }
+        }
+        stampTime(now);
+    }
+    
     /**
      * Send an HTTP request to a given URL specifying the current time 
      */
@@ -142,6 +177,8 @@ public class Timestamper implements Runnable {
                 lsnr.setNow(now);
             }
         }
+        if (_log.shouldLog(Log.DEBUG))
+            _log.debug("Stamped the time as " + now);
     }
  
     /**
@@ -185,6 +222,31 @@ public class Timestamper implements Runnable {
         if (disabled == null)
             disabled = DEFAULT_DISABLED + "";
         _disabled = Boolean.valueOf(disabled).booleanValue();
+        
+        String concurring = _context.getProperty(PROP_CONCURRING_SERVERS);
+        if (concurring == null) {
+            _concurringServers = DEFAULT_CONCURRING_SERVERS;
+        } else {
+            try {
+                int servers = Integer.parseInt(concurring);
+                if ( (servers > 0) && (servers < 5) )
+                    _concurringServers = servers;
+                else
+                    _concurringServers = DEFAULT_CONCURRING_SERVERS;
+            } catch (NumberFormatException nfe) {
+                _concurringServers = DEFAULT_CONCURRING_SERVERS;
+            }
+        }
+    }
+    
+    public static void main(String args[]) {
+        System.setProperty(PROP_DISABLED, "false");
+        System.setProperty(PROP_QUERY_FREQUENCY, "30000");
+        I2PAppContext ctx = I2PAppContext.getGlobalContext();
+        long now = ctx.clock().now();
+        for (int i = 0; i < 5*60*1000; i += 61*1000) {
+            try { Thread.sleep(61*1000); } catch (InterruptedException ie) {}
+        }
     }
     
     /**

core/java/src/net/i2p/util/CachingByteArrayOutputStream.java

@@ -0,0 +1,27 @@
+package net.i2p.util;
+
+import java.io.ByteArrayOutputStream;
+
+import net.i2p.data.ByteArray;
+
+/**
+ * simple extension to the baos to try to use a ByteCache for its 
+ * internal buffer.  This caching only works when the array size 
+ * provided is sufficient for the entire buffer.  After doing what
+ * needs to be done (e.g. write(foo); toByteArray();), call releaseBuffer
+ * to put the buffer back into the cache.
+ * 
+ */
+public class CachingByteArrayOutputStream extends ByteArrayOutputStream {
+    private ByteCache _cache;
+    private ByteArray _buf;
+    
+    public CachingByteArrayOutputStream(int cacheQuantity, int arraySize) {
+        super(0);
+        _cache = ByteCache.getInstance(cacheQuantity, arraySize);
+        _buf = _cache.acquire();
+        super.buf = _buf.getData();
+    }
+    
+    public void releaseBuffer() { _cache.release(_buf); }
+}

core/java/src/net/i2p/util/Clock.java

@@ -18,6 +18,7 @@ public class Clock implements Timestamper.UpdateListener {
     private I2PAppContext _context;
     private Timestamper _timestamper;
     private long _startedOn;
+    private boolean _statCreated;
     
     public Clock(I2PAppContext context) {
         _context = context;
@@ -26,6 +27,7 @@ public class Clock implements Timestamper.UpdateListener {
         _listeners = new HashSet(64);
         _timestamper = new Timestamper(context, this);
         _startedOn = System.currentTimeMillis();
+        _statCreated = false;
     }
     public static Clock getInstance() {
         return I2PAppContext.getGlobalContext().clock();
@@ -78,10 +80,15 @@ public class Clock implements Timestamper.UpdateListener {
                 return;
             }
         }
-        if (_alreadyChanged)
+        if (_alreadyChanged) {
             getLog().log(Log.CRIT, "Updating clock offset to " + offsetMs + "ms from " + _offset + "ms");
-        else
+            if (!_statCreated)
+                _context.statManager().createRateStat("clock.skew", "How far is the already adjusted clock being skewed?", "Clock", new long[] { 10*60*1000, 3*60*60*1000, 24*60*60*60 });
+                _statCreated = true;
+            _context.statManager().addRateData("clock.skew", delta, 0);
+        } else {
             getLog().log(Log.INFO, "Initializing clock offset to " + offsetMs + "ms from " + _offset + "ms");
+        }
         _alreadyChanged = true;
         _offset = offsetMs;
         fireOffsetChanged(delta);