* 2005-10-01 0.6.1.1 released

* Killed three more streaming lib bugs, one of which caused excess packets
      to be transmitted (dupacking dupacks), one that was the root of many of
      the old hung streams (shrinking highest received), and another that was
      releasing data too soon.

apps/addressbook/build.xml

@@ -6,8 +6,7 @@
 	<property name="dist"  location="dist"/>
 	<property name="jar" value="addressbook.jar"/>
 	<property name="war" value="addressbook.war"/>
-	<property name="servlet" value="../jetty/jettylib/javax.servlet.jar"/>
-
+	
 	<target name="init">
 		<mkdir dir="${build}"/>
 		<mkdir dir="${dist}"/>
@@ -22,7 +21,12 @@
 
 	<target name="compile" depends="init">
 		<javac debug="true" deprecation="on" source="1.3" target="1.3" 
-                       srcdir="${src}" destdir="${build}" classpath="${servlet}"/>
+                       srcdir="${src}" destdir="${build}">
+            <classpath>
+                <pathelement location="../../core/java/build/i2p.jar" />
+                <pathelement location="../jetty/jettylib/javax.servlet.jar" />
+            </classpath>
+		</javac>
 	</target>
 
 	<target name="jar" depends="compile">

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

@@ -24,11 +24,12 @@ package addressbook;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.net.URL;
-import java.net.HttpURLConnection;
 import java.io.File;
 import java.io.IOException;
 
+import net.i2p.I2PAppContext;
+import net.i2p.util.EepGet;
+
 /**
  * An address book for storing human readable names mapped to base64 i2p
  * destinations. AddressBooks can be created from local and remote files, merged
@@ -65,14 +66,18 @@ public class AddressBook {
      *            where key is a human readable name, and value is a base64 i2p
      *            destination.
      */
-    public AddressBook(URL url) {
-        this.location = url.getHost();
-
+    public AddressBook(String url, String proxyHost, int proxyPort) {
+        this.location = url;
+        EepGet get = new EepGet(I2PAppContext.getGlobalContext(), true,
+                proxyHost, proxyPort, 0, "addressbook.tmp", url, true, 
+                null);
+        get.fetch();
         try {
-            this.addresses = ConfigParser.parse(url);
+            this.addresses = ConfigParser.parse(new File("addressbook.tmp"));
         } catch (IOException exp) {
             this.addresses = new HashMap();
         }
+        new File("addressbook.tmp").delete();
     }
 
     /**
@@ -83,43 +88,19 @@ public class AddressBook {
      * @param subscription
      *            A Subscription instance pointing at a remote address book.
      */
-    public AddressBook(Subscription subscription) {
+    public AddressBook(Subscription subscription, String proxyHost, int proxyPort) {
         this.location = subscription.getLocation();
-
-        try {
-            URL url = new URL(subscription.getLocation());
-            HttpURLConnection connection = (HttpURLConnection) url
-                    .openConnection();
-            if (subscription.getEtag() != null) {
-                connection.addRequestProperty("If-None-Match", subscription
-                        .getEtag());
-            }
-            if (subscription.getLastModified() != null) {
-                connection.addRequestProperty("If-Modified-Since", subscription
-                        .getLastModified());
-            }
-            connection.connect();
-            if (connection.getResponseCode() == HttpURLConnection.HTTP_NOT_MODIFIED) {
-                connection.disconnect();
-                this.addresses = new HashMap();
-                return;
-            }
-            if (connection.getHeaderField("ETag") != null) {
-                subscription.setEtag(connection.getHeaderField("ETag"));
-            }
-            if (connection.getHeaderField("Last-Modified") != null) {
-                subscription.setLastModified(connection
-                        .getHeaderField("Last-Modified"));
-            }
-        } catch (IOException exp) {
-        }
-
-        try {
-            this.addresses = ConfigParser.parse(new URL(subscription
-                    .getLocation()));
+        EepGet get = new EepGet(I2PAppContext.getGlobalContext(), true,
+                proxyHost, proxyPort, 0, "addressbook.tmp", 
+                subscription.getLocation(), true, subscription.getEtag());
+        get.fetch();
+        subscription.setEtag(get.getETag());
+        try {            
+            this.addresses = ConfigParser.parse(new File("addressbook.tmp"));
         } catch (IOException exp) {
             this.addresses = new HashMap();
         }
+        new File("addressbook.tmp").delete();
     }
 
     /**
@@ -181,7 +162,7 @@ public class AddressBook {
      * @param log
      *            The log to write messages about new addresses or conflicts to.
      */
-    public void merge(AddressBook other, Log log) {
+    public void merge(AddressBook other, boolean overwrite, Log log) {
         Iterator otherIter = other.addresses.keySet().iterator();
 
         while (otherIter.hasNext()) {
@@ -189,7 +170,7 @@ public class AddressBook {
             String otherValue = (String) other.addresses.get(otherKey);
 
             if (otherKey.endsWith(".i2p") && otherValue.length() >= 516) {
-                if (this.addresses.containsKey(otherKey)) {
+                if (this.addresses.containsKey(otherKey) && !overwrite) {
                     if (!this.addresses.get(otherKey).equals(otherValue)
                             && log != null) {
                         log.append("Conflict for " + otherKey + " from "
@@ -197,28 +178,19 @@ public class AddressBook {
                                 + ". Destination in remote address book is "
                                 + otherValue);
                     }
-                } else {
+                } else if (!this.addresses.containsKey(otherKey)
+                            || !this.addresses.get(otherKey).equals(otherValue)) {
                     this.addresses.put(otherKey, otherValue);
                     this.modified = true;
                     if (log != null) {
                         log.append("New address " + otherKey
-                                + " added to address book.");
+                            + " added to address book.");
                     }
                 }
             }
         }
     }
 
-    /**
-     * Merge this AddressBook with other, without logging.
-     * 
-     * @param other
-     *            An AddressBook to merge with.
-     */
-    public void merge(AddressBook other) {
-        this.merge(other, null);
-    }
-
     /**
      * Write the contents of this AddressBook out to the File file. If the file
      * cannot be writen to, this method will silently fail.
@@ -243,4 +215,4 @@ public class AddressBook {
     public void write() {
         this.write(new File(this.location));
     }
-}
+}

apps/addressbook/java/src/addressbook/ConfigParser.java

@@ -27,7 +27,6 @@ import java.util.List;
 import java.util.LinkedList;
 import java.util.Iterator;
 import java.io.*;
-import java.net.URL;
 
 /**
  * Utility class providing methods to parse and write files in config file
@@ -86,24 +85,6 @@ public class ConfigParser {
         return result;
     }
 
-    /**
-     * Return a Map using the contents of the file at url. See
-     * parseBufferedReader for details of the input format.
-     * 
-     * @param url
-     *            A url pointing to a file to parse.
-     * @return A Map containing the key, value pairs from url.
-     * @throws IOException
-     *             if url cannot be read.
-     */
-    public static Map parse(URL url) throws IOException {
-        InputStream urlStream;
-        urlStream = url.openConnection().getInputStream();
-        BufferedReader input = new BufferedReader(new InputStreamReader(
-                urlStream));
-        return ConfigParser.parse(input);
-    }
-
     /**
      * Return a Map using the contents of the File file. See parseBufferedReader
      * for details of the input format.

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

@@ -36,6 +36,7 @@ import java.io.File;
  */
 public class Daemon {
     public static final String VERSION = "2.0.3";
+    private static final Daemon _instance = new Daemon();
     
     /**
      * Update the router and published address books using remote data from the
@@ -56,17 +57,16 @@ public class Daemon {
      * @param log
      *            The log to write changes and conflicts to.
      */
-    public static void update(AddressBook master, AddressBook router,
+    public void update(AddressBook master, AddressBook router,
             File published, SubscriptionList subscriptions, Log log) {
-        String routerLocation = router.getLocation();
-        master.merge(router);
+        router.merge(master, true, null);
         Iterator iter = subscriptions.iterator();
         while (iter.hasNext()) {
-            master.merge((AddressBook) iter.next(), log);
+            router.merge((AddressBook) iter.next(), false, log);
         }
-        master.write(new File(routerLocation));
+        router.write();
         if (published != null)
-            master.write(published);
+            router.write(published);
         subscriptions.write();
     }
 
@@ -78,7 +78,7 @@ public class Daemon {
      * @param home
      *            The directory containing addressbook's configuration files.
      */
-    public static void update(Map settings, String home) {
+    public void update(Map settings, String home) {
         File masterFile = new File(home, (String) settings
                 .get("master_addressbook"));
         File routerFile = new File(home, (String) settings
@@ -101,10 +101,11 @@ public class Daemon {
         defaultSubs.add("http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/hosts.txt");
         
         SubscriptionList subscriptions = new SubscriptionList(subscriptionFile,
-                etagsFile, lastModifiedFile, defaultSubs);
+                etagsFile, lastModifiedFile, defaultSubs, (String) settings
+                .get("proxy_host"), Integer.parseInt((String) settings.get("proxy_port")));
         Log log = new Log(logFile);
 
-        Daemon.update(master, router, published, subscriptions, log);
+        update(master, router, published, subscriptions, log);
     }
 
     /**
@@ -118,6 +119,10 @@ public class Daemon {
      *            others are ignored.
      */
     public static void main(String[] args) {
+        _instance.run(args);
+    }
+    
+    public void run(String[] args) {
         String settingsLocation = "config.txt";
         Map settings = new HashMap();
         String home;
@@ -151,24 +156,36 @@ public class Daemon {
         
         File settingsFile = new File(homeFile, settingsLocation);
         
+        settings = ConfigParser.parse(settingsFile, defaultSettings);
+        // wait
+        try {
+            Thread.currentThread().sleep(5*60*1000);
+        } catch (InterruptedException ie) {}
+        
         while (true) {
-            settings = ConfigParser.parse(settingsFile, defaultSettings);
-
-            System.setProperty("proxySet", "true");
-            System.setProperty("http.proxyHost", (String) settings
-                    .get("proxy_host"));
-            System.setProperty("http.proxyPort", (String) settings
-                    .get("proxy_port"));
             long delay = Long.parseLong((String) settings.get("update_delay"));
             if (delay < 1) {
                 delay = 1;
             }
             
-            Daemon.update(settings, home);
+            update(settings, home);
             try {
-                Thread.sleep(delay * 60 * 60 * 1000);
+                synchronized (this) {
+                    wait(delay * 60 * 60 * 1000);
+                }
             } catch (InterruptedException exp) {
             }
+            settings = ConfigParser.parse(settingsFile, defaultSettings);
+        }
+    }
+ 
+    /**
+     * Call this to get the addressbook to reread its config and 
+     * refetch its subscriptions.
+     */
+    public static void wakeup() {
+        synchronized (_instance) {
+            _instance.notifyAll();
         }
     }
 }

apps/addressbook/java/src/addressbook/DaemonThread.java

@@ -44,10 +44,10 @@ public class DaemonThread extends Thread {
      * @see java.lang.Runnable#run()
      */
     public void run() {
-        try {
-            Thread.sleep(5 * 60 * 1000);
-        } catch (InterruptedException exp) {
-        }
+        //try {
+        //    Thread.sleep(5 * 60 * 1000);
+        //} catch (InterruptedException exp) {
+        //}
         Daemon.main(this.args);
     }
 }

apps/addressbook/java/src/addressbook/SubscriptionIterator.java

@@ -33,6 +33,8 @@ import java.util.List;
 public class SubscriptionIterator implements Iterator {
 
     private Iterator subIterator;
+    private String proxyHost;
+    private int proxyPort;
 
     /**
      * Construct a SubscriptionIterator using the Subscriprions in List subscriptions.
@@ -40,8 +42,10 @@ public class SubscriptionIterator implements Iterator {
      * @param subscriptions
      *            List of Subscription objects that represent address books.
      */
-    public SubscriptionIterator(List subscriptions) {
+    public SubscriptionIterator(List subscriptions, String proxyHost, int proxyPort) {
         this.subIterator = subscriptions.iterator();
+        this.proxyHost = proxyHost;
+        this.proxyPort = proxyPort;
     }
 
     
@@ -49,15 +53,15 @@ public class SubscriptionIterator implements Iterator {
      * @see java.util.Iterator#hasNext()
      */
     public boolean hasNext() {
-        return subIterator.hasNext();
+        return this.subIterator.hasNext();
     }
 
     /* (non-Javadoc)
      * @see java.util.Iterator#next()
      */
     public Object next() {
-        Subscription sub = (Subscription) subIterator.next();
-        return new AddressBook(sub);
+        Subscription sub = (Subscription) this.subIterator.next();
+        return new AddressBook(sub, this.proxyHost, this.proxyPort);
     }
 
     /* (non-Javadoc)

apps/addressbook/java/src/addressbook/SubscriptionList.java

@@ -42,6 +42,10 @@ public class SubscriptionList {
     private File etagsFile;
 
     private File lastModifiedFile;
+    
+    private String proxyHost;
+    
+    private int proxyPort;
 
     /**
      * Construct a SubscriptionList using the urls from locationsFile and, if
@@ -58,15 +62,18 @@ public class SubscriptionList {
      *            GET. The file is in the format "url=leastmodified".
      */
     public SubscriptionList(File locationsFile, File etagsFile,
-            File lastModifiedFile, List defaultSubs) {
+            File lastModifiedFile, List defaultSubs, String proxyHost, 
+            int proxyPort) {
         this.subscriptions = new LinkedList();
         this.etagsFile = etagsFile;
         this.lastModifiedFile = lastModifiedFile;
-        List locations;
+        this.proxyHost = proxyHost;
+        this.proxyPort = proxyPort;
         Map etags;
         Map lastModified;
         String location;
-        locations = ConfigParser.parseSubscriptions(locationsFile, defaultSubs);
+        List locations = ConfigParser.parseSubscriptions(locationsFile, 
+                defaultSubs);
         try {
             etags = ConfigParser.parse(etagsFile);
         } catch (IOException exp) {
@@ -80,11 +87,9 @@ public class SubscriptionList {
         Iterator iter = locations.iterator();
         while (iter.hasNext()) {
             location = (String) iter.next();
-            subscriptions.add(new Subscription(location, (String) etags
+            this.subscriptions.add(new Subscription(location, (String) etags
                     .get(location), (String) lastModified.get(location)));
         }
-
-        iter = this.iterator();
     }
     
     /**
@@ -94,7 +99,8 @@ public class SubscriptionList {
      * @return A SubscriptionIterator.
      */
     public SubscriptionIterator iterator() {
-        return new SubscriptionIterator(this.subscriptions);
+        return new SubscriptionIterator(this.subscriptions, this.proxyHost, 
+                this.proxyPort);
     }
 
     /**

apps/bogobot/Bogobot.java

@@ -111,12 +111,12 @@ public class Bogobot extends PircBot {
         _botShutdownPassword = config.getProperty("botShutdownPassword", "take off eh");
 
         _ircChannel = config.getProperty("ircChannel", "#i2p-chat");
-        _ircServer = config.getProperty("ircServer", "irc.duck.i2p");
+        _ircServer = config.getProperty("ircServer", "irc.postman.i2p");
         _ircServerPort = Integer.parseInt(config.getProperty("ircServerPort", "6668"));
 
         _isLoggerEnabled = Boolean.valueOf(config.getProperty("isLoggerEnabled", "true")).booleanValue();
         _loggedHostnamePattern = config.getProperty("loggedHostnamePattern", "");
-        _logFilePrefix = config.getProperty("logFilePrefix", "irc.duck.i2p.i2p-chat");
+        _logFilePrefix = config.getProperty("logFilePrefix", "irc.postman.i2p.i2p-chat");
         _logFileRotationInterval = config.getProperty("logFileRotationInterval", INTERVAL_DAILY);
 
         _isRoundTripDelayEnabled = Boolean.valueOf(config.getProperty("isRoundTripDelayEnabled", "false")).booleanValue();

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

@@ -8,36 +8,50 @@ package net.i2p.i2ptunnel;
  *
  */
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.FilterOutputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.zip.GZIPInputStream;
+import net.i2p.I2PAppContext;
 import net.i2p.data.ByteArray;
 import net.i2p.util.ByteCache;
+import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
 
 /**
  * Simple stream for delivering an HTTP response to
  * the client, trivially filtered to make sure "Connection: close"
- * is always in the response.
+ * is always in the response.  Perhaps add transparent handling of the
+ * Content-encoding: x-i2p-gzip, adjusting the headers to say Content-encoding: identity?
+ * Content-encoding: gzip is trivial as well, but Transfer-encoding: chunked makes it
+ * more work than is worthwhile at the moment.
  *
  */
 class HTTPResponseOutputStream extends FilterOutputStream {
-    private static final Log _log = new Log(HTTPResponseOutputStream.class);
+    private I2PAppContext _context;
+    private Log _log;
     private ByteCache _cache;
     protected ByteArray _headerBuffer;
     private boolean _headerWritten;
     private byte _buf1[];
+    protected boolean _gzip;
+    private long _dataWritten;
+    private InternalGZIPInputStream _in;
     private static final int CACHE_SIZE = 8*1024;
     
     public HTTPResponseOutputStream(OutputStream raw) {
         super(raw);
+        _context = I2PAppContext.getGlobalContext();
+        _context.statManager().createRateStat("i2ptunnel.httpCompressionRatio", "ratio of compressed size to decompressed size after transfer", "i2ptunnel", new long[] { 60*1000, 30*60*1000 });
+        _context.statManager().createRateStat("i2ptunnel.httpCompressed", "compressed size transferred", "i2ptunnel", new long[] { 60*1000, 30*60*1000 });
+        _context.statManager().createRateStat("i2ptunnel.httpExpanded", "size transferred after expansion", "i2ptunnel", new long[] { 60*1000, 30*60*1000 });
+        _log = _context.logManager().getLog(getClass());
         _cache = ByteCache.getInstance(8, CACHE_SIZE);
         _headerBuffer = _cache.acquire();
         _headerWritten = false;
+        _gzip = false;
+        _dataWritten = 0;
         _buf1 = new byte[1];
     }
 
@@ -51,6 +65,8 @@ class HTTPResponseOutputStream extends FilterOutputStream {
     public void write(byte buf[], int off, int len) throws IOException {
         if (_headerWritten) {
             out.write(buf, off, len);
+            _dataWritten += len;
+            out.flush();
             return;
         }
 
@@ -62,8 +78,12 @@ class HTTPResponseOutputStream extends FilterOutputStream {
             if (headerReceived()) {
                 writeHeader();
                 _headerWritten = true;
-                if (i + 1 < len) // write out the remaining
+                if (i + 1 < len) {
+                    // write out the remaining
                     out.write(buf, off+i+1, len-i-1);
+                    _dataWritten += len-i-1;
+                    out.flush();
+                }
                 return;
             }
         }
@@ -128,7 +148,10 @@ class HTTPResponseOutputStream extends FilterOutputStream {
                             if ( (keyLen <= 0) || (valLen <= 0) )
                                 throw new IOException("Invalid header @ " + j);
                             String key = new String(_headerBuffer.getData(), lastEnd+1, keyLen);
-                            String val = new String(_headerBuffer.getData(), j+2, valLen);
+                            String val = new String(_headerBuffer.getData(), j+2, valLen).trim();
+                            
+                            if (_log.shouldLog(Log.INFO))
+                                _log.info("Response header [" + key + "] = [" + val + "]");
                             
                             if ("Connection".equalsIgnoreCase(key)) {
                                 out.write("Connection: close\n".getBytes());
@@ -136,6 +159,8 @@ class HTTPResponseOutputStream extends FilterOutputStream {
                             } else if ("Proxy-Connection".equalsIgnoreCase(key)) {
                                 out.write("Proxy-Connection: close\n".getBytes());
                                 proxyConnectionSent = true;
+                            } else if ( ("Content-encoding".equalsIgnoreCase(key)) && ("x-i2p-gzip".equalsIgnoreCase(val)) ) {
+                                _gzip = true;
                             } else {
                                 out.write((key.trim() + ": " + val.trim() + "\n").getBytes());
                             }
@@ -152,13 +177,103 @@ class HTTPResponseOutputStream extends FilterOutputStream {
         if (!proxyConnectionSent)
             out.write("Proxy-Connection: close\n".getBytes());
             
-        out.write("\n".getBytes()); // end of the headers
+        finishHeaders();
+
+        boolean shouldCompress = shouldCompress();
+        if (_log.shouldLog(Log.INFO))
+            _log.info("After headers: gzip? " + _gzip + " compress? " + shouldCompress);
         
         // done, shove off
         if (_headerBuffer.getData().length == CACHE_SIZE)
             _cache.release(_headerBuffer);
         else
             _headerBuffer = null;
+        if (shouldCompress) {
+            beginProcessing();
+        }
+    }
+    
+    protected boolean shouldCompress() { return _gzip; }
+    
+    protected void finishHeaders() throws IOException {
+        out.write("\n".getBytes()); // end of the headers
+    }
+    
+    protected void beginProcessing() throws IOException {
+        //out.flush();
+        PipedInputStream pi = new PipedInputStream();
+        PipedOutputStream po = new PipedOutputStream(pi);
+        new I2PThread(new Pusher(pi, out), "HTTP decompresser").start();
+        out = po;
+    }
+    
+    private class Pusher implements Runnable {
+        private InputStream _inRaw;
+        private OutputStream _out;
+        public Pusher(InputStream in, OutputStream out) {
+            _inRaw = in;
+            _out = out;
+        }
+        public void run() {
+            OutputStream to = null;
+            _in = null;
+            long start = System.currentTimeMillis();
+            long written = 0;
+            try {
+                _in = new InternalGZIPInputStream(_inRaw);
+                byte buf[] = new byte[8192];
+                int read = -1;
+                while ( (read = _in.read(buf)) != -1) {
+                    if (_log.shouldLog(Log.DEBUG))
+                        _log.debug("Read " + read + " and writing it to the browser/streams");
+                    _out.write(buf, 0, read);
+                    _out.flush();
+                    written += read;
+                }
+                if (_log.shouldLog(Log.INFO))
+                    _log.info("Decompressed: " + written + ", " + _in.getTotalRead() + "/" + _in.getTotalExpanded());
+            } catch (IOException ioe) {
+                if (_log.shouldLog(Log.WARN))
+                    _log.warn("Error decompressing: " + written + ", " + (_in != null ? _in.getTotalRead() + "/" + _in.getTotalExpanded() : ""), ioe);
+            } finally {
+                if (_log.shouldLog(Log.WARN) && (_in != null))
+                    _log.warn("After decompression, written=" + written + 
+                              (_in != null ?
+                                " read=" + _in.getTotalRead() 
+                                + ", expanded=" + _in.getTotalExpanded() + ", remaining=" + _in.getRemaining() 
+                                + ", finished=" + _in.getFinished()
+                               : ""));
+                if (_out != null) try { 
+                    _out.close(); 
+                } catch (IOException ioe) {}
+            }
+            long end = System.currentTimeMillis();
+            double compressed = (_in != null ? _in.getTotalRead() : 0);
+            double expanded = (_in != null ? _in.getTotalExpanded() : 0);
+            double ratio = 0;
+            if (expanded > 0)
+                ratio = compressed/expanded;
+
+            _context.statManager().addRateData("i2ptunnel.httpCompressionRatio", (int)(100d*ratio), end-start);
+            _context.statManager().addRateData("i2ptunnel.httpCompressed", (long)compressed, end-start);
+            _context.statManager().addRateData("i2ptunnel.httpExpanded", (long)expanded, end-start);
+        }
+    }
+    private class InternalGZIPInputStream extends GZIPInputStream {
+        public InternalGZIPInputStream(InputStream in) throws IOException {
+            super(in);
+        }
+        public long getTotalRead() { return super.inf.getTotalIn(); }
+        public long getTotalExpanded() { return super.inf.getTotalOut(); }
+        public long getRemaining() { return super.inf.getRemaining(); }
+        public boolean getFinished() { return super.inf.finished(); }
+        public String toString() { 
+            return "Read: " + getTotalRead() + " expanded: " + getTotalExpanded() + " remaining: " + getRemaining() + " finished: " + getFinished();
+        }
+    }
+    
+    public String toString() {
+        return super.toString() + ": " + _in;
     }
     
     public static void main(String args[]) {

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

@@ -109,8 +109,9 @@ public class I2PTunnel implements Logging, EventDispatcher {
         _tunnelId = ++__tunnelId;
         _log = _context.logManager().getLog(I2PTunnel.class);
         _event = new EventDispatcherImpl();
-        _clientOptions = new Properties();
-        _clientOptions.putAll(System.getProperties());
+        Properties p = new Properties();
+        p.putAll(System.getProperties());
+        _clientOptions = p;
         _sessions = new ArrayList(1);
         
         addConnectionEventListener(lsnr);
@@ -1146,6 +1147,8 @@ public class I2PTunnel implements Logging, EventDispatcher {
     }
     
     private String getPrefix() { return '[' + _tunnelId + "]: "; }
+    
+    public I2PAppContext getContext() { return _context; }
 
     /**
      * Call this whenever we lose touch with the router involuntarily (aka the router

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

@@ -101,6 +101,10 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
         this.l = l;
         this.handlerName = handlerName + _clientId;
 
+        // no need to load the netDb with leaseSets for destinations that will never 
+        // be looked up
+        tunnel.getClientOptions().setProperty("i2cp.dontPublishLeaseSet", "true");
+        
         while (sockMgr == null) {
             synchronized (sockLock) {
                 if (ownDest) {
@@ -110,7 +114,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
                 }
             }
             if (sockMgr == null) {
-                _log.log(Log.CRIT, "Unable to create socket manager");
+                _log.log(Log.CRIT, "Unable to create socket manager (our own? " + ownDest + ")");
                 try { Thread.sleep(10*1000); } catch (InterruptedException ie) {}
             }
         }

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

@@ -96,6 +96,22 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
          "HTTP outproxy configured.  Please configure an outproxy in I2PTunnel")
          .getBytes();
     
+    private final static byte[] ERR_AHELPER_CONFLICT =
+        ("HTTP/1.1 409 Conflict\r\n"+
+         "Content-Type: text/html; charset=iso-8859-1\r\n"+
+         "Cache-control: no-cache\r\n"+
+         "\r\n"+
+         "<html><body><H1>I2P ERROR: Destination key conflict</H1>"+
+         "The addresshelper link you followed specifies a different destination key "+
+         "than a host entry in your host database. "+
+         "Someone could be trying to impersonate another eepsite, "+
+         "or people have given two eepsites identical names.<P/>"+
+         "You can resolve the conflict by considering which key you trust, "+
+         "and either discarding the addresshelper link, "+
+         "discarding the host entry from your host database, "+
+         "or naming one of them differently.<P/>")
+         .getBytes();
+    
     /** used to assign unique IDs to the threads / clients.  no logic or functionality */
     private static volatile long __clientId = 0;
 
@@ -179,6 +195,8 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
         return opts;
     }
 
+    private static final boolean DEFAULT_GZIP = true;
+    
     private static long __requestId = 0;
     protected void clientConnectionRun(Socket s) {
         OutputStream out = null;
@@ -243,50 +261,102 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
 
                     // Quick hack for foo.bar.i2p
                     if (host.toLowerCase().endsWith(".i2p")) {
+                        // Destination gets the host name
                         destination = host;
+                        // Host becomes the destination key
                         host = getHostName(destination);
-                        if ( (host != null) && ("i2p".equals(host)) ) {
-                            int pos2;
-                            if ((pos2 = request.indexOf("?")) != -1) {
-                                // Try to find an address helper in the fragments
-                                // and split the request into it's component parts for rebuilding later
-                                String fragments = request.substring(pos2 + 1);
-                                String uriPath = request.substring(0, pos2);
-                                pos2 = fragments.indexOf(" ");
-                                String protocolVersion = fragments.substring(pos2 + 1);
-                                String urlEncoding = "";
-                                fragments = fragments.substring(0, pos2);
-                                fragments = fragments + "&";
-                                String fragment;
-                                while(fragments.length() > 0) {
-                                    pos2 = fragments.indexOf("&");
-                                    fragment = fragments.substring(0, pos2);
-                                    fragments = fragments.substring(pos2 + 1);
-                                    if (fragment.startsWith("i2paddresshelper")) {
-                                        pos2 = fragment.indexOf("=");
-                                        if (pos2 >= 0) {
-                                            addressHelpers.put(destination,fragment.substring(pos2 + 1));
-                                        }
-                                    } else {
-                                        // append each fragment unless it's the address helper
-                                        if ("".equals(urlEncoding)) {
-                                            urlEncoding = "?" + fragment;
-                                        } else {
-                                            urlEncoding = urlEncoding + "&" + fragment; 
-                                        }
-				    }
-                                }
-                                // reconstruct the request minus the i2paddresshelper GET var
-                                request = uriPath + urlEncoding + " " + protocolVersion;
-                            }
 
-                            String addressHelper = (String) addressHelpers.get(destination);
-                            if (addressHelper != null) {
-                                destination = addressHelper;
-                                host = getHostName(destination);
-                                ahelper = 1;
+                        int pos2;
+                        if ((pos2 = request.indexOf("?")) != -1) {
+                            // Try to find an address helper in the fragments
+                            // and split the request into it's component parts for rebuilding later
+                            String ahelperKey = null;
+                            boolean ahelperConflict = false;
+                            
+                            String fragments = request.substring(pos2 + 1);
+                            String uriPath = request.substring(0, pos2);
+                            pos2 = fragments.indexOf(" ");
+                            String protocolVersion = fragments.substring(pos2 + 1);
+                            String urlEncoding = "";
+                            fragments = fragments.substring(0, pos2);
+                            String initialFragments = fragments;
+                            fragments = fragments + "&";
+                            String fragment;
+                            while(fragments.length() > 0) {
+                                pos2 = fragments.indexOf("&");
+                                fragment = fragments.substring(0, pos2);
+                                fragments = fragments.substring(pos2 + 1);
+                                
+                                // Fragment looks like addresshelper key
+                                if (fragment.startsWith("i2paddresshelper=")) {
+                                    pos2 = fragment.indexOf("=");
+                                    ahelperKey = fragment.substring(pos2 + 1);
+                                    
+                                    // Key contains data, lets not ignore it
+                                    if (ahelperKey != null) {
+                                        
+                                        // Host resolvable only with addresshelper
+                                        if ( (host == null) || ("i2p".equals(host)) )
+                                        {
+                                            // Cannot check, use addresshelper key
+                                            addressHelpers.put(destination,ahelperKey);
+                                        } else {
+                                            // Host resolvable from database, verify addresshelper key
+                                            // Silently bypass correct keys, otherwise alert
+                                            if (!host.equals(ahelperKey))
+                                            {
+                                                // Conflict: handle when URL reconstruction done
+                                                ahelperConflict = true;
+                                                if (_log.shouldLog(Log.WARN))
+                                                    _log.warn(getPrefix(requestId) + "Addresshelper key conflict for site [" + destination + "], trusted key [" + host + "], specified key [" + ahelperKey + "].");
+                                            }
+                                        }
+                                    }
+                                } else {
+                                    // Other fragments, just pass along
+                                    // Append each fragment to urlEncoding
+                                    if ("".equals(urlEncoding)) {
+                                        urlEncoding = "?" + fragment;
+                                    } else {
+                                        urlEncoding = urlEncoding + "&" + fragment; 
+                                    }
+                                }
+                            }
+                            // Reconstruct the request minus the i2paddresshelper GET var
+                            request = uriPath + urlEncoding + " " + protocolVersion;
+                            
+                            // Did addresshelper key conflict?
+                            if (ahelperConflict)
+                            {
+                                String str;
+                                byte[] header;
+                                str = FileUtil.readTextFile("docs/ahelper-conflict-header.ht", 100, true);
+                                if (str != null) header = str.getBytes();
+                                  else header = ERR_AHELPER_CONFLICT;
+
+                                if (out != null) {
+                                    long alias = I2PAppContext.getGlobalContext().random().nextLong();
+                                    String trustedURL = protocol + uriPath + urlEncoding;
+                                    String conflictURL = protocol + alias + ".i2p/?" + initialFragments;
+                                    out.write(header);
+                                    out.write(("To visit the destination in your host database, click <a href=\"" + trustedURL + "\">here</a>. To visit the conflicting addresshelper link by temporarily giving it a random alias, click <a href=\"" + conflictURL + "\">here</a>.<P/>").getBytes());
+                                    out.write("</div><p><i>I2P HTTP Proxy Server<br>Generated on: ".getBytes());
+                                    out.write(new Date().toString().getBytes());
+                                    out.write("</i></body></html>\n".getBytes());
+                                    out.flush();
+                                }
+                                s.close();
+                                return;
                             }
                         }
+
+                        String addressHelper = (String) addressHelpers.get(destination);
+                        if (addressHelper != null) {
+                            destination = addressHelper;
+                            host = getHostName(destination);
+                            ahelper = 1;
+                        }
+                        
                         line = method + " " + request.substring(pos);
                     } else if (host.indexOf(".") != -1) {
                         // The request must be forwarded to a WWW proxy
@@ -369,6 +439,13 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
                 }
                 
                 if (line.length() == 0) {
+                    
+                    String ok = getTunnel().getContext().getProperty("i2ptunnel.gzip");
+                    boolean gzip = DEFAULT_GZIP;
+                    if (ok != null)
+                        gzip = Boolean.valueOf(ok).booleanValue();
+                    if (gzip)
+                        newRequest.append("Accept-Encoding: x-i2p-gzip\r\n");
                     newRequest.append("User-Agent: MYOB/6.66 (AN/ON)\r\n");
                     newRequest.append("Connection: close\r\n\r\n");
                     break;

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

@@ -3,16 +3,13 @@
  */
 package net.i2p.i2ptunnel;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.FilterOutputStream;
+import java.io.*;
 import java.net.Socket;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 
+import net.i2p.I2PAppContext;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.data.ByteArray;
 import net.i2p.data.DataHelper;
@@ -30,12 +27,38 @@ import net.i2p.util.Log;
  *
  */
 public class I2PTunnelHTTPClientRunner extends I2PTunnelRunner {
+    private Log _log;
     public I2PTunnelHTTPClientRunner(Socket s, I2PSocket i2ps, Object slock, byte[] initialI2PData, List sockList, Runnable onTimeout) {
         super(s, i2ps, slock, initialI2PData, sockList, onTimeout);
+        _log = I2PAppContext.getGlobalContext().logManager().getLog(I2PTunnelHTTPClientRunner.class);
     }
 
     protected OutputStream getSocketOut() throws IOException { 
         OutputStream raw = super.getSocketOut();
         return new HTTPResponseOutputStream(raw);
     }
+        
+    protected void close(OutputStream out, InputStream in, OutputStream i2pout, InputStream i2pin, Socket s, I2PSocket i2ps, Thread t1, Thread t2) throws InterruptedException, IOException {
+        try { 
+            i2pin.close();
+            i2pout.close();
+        } catch (IOException ioe) {
+            // ignore
+            if (_log.shouldLog(Log.DEBUG))
+                _log.debug("Unable to close the i2p socket output stream: " + i2pout, ioe);
+        }
+        try { 
+            in.close();
+            out.close(); 
+        } catch (IOException ioe) { 
+            // ignore
+            if (_log.shouldLog(Log.DEBUG))
+                _log.debug("Unable to close the browser output stream: " + out, ioe);
+        }
+        i2ps.close();
+        s.close();
+        t1.join(30*1000);
+        t2.join(30*1000);
+    }
+    
 }

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

@@ -3,14 +3,13 @@
  */
 package net.i2p.i2ptunnel;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.net.SocketException;
 import java.util.Iterator;
 import java.util.Properties;
+import java.util.zip.GZIPOutputStream;
 
 import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
@@ -24,7 +23,9 @@ import net.i2p.util.Log;
 /**
  * Simple extension to the I2PTunnelServer that filters the HTTP
  * headers sent from the client to the server, replacing the Host
- * header with whatever this instance has been configured with.
+ * header with whatever this instance has been configured with, and
+ * if the browser set Accept-encoding: x-i2p-gzip, gzip the http 
+ * message body and set Content-encoding: x-i2p-gzip.
  *
  */
 public class I2PTunnelHTTPServer extends I2PTunnelServer {
@@ -35,87 +36,204 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
     public I2PTunnelHTTPServer(InetAddress host, int port, String privData, String spoofHost, Logging l, EventDispatcher notifyThis, I2PTunnel tunnel) {
         super(host, port, privData, l, notifyThis, tunnel);
         _spoofHost = spoofHost;
+        getTunnel().getContext().statManager().createRateStat("i2ptunnel.httpserver.blockingHandleTime", "how long the blocking handle takes to complete", "I2PTunnel.HTTPServer", new long[] { 60*1000, 10*60*1000, 3*60*60*1000 });
     }
 
     public I2PTunnelHTTPServer(InetAddress host, int port, File privkey, String privkeyname, String spoofHost, Logging l, EventDispatcher notifyThis, I2PTunnel tunnel) {
         super(host, port, privkey, privkeyname, l, notifyThis, tunnel);
         _spoofHost = spoofHost;
+        getTunnel().getContext().statManager().createRateStat("i2ptunnel.httpserver.blockingHandleTime", "how long the blocking handle takes to complete", "I2PTunnel.HTTPServer", new long[] { 60*1000, 10*60*1000, 3*60*60*1000 });
     }
 
     public I2PTunnelHTTPServer(InetAddress host, int port, InputStream privData, String privkeyname, String spoofHost, Logging l, EventDispatcher notifyThis, I2PTunnel tunnel) {
         super(host, port, privData, privkeyname, l, notifyThis, tunnel);
-        _spoofHost = spoofHost;
+        _spoofHost = spoofHost;        
+        getTunnel().getContext().statManager().createRateStat("i2ptunnel.httpserver.blockingHandleTime", "how long the blocking handle takes to complete", "I2PTunnel.HTTPServer", new long[] { 60*1000, 10*60*1000, 3*60*60*1000 });
     }
 
-    public void run() {
-        try {
-            I2PServerSocket i2pss = sockMgr.getServerSocket();
-            while (true) {
-                I2PSocket i2ps = i2pss.accept();
-                if (i2ps == null) throw new I2PException("I2PServerSocket closed");
-                I2PThread t = new I2PThread(new Handler(i2ps));
-                t.start();
-            }
-        } catch (I2PException ex) {
-            _log.error("Error while waiting for I2PConnections", ex);
-        } catch (IOException ex) {
-            _log.error("Error while waiting for I2PConnections", ex);
-        }
-    }
-    
     /**
-     * Async handler to keep .accept() from blocking too long.  
-     * todo: replace with a thread pool so we dont get overrun by threads if/when
-     * receiving a lot of connection requests concurrently.
+     * Called by the thread pool of I2PSocket handlers
      *
      */
-    private class Handler implements Runnable { 
-        private I2PSocket _handleSocket;
-        public Handler(I2PSocket socket) {
-            _handleSocket = socket;
-        }
-        public void run() {
-            long afterAccept = I2PAppContext.getGlobalContext().clock().now();
-            long afterSocket = -1;
-            
-            //local is fast, so synchronously. Does not need that many
-            //threads.
-            try {
-                _handleSocket.setReadTimeout(readTimeout);
-                String modifiedHeader = getModifiedHeader();
-                if (_log.shouldLog(Log.DEBUG))
-                    _log.debug("Modified header: [" + modifiedHeader + "]");
-            
-                Socket s = new Socket(remoteHost, remotePort);
-                afterSocket = I2PAppContext.getGlobalContext().clock().now();
-                new I2PTunnelRunner(s, _handleSocket, slock, null, modifiedHeader.getBytes(), null);
-            } catch (SocketException ex) {
-                try {
-                    _handleSocket.close();
-                } catch (IOException ioe) {
-                    _log.error("Error while closing the received i2p con", ex);
-                }
-            } catch (IOException ex) {
-                _log.error("Error while waiting for I2PConnections", ex);
-            }
-            
-            long afterHandle = I2PAppContext.getGlobalContext().clock().now();
-            long timeToHandle = afterHandle - afterAccept;
-            if (timeToHandle > 1000)
-                _log.warn("Took a while to handle the request [" + timeToHandle + ", socket create: " 
-                          + (afterSocket-afterAccept) + "]");
-        }
-        private String getModifiedHeader() throws IOException {
-            InputStream in = _handleSocket.getInputStream();
-            
+    protected void blockingHandle(I2PSocket socket) {
+        long afterAccept = getTunnel().getContext().clock().now();
+        long afterSocket = -1;
+        //local is fast, so synchronously. Does not need that many
+        //threads.
+        try {
+            // give them 5 seconds to send in the HTTP request
+            socket.setReadTimeout(5*1000);
+
+            InputStream in = socket.getInputStream();
+
             StringBuffer command = new StringBuffer(128);
             Properties headers = readHeaders(in, command);
-            headers.setProperty("Host", _spoofHost);
+            if ( (_spoofHost != null) && (_spoofHost.trim().length() > 0) )
+                headers.setProperty("Host", _spoofHost);
             headers.setProperty("Connection", "close");
-            return formatHeaders(headers, command);
+            // we keep the enc sent by the browser before clobbering it, since it may have 
+            // been x-i2p-gzip
+            String enc = headers.getProperty("Accept-encoding");
+            headers.setProperty("Accept-encoding", "identity;q=1, *;q=0");
+            String modifiedHeader = formatHeaders(headers, command);
+            
+            //String modifiedHeader = getModifiedHeader(socket);
+            if (_log.shouldLog(Log.DEBUG))
+                _log.debug("Modified header: [" + modifiedHeader + "]");
+
+            socket.setReadTimeout(readTimeout);
+            Socket s = new Socket(remoteHost, remotePort);
+            afterSocket = getTunnel().getContext().clock().now();
+            // instead of i2ptunnelrunner, use something that reads the HTTP 
+            // request from the socket, modifies the headers, sends the request to the 
+            // server, reads the response headers, rewriting to include Content-encoding: x-i2p-gzip
+            // if it was one of the Accept-encoding: values, and gzip the payload       
+            Properties opts = getTunnel().getClientOptions();
+            boolean allowGZIP = true;
+            if (opts != null) {
+                String val = opts.getProperty("i2ptunnel.gzip");
+                if ( (val != null) && (!Boolean.valueOf(val).booleanValue()) ) 
+                    allowGZIP = false;
+            }
+            if (_log.shouldLog(Log.INFO))
+                _log.info("HTTP server encoding header: " + enc);
+            if ( allowGZIP && (enc != null) && (enc.indexOf("x-i2p-gzip") >= 0) ) {
+                I2PThread req = new I2PThread(new CompressedRequestor(s, socket, modifiedHeader), "http compressor");
+                req.start();
+            } else {
+                new I2PTunnelRunner(s, socket, slock, null, modifiedHeader.getBytes(), null);
+            }
+        } catch (SocketException ex) {
+            try {
+                socket.close();
+            } catch (IOException ioe) {
+                if (_log.shouldLog(Log.ERROR))
+                    _log.error("Error while closing the received i2p con", ex);
+            }
+        } catch (IOException ex) {
+            if (_log.shouldLog(Log.WARN))
+                _log.warn("Error while receiving the new HTTP request", ex);
         }
+
+        long afterHandle = getTunnel().getContext().clock().now();
+        long timeToHandle = afterHandle - afterAccept;
+        getTunnel().getContext().statManager().addRateData("i2ptunnel.httpserver.blockingHandleTime", timeToHandle, 0);
+        if ( (timeToHandle > 1000) && (_log.shouldLog(Log.WARN)) )
+            _log.warn("Took a while to handle the request [" + timeToHandle + ", socket create: " + (afterSocket-afterAccept) + "]");
     }
     
+    private class CompressedRequestor implements Runnable {
+        private Socket _webserver;
+        private I2PSocket _browser;
+        private String _headers;
+        public CompressedRequestor(Socket webserver, I2PSocket browser, String headers) {
+            _webserver = webserver;
+            _browser = browser;
+            _headers = headers;
+        }
+        public void run() {
+            if (_log.shouldLog(Log.INFO))
+                _log.info("Compressed requestor running");
+            OutputStream serverout = null;
+            OutputStream browserout = null;
+            InputStream browserin = null;
+            InputStream serverin = null;
+            try {
+                serverout = _webserver.getOutputStream();
+                
+                if (_log.shouldLog(Log.INFO))
+                    _log.info("request headers: " + _headers);
+                serverout.write(_headers.getBytes());
+                browserin = _browser.getInputStream();
+                I2PThread sender = new I2PThread(new Sender(serverout, browserin, "server: browser to server"), "http compressed sender");
+                sender.start();
+                
+                browserout = _browser.getOutputStream();
+                serverin = _webserver.getInputStream(); 
+                CompressedResponseOutputStream compressedOut = new CompressedResponseOutputStream(browserout);
+                Sender s = new Sender(compressedOut, serverin, "server: server to browser");
+                if (_log.shouldLog(Log.INFO))
+                    _log.info("Before pumping the compressed response");
+                s.run(); // same thread
+                if (_log.shouldLog(Log.INFO))
+                    _log.info("After pumping the compressed response: " + compressedOut.getTotalRead() + "/" + compressedOut.getTotalCompressed());
+            } catch (IOException ioe) {
+                if (_log.shouldLog(Log.WARN))
+                    _log.warn("error compressing", ioe);
+            } finally {
+                if (browserout != null) try { browserout.close(); } catch (IOException ioe) {}
+                if (serverout != null) try { serverout.close(); } catch (IOException ioe) {}
+                if (browserin != null) try { browserin.close(); } catch (IOException ioe) {}
+                if (serverin != null) try { serverin.close(); } catch (IOException ioe) {}
+            }
+        }
+    }
+    private class Sender implements Runnable {
+        private OutputStream _out;
+        private InputStream _in;
+        private String _name;
+        public Sender(OutputStream out, InputStream in, String name) {
+            _out = out;
+            _in = in;
+            _name = name;
+        }
+        public void run() {
+            if (_log.shouldLog(Log.INFO))
+                _log.info(_name + ": Begin sending");
+            try {
+                byte buf[] = new byte[16*1024];
+                int read = 0;
+                int total = 0;
+                while ( (read = _in.read(buf)) != -1) {
+                    if (_log.shouldLog(Log.INFO))
+                        _log.info(_name + ": read " + read + " and sending through the stream");
+                    _out.write(buf, 0, read);
+                    total += read;
+                }
+                if (_log.shouldLog(Log.INFO))
+                    _log.info(_name + ": Done sending: " + total);
+                _out.flush();
+            } catch (IOException ioe) {
+                if (_log.shouldLog(Log.DEBUG))
+                    _log.debug("Error sending", ioe);
+            } finally {
+                if (_in != null) try { _in.close(); } catch (IOException ioe) {}
+                if (_out != null) try { _out.close(); } catch (IOException ioe) {}
+            }
+        }
+    }
+    private class CompressedResponseOutputStream extends HTTPResponseOutputStream {
+        private InternalGZIPOutputStream _gzipOut;
+        public CompressedResponseOutputStream(OutputStream o) {
+            super(o);
+        }
+        
+        protected boolean shouldCompress() { return true; }
+        protected void finishHeaders() throws IOException {
+            if (_log.shouldLog(Log.INFO))
+                _log.info("Including x-i2p-gzip as the content encoding in the response");
+            out.write("Content-encoding: x-i2p-gzip\n".getBytes());
+            super.finishHeaders();
+        }
+
+        protected void beginProcessing() throws IOException {
+            if (_log.shouldLog(Log.INFO))
+                _log.info("Beginning compression processing");
+            out.flush();
+            _gzipOut = new InternalGZIPOutputStream(out);
+            out = _gzipOut;
+        }
+        public long getTotalRead() { return _gzipOut.getTotalRead(); }
+        public long getTotalCompressed() { return _gzipOut.getTotalCompressed(); }
+    }
+    private class InternalGZIPOutputStream extends GZIPOutputStream {
+        public InternalGZIPOutputStream(OutputStream target) throws IOException {
+            super(target);
+        }
+        public long getTotalRead() { return super.def.getTotalIn(); }
+        public long getTotalCompressed() { return super.def.getTotalOut(); }
+    }
+
     private String formatHeaders(Properties headers, StringBuffer command) {
         StringBuffer buf = new StringBuffer(command.length() + headers.size() * 64);
         buf.append(command.toString()).append('\n');
@@ -150,6 +268,8 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
                 if (split <= 0) throw new IOException("Invalid HTTP header, missing colon [" + buf.toString() + "]");
                 String name = buf.substring(0, split);
                 String value = buf.substring(split+2); // ": "
+                if ("Accept-encoding".equalsIgnoreCase(name))
+                    name = "Accept-encoding";
                 headers.setProperty(name, value);
                 if (_log.shouldLog(Log.DEBUG))
                     _log.debug("Read the header [" + name + "] = [" + value + "]");

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

@@ -153,11 +153,8 @@ public class I2PTunnelRunner extends I2PThread implements I2PSocket.SocketErrorL
                     onTimeout.run();
             }
             
-            // now one connection is dead - kill the other as well.
-            s.close();
-            i2ps.close();
-            t1.join(30*1000);
-            t2.join(30*1000);
+            // now one connection is dead - kill the other as well, after making sure we flush
+            close(out, in, i2pout, i2pin, s, i2ps, t1, t2);
         } catch (InterruptedException ex) {
             if (_log.shouldLog(Log.ERROR))
                 _log.error("Interrupted", ex);
@@ -188,6 +185,27 @@ public class I2PTunnelRunner extends I2PThread implements I2PSocket.SocketErrorL
         }
     }
     
+    protected void close(OutputStream out, InputStream in, OutputStream i2pout, InputStream i2pin, Socket s, I2PSocket i2ps, Thread t1, Thread t2) throws InterruptedException, IOException {
+        try { 
+            out.flush(); 
+        } catch (IOException ioe) { 
+            // ignore
+        }
+        try { 
+            i2pout.flush();
+        } catch (IOException ioe) {
+            // ignore
+        }
+        in.close();
+        i2pin.close();
+        // ok, yeah, there's a race here in theory, if data comes in after flushing and before
+        // closing, but its better than before...
+        s.close();
+        i2ps.close();
+        t1.join(30*1000);
+        t2.join(30*1000);
+    }
+    
     public void errorOccurred() {
         synchronized (finishLock) {
             finished = true;

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

@@ -11,6 +11,7 @@ import java.io.InputStream;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.net.SocketException;
+import java.net.ConnectException;
 import java.util.Iterator;
 import java.util.Properties;
 
@@ -39,6 +40,7 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
 
     protected InetAddress remoteHost;
     protected int remotePort;
+    private boolean _usePool;
 
     private Logging l;
 
@@ -46,15 +48,27 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
     /** default timeout to 3 minutes - override if desired */
     protected long readTimeout = DEFAULT_READ_TIMEOUT;
 
+    private static final boolean DEFAULT_USE_POOL = false;
+    
     public I2PTunnelServer(InetAddress host, int port, String privData, Logging l, EventDispatcher notifyThis, I2PTunnel tunnel) {
         super(host + ":" + port + " <- " + privData, notifyThis, tunnel);
         ByteArrayInputStream bais = new ByteArrayInputStream(Base64.decode(privData));
+        String usePool = tunnel.getClientOptions().getProperty("i2ptunnel.usePool");
+        if (usePool != null)
+            _usePool = "true".equalsIgnoreCase(usePool);
+        else
+            _usePool = DEFAULT_USE_POOL;
         init(host, port, bais, privData, l);
     }
 
     public I2PTunnelServer(InetAddress host, int port, File privkey, String privkeyname, Logging l,
                            EventDispatcher notifyThis, I2PTunnel tunnel) {
         super(host + ":" + port + " <- " + privkeyname, notifyThis, tunnel);
+        String usePool = tunnel.getClientOptions().getProperty("i2ptunnel.usePool");
+        if (usePool != null)
+            _usePool = "true".equalsIgnoreCase(usePool);
+        else
+            _usePool = DEFAULT_USE_POOL;
         try {
             init(host, port, new FileInputStream(privkey), privkeyname, l);
         } catch (IOException ioe) {
@@ -65,6 +79,11 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
 
     public I2PTunnelServer(InetAddress host, int port, InputStream privData, String privkeyname, Logging l,  EventDispatcher notifyThis, I2PTunnel tunnel) {
         super(host + ":" + port + " <- " + privkeyname, notifyThis, tunnel);
+        String usePool = tunnel.getClientOptions().getProperty("i2ptunnel.usePool");
+        if (usePool != null)
+            _usePool = "true".equalsIgnoreCase(usePool);
+        else
+            _usePool = DEFAULT_USE_POOL;
         init(host, port, privData, privkeyname, l);
     }
 
@@ -159,58 +178,103 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
         }
     }
 
+    private static final String PROP_HANDLER_COUNT = "i2ptunnel.blockingHandlerCount";
+    private static final int DEFAULT_HANDLER_COUNT = 10;
+    
+    protected int getHandlerCount() { 
+        int rv = DEFAULT_HANDLER_COUNT;
+        String cnt = getTunnel().getClientOptions().getProperty(PROP_HANDLER_COUNT);
+        if (cnt != null) {
+            try {
+                rv = Integer.parseInt(cnt);
+                if (rv <= 0)
+                    rv = DEFAULT_HANDLER_COUNT;
+            } catch (NumberFormatException nfe) {
+                rv = DEFAULT_HANDLER_COUNT;
+            }
+        }
+        return rv;
+    }
+    
     public void run() {
-        try {
+        if (shouldUsePool()) {
+            I2PServerSocket i2pss = sockMgr.getServerSocket();
+            int handlers = getHandlerCount();
+            for (int i = 0; i < handlers; i++) {
+                I2PThread handler = new I2PThread(new Handler(i2pss), "Handle Server " + i);
+                handler.start();
+            }
+        } else {
             I2PServerSocket i2pss = sockMgr.getServerSocket();
             while (true) {
-                I2PSocket i2ps = i2pss.accept();
-                if (i2ps == null) throw new I2PException("I2PServerSocket closed");
-                I2PThread t = new I2PThread(new Handler(i2ps));
-                t.start();
+                try {
+                    final I2PSocket i2ps = i2pss.accept();
+                    if (i2ps == null) throw new I2PException("I2PServerSocket closed");
+                    new I2PThread(new Runnable() { public void run() { blockingHandle(i2ps); } }).start();
+                } catch (I2PException ipe) {
+                    if (_log.shouldLog(Log.ERROR))
+                        _log.error("Error accepting - KILLING THE TUNNEL SERVER", ipe);
+                    return;
+                } catch (ConnectException ce) {
+                    if (_log.shouldLog(Log.ERROR))
+                        _log.error("Error accepting", ce);
+                    // not killing the server..
+                }
             }
-        } catch (I2PException ex) {
-            _log.error("Error while waiting for I2PConnections", ex);
-        } catch (IOException ex) {
-            _log.error("Error while waiting for I2PConnections", ex);
         }
     }
     
+    public boolean shouldUsePool() { return _usePool; }
+    
     /**
-     * Async handler to keep .accept() from blocking too long.  
-     * todo: replace with a thread pool so we dont get overrun by threads if/when
-     * receiving a lot of connection requests concurrently.
+     * minor thread pool to pull off the accept() concurrently.  there are still lots
+     * (and lots) of wasted threads within the I2PTunnelRunner, but its a start
      *
      */
     private class Handler implements Runnable { 
-        private I2PSocket _handleSocket;
-        public Handler(I2PSocket socket) {
-            _handleSocket = socket;
+        private I2PServerSocket _serverSocket;
+        public Handler(I2PServerSocket serverSocket) {
+            _serverSocket = serverSocket;
         }
         public void run() {
-            long afterAccept = I2PAppContext.getGlobalContext().clock().now();
-            long afterSocket = -1;
-            //local is fast, so synchronously. Does not need that many
-            //threads.
-            try {
-                _handleSocket.setReadTimeout(readTimeout);
-                Socket s = new Socket(remoteHost, remotePort);
-                afterSocket = I2PAppContext.getGlobalContext().clock().now();
-                new I2PTunnelRunner(s, _handleSocket, slock, null, null);
-            } catch (SocketException ex) {
+            while (open) {
                 try {
-                    _handleSocket.close();
-                } catch (IOException ioe) {
-                    _log.error("Error while closing the received i2p con", ex);
+                    blockingHandle(_serverSocket.accept());   
+                } catch (I2PException ex) {
+                    _log.error("Error while waiting for I2PConnections", ex);
+                    return;
+                } catch (IOException ex) {
+                    _log.error("Error while waiting for I2PConnections", ex);
+                    return;
                 }
-            } catch (IOException ex) {
-                _log.error("Error while waiting for I2PConnections", ex);
             }
-            
-            long afterHandle = I2PAppContext.getGlobalContext().clock().now();
-            long timeToHandle = afterHandle - afterAccept;
-            if (timeToHandle > 1000)
-                _log.warn("Took a while to handle the request [" + timeToHandle + ", socket create: " + (afterSocket-afterAccept) + "]");
         }
     }
+    
+    protected void blockingHandle(I2PSocket socket) {
+        long afterAccept = I2PAppContext.getGlobalContext().clock().now();
+        long afterSocket = -1;
+        //local is fast, so synchronously. Does not need that many
+        //threads.
+        try {
+            socket.setReadTimeout(readTimeout);
+            Socket s = new Socket(remoteHost, remotePort);
+            afterSocket = I2PAppContext.getGlobalContext().clock().now();
+            new I2PTunnelRunner(s, socket, slock, null, null);
+        } catch (SocketException ex) {
+            try {
+                socket.close();
+            } catch (IOException ioe) {
+                _log.error("Error while closing the received i2p con", ex);
+            }
+        } catch (IOException ex) {
+            _log.error("Error while waiting for I2PConnections", ex);
+        }
+
+        long afterHandle = I2PAppContext.getGlobalContext().clock().now();
+        long timeToHandle = afterHandle - afterAccept;
+        if (timeToHandle > 1000)
+            _log.warn("Took a while to handle the request [" + timeToHandle + ", socket create: " + (afterSocket-afterAccept) + "]");
+    }
 }
 

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

@@ -1,445 +0,0 @@
-/* I2PTunnel is GPL'ed (with the exception mentioned in I2PTunnel.java)
- * (c) 2003 - 2004 mihi
- */
-
-package net.i2p.i2ptunnel;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-
-import net.i2p.data.DataFormatException;
-import net.i2p.data.Destination;
-import net.i2p.util.Clock;
-import net.i2p.util.I2PThread;
-import net.i2p.util.Log;
-
-/**
- * Quick and dirty socket listener to control an I2PTunnel.  
- * Basically run this class as TunnelManager [listenHost] [listenPort] and 
- * then send it commands on that port.  Commands are one shot deals -
- * Send a command + newline, get a response plus newline, then get disconnected.
- * <p />
- * <b>Implemented commands:</b>
- * <pre>
- * -------------------------------------------------
- * lookup &lt;name&gt;\n
- * --
- * &lt;base64 of the destination&gt;\n
- *  or
- * &lt;error message, usually 'Unknown host'&gt;\n
- * 
- *  Lookup the public key of a named destination (i.e. listed in hosts.txt)
- * -------------------------------------------------
- * genkey\n
- * --
- * &lt;base64 of the destination&gt;\t&lt;base64 of private data&gt;\n
- * 
- *  Generates a new public and private key pair
- * -------------------------------------------------
- * convertprivate &lt;base64 of privkey&gt;
- * --
- * &lt;base64 of destination&gt;\n
- *  or
- * &lt;error message&gt;\n
- *
- *  Returns the destination (pubkey) of a given private key. 
- * -------------------------------------------------
- * listen_on &lt;ip&gt;\n
- * --
- * ok\n
- *  or
- * error\n
- * 
- *  Sets the ip address clients will listen on. By default this is the
- *  localhost (127.0.0.1)
- * -------------------------------------------------
- * openclient &lt;listenPort&gt; &lt;peer&gt;[ &lt;sharedClient&gt;]\n
- * --
- * ok [&lt;jobId&gt;]\n
- *  or
- * ok &lt;listenPort&gt; [&lt;jobId&gt;]\n
- *  or
- * error\n
- * 
- *  Open a tunnel on the given &lt;listenport&gt; to the destination specified
- *  by &lt;peer&gt;. If &lt;listenPort&gt; is 0 a free port is picked and returned in
- *  the reply message. Otherwise the short reply message is used.
- *  Peer can be the base64 of the destination, a file with the public key
- *  specified as 'file:&lt;filename&gt;' or the name of a destination listed in
- *  hosts.txt. The &lt;jobId&gt; returned together with "ok" and &lt;listenport&gt; can
- *  later be used as argument for the "close" command.
- *  &lt;sharedClient&gt; indicates if this httpclient shares tunnels with other
- *  clients or not (just use 'true' and 'false'
- * -------------------------------------------------
- * openhttpclient &lt;listenPort&gt; [&lt;sharedClient&gt;] [&lt;proxy&gt;]\n
- * --
- * ok [&lt;jobId&gt;]\n
- *  or
- * ok &lt;listenPort&gt; [&lt;jobId&gt;]\n
- *  or
- * error\n
- * 
- *  Open an HTTP proxy through the I2P on the given
- *  &lt;listenport&gt;. &lt;proxy&gt; (optional) specifies a
- *  destination to be used as an outbound proxy, to access normal WWW
- *  sites out of the .i2p domain. If &lt;listenPort&gt; is 0 a free
- *  port is picked and returned in the reply message. Otherwise the
- *  short reply message is used.  &lt;proxy&gt; can be the base64 of the
- *  destination, a file with the public key specified as
- *  'file:&lt;filename&gt;' or the name of a destination listed in
- *  hosts.txt. The &lt;jobId&gt; returned together with "ok" and
- *  &lt;listenport&gt; can later be used as argument for the "close"
- *  command.
- *  &lt;sharedClient&gt; indicates if this httpclient shares tunnels with other
- *  clients or not (just use 'true' and 'false'
- * -------------------------------------------------
- * opensockstunnel &lt;listenPort&gt;\n
- * --
- * ok [&lt;jobId&gt;]\n
- *  or
- * ok &lt;listenPort&gt; [&lt;jobId&gt;]\n
- *  or
- * error\n
- * 
- *  Open an SOCKS tunnel through the I2P on the given
- *  &lt;listenport&gt;. If &lt;listenPort&gt; is 0 a free port is
- *  picked and returned in the reply message. Otherwise the short
- *  reply message is used.  The &lt;jobId&gt; returned together with
- *  "ok" and &lt;listenport&gt; can later be used as argument for the
- *  "close" command.
- * -------------------------------------------------
- * openserver &lt;serverHost&gt; &lt;serverPort&gt; &lt;serverKeys&gt;\n
- * --
- * ok [&lt;jobId&gt;]\n
- *  or
- * error\n
- * 
- *  Starts receiving traffic for the destination specified by &lt;serverKeys&gt;
- *  and forwards it to the &lt;serverPort&gt; of &lt;serverHost&gt;.
- *  &lt;serverKeys&gt; is the base 64 encoded private key set of the local
- *  destination. The &lt;joId&gt; returned together with "ok" can later be used
- *  as argument for the "close" command.
- * -------------------------------------------------
- * close [forced] &lt;jobId&gt;\n
- *  or
- * close [forced] all\n
- * --
- * ok\n
- *  or
- * error\n
- * 
- *  Closes the job specified by &lt;jobId&gt; or all jobs. Use the list command
- *  for a list of running jobs.
- *  Normally a connection job is not closed when it still has an active
- *  connection. Use the optional 'forced' keyword to close connections
- *  regardless of their use.
- * -------------------------------------------------
- * list\n
- * --
- *  Example output:
- * 
- * [0] i2p.dnsalias.net/69.55.226.145:5555 &lt;- C:\i2pKeys\squidPriv
- * [1] 8767 -&gt; HTTPClient
- * [2] 7575 -&gt; file:C:\i2pKeys\squidPub
- * [3] 5252 -&gt; sCcSANIO~f4AQtCNI1BvDp3ZBS~9Ag5O0k0Msm7XBWWz5eOnZWL3MQ-2rxlesucb9XnpASGhWzyYNBpWAfaIB3pux1J1xujQLOwscMIhm7T8BP76Ly5jx6BLZCYrrPj0BI0uV90XJyT~4UyQgUlC1jzFQdZ9HDgBPJDf1UI4-YjIwEHuJgdZynYlQ1oUFhgno~HhcDByXO~PDaO~1JDMDbBEfIh~v6MgmHp-Xchod1OfKFrxFrzHgcJbn7E8edTFjZA6JCi~DtFxFelQz1lSBd-QB1qJnA0g-pVL5qngNUojXJCXs4qWcQ7ICLpvIc-Fpfj-0F1gkVlGDSGkb1yLH3~8p4czYgR3W5D7OpwXzezz6clpV8kmbd~x2SotdWsXBPRhqpewO38coU4dJG3OEUbuYmdN~nJMfWbmlcM1lXzz2vBsys4sZzW6dV3hZnbvbfxNTqbdqOh-KXi1iAzXv7CVTun0ubw~CfeGpcAqutC5loRUq7Mq62ngOukyv8Z9AAAA
- *
- *  Lists descriptions of all running jobs. The exact format of the
- *  description depends on the type of job.
- * -------------------------------------------------
- * </pre>
- *
- *
- * @deprecated this isn't run by default, and no one seems to use it, and has
- *             lots of things to maintain.  so, at some point this may dissapear
- *             unless someone pipes up ;)
- */
-public class TunnelManager implements Runnable {
-    private final static Log _log = new Log(TunnelManager.class);
-    private I2PTunnel _tunnel;
-    private ServerSocket _socket;
-    private boolean _keepAccepting;
-
-    public TunnelManager(int listenPort) {
-        this(null, listenPort);
-    }
-
-    public TunnelManager(String listenHost, int listenPort) {
-        _tunnel = new I2PTunnel();
-        _keepAccepting = true;
-        try {
-            if (listenHost != null) {
-                _socket = new ServerSocket(listenPort, 0, InetAddress.getByName(listenHost));
-                _log.info("Listening for tunnel management clients on " + listenHost + ":" + listenPort);
-            } else {
-                _socket = new ServerSocket(listenPort);
-                _log.info("Listening for tunnel management clients on localhost:" + listenPort);
-            }
-        } catch (Exception e) {
-            _log.error("Error starting up tunnel management listener on " + listenPort, e);
-        }
-    }
-
-    public static void main(String args[]) {
-        int port = 7676;
-        String host = null;
-        if (args.length == 1) {
-            try {
-                port = Integer.parseInt(args[0]);
-            } catch (NumberFormatException nfe) {
-                _log.error("Usage: TunnelManager [host] [port]");
-                return;
-            }
-        } else if (args.length == 2) {
-            host = args[0];
-            try {
-                port = Integer.parseInt(args[1]);
-            } catch (NumberFormatException nfe) {
-                _log.error("Usage: TunnelManager [host] [port]");
-                return;
-            }
-        }
-
-        TunnelManager mgr = new TunnelManager(host, port);
-        Thread t = new I2PThread(mgr, "Listener");
-        t.start();
-    }
-
-    public void run() {
-        if (_socket == null) {
-            _log.error("Unable to start listening, since the socket was not bound.  Already running?");
-            return;
-        }
-        _log.debug("Running");
-        try {
-            while (_keepAccepting) {
-                Socket socket = _socket.accept();
-                _log.debug("Client accepted");
-                if (socket != null) {
-                    Thread t = new I2PThread(new TunnelManagerClientRunner(this, socket));
-                    t.setName("TunnelManager Client");
-                    t.setPriority(I2PThread.MIN_PRIORITY);
-                    t.start();
-                }
-            }
-        } catch (IOException ioe) {
-            _log.error("Error accepting connections", ioe);
-        } catch (Exception e) {
-            _log.error("Other error?!", e);
-        } finally {
-            if (_socket != null) try {
-                _socket.close();
-            } catch (IOException ioe) {
-            }
-        }
-        try {
-            Thread.sleep(5000);
-        } catch (InterruptedException ie) {
-        }
-    }
-
-    public void error(String msg, OutputStream out) throws IOException {
-        out.write(msg.getBytes());
-        out.write('\n');
-    }
-
-    public void processQuit(OutputStream out) throws IOException {
-        out.write("Nice try".getBytes());
-        out.write('\n');
-    }
-
-    public void processList(OutputStream out) throws IOException {
-        BufferLogger buf = new BufferLogger();
-        long startCommand = Clock.getInstance().now();
-        _tunnel.runCommand("list", buf);
-        Object obj = _tunnel.waitEventValue("listDone");
-        long endCommand = Clock.getInstance().now();
-        String str = buf.getBuffer();
-        _log.debug("ListDone complete after " + (endCommand - startCommand) + "ms: [" + str + "]");
-        out.write(str.getBytes());
-        out.write('\n');
-        buf.ignoreFurtherActions();
-    }
-
-    public void processListenOn(String ip, OutputStream out) throws IOException {
-        BufferLogger buf = new BufferLogger();
-        _tunnel.runCommand("listen_on " + ip, buf);
-        String status = (String) _tunnel.waitEventValue("listen_onResult");
-        out.write((status + "\n").getBytes());
-        buf.ignoreFurtherActions();
-    }
-
-    /**
-     * "lookup <name>" returns with the result in base64, else "Unknown host" [or something like that],
-     * then a newline.
-     *
-     */
-    public void processLookup(String name, OutputStream out) throws IOException {
-        BufferLogger buf = new BufferLogger();
-        _tunnel.runCommand("lookup " + name, buf);
-        String rv = (String) _tunnel.waitEventValue("lookupResult");
-        out.write(rv.getBytes());
-        out.write('\n');
-        buf.ignoreFurtherActions();
-    }
-
-    public void processTestDestination(String destKey, OutputStream out) throws IOException {
-        try {
-            Destination d = new Destination();
-            d.fromBase64(destKey);
-            out.write("valid\n".getBytes());
-        } catch (DataFormatException dfe) {
-            out.write("invalid\n".getBytes());
-        }
-        out.flush();
-    }
-
-    public void processConvertPrivate(String priv, OutputStream out) throws IOException {
-        try {
-            Destination dest = new Destination();
-            dest.fromBase64(priv);
-            String str = dest.toBase64();
-            out.write(str.getBytes());
-            out.write('\n');
-        } catch (DataFormatException dfe) {
-            _log.error("Error converting private data", dfe);
-            out.write("Error converting private key\n".getBytes());
-        }
-    }
-
-    public void processClose(String which, boolean forced, OutputStream out) throws IOException {
-        BufferLogger buf = new BufferLogger();
-        _tunnel.runCommand((forced ? "close forced " : "close ") + which, buf);
-        String str = (String) _tunnel.waitEventValue("closeResult");
-        out.write((str + "\n").getBytes());
-        buf.ignoreFurtherActions();
-    }
-
-    /**
-     * "genkey" returns with the base64 of the destination, followed by a tab, then the base64 of that
-     * destination's private keys, then a newline.
-     *
-     */
-    public void processGenKey(OutputStream out) throws IOException {
-        BufferLogger buf = new BufferLogger();
-        _tunnel.runCommand("gentextkeys", buf);
-        String priv = (String) _tunnel.waitEventValue("privateKey");
-        String pub = (String) _tunnel.waitEventValue("publicDestination");
-        out.write((pub + "\t" + priv).getBytes());
-        out.write('\n');
-        buf.ignoreFurtherActions();
-    }
-
-    public void processOpenClient(int listenPort, String peer, String sharedClient, OutputStream out) throws IOException {
-        BufferLogger buf = new BufferLogger();
-        _tunnel.runCommand("client " + listenPort + " " + peer + " " + sharedClient, buf);
-        Integer taskId = (Integer) _tunnel.waitEventValue("clientTaskId");
-        if (taskId.intValue() < 0) {
-            out.write("error\n".getBytes());
-            buf.ignoreFurtherActions();
-            return;
-        }
-        String rv = (String) _tunnel.waitEventValue("openClientResult");
-        if (rv.equals("error")) {
-            out.write((rv + "\n").getBytes());
-            buf.ignoreFurtherActions();
-            return;
-        }
-
-        if (listenPort != 0) {
-            out.write((rv + " [" + taskId.intValue() + "]\n").getBytes());
-            buf.ignoreFurtherActions();
-            return;
-        }
-        Integer port = (Integer) _tunnel.waitEventValue("clientLocalPort");
-        out.write((rv + " " + port.intValue() + " [" + taskId.intValue() + "]\n").getBytes());
-        buf.ignoreFurtherActions();
-    }
-
-    public void processOpenHTTPClient(int listenPort, String sharedClient, String proxy, OutputStream out) throws IOException {
-        BufferLogger buf = new BufferLogger();
-        _tunnel.runCommand("httpclient " + listenPort + " " + sharedClient + " " + proxy, buf);
-        Integer taskId = (Integer) _tunnel.waitEventValue("httpclientTaskId");
-        if (taskId.intValue() < 0) {
-            out.write("error\n".getBytes());
-            buf.ignoreFurtherActions();
-            return;
-        }
-        String rv = (String) _tunnel.waitEventValue("openHTTPClientResult");
-        if (rv.equals("error")) {
-            out.write((rv + "\n").getBytes());
-            buf.ignoreFurtherActions();
-            return;
-        }
-
-        if (listenPort != 0) {
-            out.write((rv + " [" + taskId.intValue() + "]\n").getBytes());
-            buf.ignoreFurtherActions();
-            return;
-        }
-        Integer port = (Integer) _tunnel.waitEventValue("clientLocalPort");
-        out.write((rv + " " + port.intValue() + " [" + taskId.intValue() + "]\n").getBytes());
-        buf.ignoreFurtherActions();
-    }
-
-    public void processOpenSOCKSTunnel(int listenPort, OutputStream out) throws IOException {
-        BufferLogger buf = new BufferLogger();
-        _tunnel.runCommand("sockstunnel " + listenPort, buf);
-        Integer taskId = (Integer) _tunnel.waitEventValue("sockstunnelTaskId");
-        if (taskId.intValue() < 0) {
-            out.write("error\n".getBytes());
-            buf.ignoreFurtherActions();
-            return;
-        }
-        String rv = (String) _tunnel.waitEventValue("openSOCKSTunnelResult");
-        if (rv.equals("error")) {
-            out.write((rv + "\n").getBytes());
-            buf.ignoreFurtherActions();
-            return;
-        }
-
-        if (listenPort != 0) {
-            out.write((rv + " [" + taskId.intValue() + "]\n").getBytes());
-            buf.ignoreFurtherActions();
-            return;
-        }
-        Integer port = (Integer) _tunnel.waitEventValue("clientLocalPort");
-        out.write((rv + " " + port.intValue() + " [" + taskId.intValue() + "]\n").getBytes());
-        buf.ignoreFurtherActions();
-    }
-
-    public void processOpenServer(String serverHost, int serverPort, String privateKeys, OutputStream out)
-                                                                                                          throws IOException {
-        BufferLogger buf = new BufferLogger();
-        _tunnel.runCommand("textserver " + serverHost + " " + serverPort + " " + privateKeys, buf);
-        Integer taskId = (Integer) _tunnel.waitEventValue("serverTaskId");
-        if (taskId.intValue() < 0) {
-            out.write("error\n".getBytes());
-            buf.ignoreFurtherActions();
-            return;
-        }
-
-        String rv = (String) _tunnel.waitEventValue("openServerResult");
-
-        if (rv.equals("error")) {
-            out.write((rv + "\n").getBytes());
-            buf.ignoreFurtherActions();
-            return;
-        }
-
-        out.write((rv + " [" + taskId.intValue() + "]\n").getBytes());
-        buf.ignoreFurtherActions();
-    }
-
-    /**
-     * Frisbee.
-     *
-     */
-    public void unknownCommand(String command, OutputStream out) throws IOException {
-        out.write("Unknown command: ".getBytes());
-        out.write(command.getBytes());
-        out.write("\n".getBytes());
-    }
-}

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

@@ -1,203 +0,0 @@
-/* I2PTunnel is GPL'ed (with the exception mentioned in I2PTunnel.java)
- * (c) 2003 - 2004 mihi
- */
-
-package net.i2p.i2ptunnel;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.util.StringTokenizer;
-
-import net.i2p.util.Log;
-
-/**
- * Runner thread that reads commands from the socket and fires off commands to
- * the TunnelManager
- *
- */
-class TunnelManagerClientRunner implements Runnable {
-    private final static Log _log = new Log(TunnelManagerClientRunner.class);
-    private TunnelManager _mgr;
-    private Socket _clientSocket;
-
-    public TunnelManagerClientRunner(TunnelManager mgr, Socket socket) {
-        _clientSocket = socket;
-        _mgr = mgr;
-    }
-
-    public void run() {
-        _log.debug("Client running");
-        try {
-            BufferedReader reader = new BufferedReader(new InputStreamReader(_clientSocket.getInputStream()));
-            OutputStream out = _clientSocket.getOutputStream();
-
-            String cmd = reader.readLine();
-            if (cmd != null) processCommand(cmd, out);
-        } catch (IOException ioe) {
-            _log.error("Error processing client commands", ioe);
-        } finally {
-            if (_clientSocket != null) try {
-                _clientSocket.close();
-            } catch (IOException ioe) {
-            }
-        }
-        _log.debug("Client closed");
-    }
-
-    /**
-     * Parse the command string and fire off the appropriate tunnelManager method,
-     * sending the results to the output stream
-     */
-    private void processCommand(String command, OutputStream out) throws IOException {
-        _log.debug("Processing [" + command + "]");
-        StringTokenizer tok = new StringTokenizer(command);
-        if (!tok.hasMoreTokens()) {
-            _mgr.unknownCommand(command, out);
-        } else {
-            String cmd = tok.nextToken();
-            if ("quit".equalsIgnoreCase(cmd)) {
-                _mgr.processQuit(out);
-            } else if ("lookup".equalsIgnoreCase(cmd)) {
-                if (tok.hasMoreTokens())
-                    _mgr.processLookup(tok.nextToken(), out);
-                else
-                    _mgr.error("Usage: lookup <hostname>", out);
-            } else if ("testdestination".equalsIgnoreCase(cmd)) {
-                if (tok.hasMoreTokens())
-                    _mgr.processTestDestination(tok.nextToken(), out);
-                else
-                    _mgr.error("Usage: testdestination <publicDestination>", out);
-            } else if ("convertprivate".equalsIgnoreCase(cmd)) {
-                if (tok.hasMoreTokens())
-                    _mgr.processConvertPrivate(tok.nextToken(), out);
-                else
-                    _mgr.error("Usage: convertprivate <privateData>", out);
-            } else if ("close".equalsIgnoreCase(cmd)) {
-                if (tok.hasMoreTokens()) {
-                    String closeArg;
-                    if ((closeArg = tok.nextToken()).equals("forced")) {
-                        if (tok.hasMoreTokens()) {
-                            _mgr.processClose(tok.nextToken(), true, out);
-                        } else {
-                            _mgr.error("Usage: close [forced] <jobnumber>|all", out);
-                        }
-                    } else {
-                        _mgr.processClose(closeArg, false, out);
-                    }
-                } else {
-                    _mgr.error("Usage: close [forced] <jobnumber>|all", out);
-                }
-            } else if ("genkey".equalsIgnoreCase(cmd)) {
-                _mgr.processGenKey(out);
-            } else if ("list".equalsIgnoreCase(cmd)) {
-                _mgr.processList(out);
-            } else if ("listen_on".equalsIgnoreCase(cmd)) {
-                if (tok.hasMoreTokens()) {
-                    _mgr.processListenOn(tok.nextToken(), out);
-                } else {
-                    _mgr.error("Usage: listen_on <ip>", out);
-                }
-            } else if ("openclient".equalsIgnoreCase(cmd)) {
-                int listenPort = 0;
-                String peer = null;
-                String sharedClient = null;
-                int numTokens = tok.countTokens();
-                if (numTokens < 2 || numTokens > 3) {
-                    _mgr.error("Usage: openclient <listenPort> <peer> <sharedClient>", out);
-                    return;
-                }
-                try {
-                    listenPort = Integer.parseInt(tok.nextToken());
-                    peer = tok.nextToken();
-                    if (tok.hasMoreTokens())
-                        sharedClient = tok.nextToken();
-                    else
-                        sharedClient = "true";
-                    _mgr.processOpenClient(listenPort, peer, sharedClient, out);
-                } catch (NumberFormatException nfe) {
-                    _mgr.error("Bad listen port", out);
-                    return;
-                }
-            } else if ("openhttpclient".equalsIgnoreCase(cmd)) {
-                int listenPort = 0;
-                String proxy = "squid.i2p";
-                String sharedClient = "true";
-                int numTokens = tok.countTokens();
-                if (numTokens < 1 || numTokens > 3) {
-                    _mgr.error("Usage: openhttpclient <listenPort> [<sharedClient>] [<proxy>]", out);
-                    return;
-                }
-                try {
-                    listenPort = Integer.parseInt(tok.nextToken());
-                    if (tok.hasMoreTokens()) {
-                        String val = tok.nextToken();
-                        if (tok.hasMoreTokens()) {
-                            sharedClient = val;
-                            proxy = tok.nextToken();
-                        } else {
-                            if ( ("true".equals(val)) || ("false".equals(val)) ) {
-                                sharedClient = val;
-                            } else {
-                                proxy = val;
-                            }
-                        }
-                    }
-                    _mgr.processOpenHTTPClient(listenPort, sharedClient, proxy, out);
-                } catch (NumberFormatException nfe) {
-                    _mgr.error("Bad listen port", out);
-                    return;
-                }
-            } else if ("opensockstunnel".equalsIgnoreCase(cmd)) {
-                int listenPort = 0;
-                if (!tok.hasMoreTokens()) {
-                    _mgr.error("Usage: opensockstunnel <listenPort>", out);
-                    return;
-                }
-                try {
-                    String portStr = tok.nextToken();
-                    listenPort = Integer.parseInt(portStr);
-                } catch (NumberFormatException nfe) {
-                    _mgr.error("Bad listen port", out);
-                    return;
-                }
-                if (tok.hasMoreTokens()) {
-                    _mgr.error("Usage: opensockstunnel <listenport>", out);
-                    return;
-                }
-                _mgr.processOpenSOCKSTunnel(listenPort, out);
-            } else if ("openserver".equalsIgnoreCase(cmd)) {
-                int listenPort = 0;
-                String serverHost = null;
-                String serverKeys = null;
-                if (!tok.hasMoreTokens()) {
-                    _mgr.error("Usage: openserver <serverHost> <serverPort> <serverKeys>", out);
-                    return;
-                }
-                serverHost = tok.nextToken();
-
-                if (!tok.hasMoreTokens()) {
-                    _mgr.error("Usage: openserver <serverHost> <serverPort> <serverKeys>", out);
-                    return;
-                }
-                try {
-                    String portStr = tok.nextToken();
-                    listenPort = Integer.parseInt(portStr);
-                } catch (NumberFormatException nfe) {
-                    _mgr.error("Bad listen port", out);
-                    return;
-                }
-                if (!tok.hasMoreTokens()) {
-                    _mgr.error("Usage: openserver <serverHost> <serverPort> <serverKeys>", out);
-                    return;
-                }
-                serverKeys = tok.nextToken();
-                _mgr.processOpenServer(serverHost, listenPort, serverKeys, out);
-            } else {
-                _mgr.unknownCommand(command, out);
-            }
-        }
-    }
-}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java

@@ -479,9 +479,12 @@ public class IndexBean {
     public void setStartOnLoad(String moo) {
         _startOnLoad = true;
     }
-    public void setSharedClient(String moo) {
+    public void setShared(String moo) {
     	_sharedClient=true;
     }
+    public void setShared(boolean val) {
+    	_sharedClient=val;
+    }
     public void setConnectDelay(String moo) {
         _connectDelay = true;
     }

apps/i2ptunnel/jsp/editClient.jsp

@@ -93,7 +93,7 @@ if (curTunnel >= 0) {
 </select>
 &nbsp;&nbsp;
 <b>others:</b>
-<input type="text" name="reachablyByOther" size="20" />
+<input type="text" name="reachableByOther" size="20" />
 <% } else if ("0.0.0.0".equals(clientInterface)) { %>
 <option value="127.0.0.1">Locally (127.0.0.1)</option>
 <option value="0.0.0.0" selected="true">Everyone (0.0.0.0)</option>
@@ -102,7 +102,7 @@ if (curTunnel >= 0) {
 </select>
 &nbsp;&nbsp;
 <b>others:</b>
-<input type="text" name="reachablyByOther" size="20" />
+<input type="text" name="reachableByOther" size="20" />
 <% } else { %>
 <option value="127.0.0.1">Locally (127.0.0.1)</option>
 <option value="0.0.0.0">Everyone (0.0.0.0)</option>
@@ -166,9 +166,9 @@ if (curTunnel >= 0) {
 </td>
 <td>
 <% if (editBean.isSharedClient(curTunnel)) { %>
-<input type="checkbox" value="true" name="sharedClient" checked="true" />
+<input type="checkbox" value="true" name="shared" checked="true" />
 <% } else { %>
-<input type="checkbox" value="true" name="sharedClient" />
+<input type="checkbox" value="true" name="shared" />
 <% } %>
 <i>(Share tunnels with other clients and httpclients? Change requires restart of client proxy)</i>
 </td>

apps/i2ptunnel/jsp/web.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE web-app
     PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
     "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">
@@ -14,4 +14,4 @@
         <welcome-file>index.html</welcome-file>
         <welcome-file>index.jsp</welcome-file>
     </welcome-file-list>
-</web-app>
+</web-app>

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

@@ -15,6 +15,7 @@ import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
 import net.i2p.data.Destination;
 import net.i2p.data.DataFormatException;
+import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
 
 /**
@@ -74,61 +75,67 @@ public class StreamSinkClient {
         } finally {
             if (fis == null) try { fis.close(); } catch (IOException ioe) {}
         }
-        
-        
-        System.out.println("Send " + _sendSize + "KB to " + peer.calculateHash().toBase64());
-        
-        try {
-            I2PSocket sock = mgr.connect(peer);
-            byte buf[] = new byte[32*1024];
-            Random rand = new Random();
-            OutputStream out = sock.getOutputStream();
-            long beforeSending = System.currentTimeMillis();
-            for (int i = 0; i < _sendSize; i+= 32) {
-                rand.nextBytes(buf);
-                out.write(buf);
+
+        if (_log.shouldLog(Log.DEBUG))
+            _log.debug("Send " + _sendSize + "KB to " + peer.calculateHash().toBase64());
+
+        while (true) {
+            try {
+                I2PSocket sock = mgr.connect(peer);
+                byte buf[] = new byte[Math.min(32*1024, _sendSize*1024)];
+                Random rand = new Random();
+                OutputStream out = sock.getOutputStream();
+                long beforeSending = System.currentTimeMillis();
+                for (int i = 0; (_sendSize < 0) || (i < _sendSize); i+= buf.length/1024) {
+                    rand.nextBytes(buf);
+                    out.write(buf);
+                    if (_log.shouldLog(Log.DEBUG))
+                        _log.debug("Wrote " + ((1+i*buf.length)/1024) + "/" + _sendSize + "KB");
+                    if (_writeDelay > 0) {
+                        try { Thread.sleep(_writeDelay); } catch (InterruptedException ie) {}
+                    }   
+                }
+                sock.close();
+                long afterSending = System.currentTimeMillis();
                 if (_log.shouldLog(Log.DEBUG))
-                    _log.debug("Wrote " + (i+32) + "/" + _sendSize + "KB");
-                if (_writeDelay > 0) {
-                    try { Thread.sleep(_writeDelay); } catch (InterruptedException ie) {}
-                }   
-            }
-            sock.close();
-            long afterSending = System.currentTimeMillis();
-            System.out.println("Sent " + _sendSize + "KB in " + (afterSending-beforeSending) + "ms");
-        } catch (InterruptedIOException iie) {
-            _log.error("Timeout connecting to the peer", iie);
-            return;
-        } catch (NoRouteToHostException nrthe) {
-            _log.error("Unable to connect to the peer", nrthe);
-            return;
-        } catch (ConnectException ce) {
-            _log.error("Connection already dropped", ce);
-            return;
-        } catch (I2PException ie) {
-            _log.error("Error connecting to the peer", ie);
-            return;
-        } catch (IOException ioe) {
-            _log.error("IO error sending", ioe);
-            return;
+                    _log.debug("Sent " + _sendSize + "KB in " + (afterSending-beforeSending) + "ms");
+            } catch (InterruptedIOException iie) {
+                _log.error("Timeout connecting to the peer", iie);
+                //return;
+            } catch (NoRouteToHostException nrthe) {
+                _log.error("Unable to connect to the peer", nrthe);
+                //return;
+            } catch (ConnectException ce) {
+                _log.error("Connection already dropped", ce);
+                //return;
+            } catch (I2PException ie) {
+                _log.error("Error connecting to the peer", ie);
+                return;
+            } catch (IOException ioe) {
+                _log.error("IO error sending", ioe);
+                return;
+            }   
         }
     }
 
     /**
-     * Fire up the client.  <code>Usage: StreamSinkClient [i2cpHost i2cpPort] sendSizeKB writeDelayMs serverDestFile</code> <br />
+     * Fire up the client.  <code>Usage: StreamSinkClient [i2cpHost i2cpPort] sendSizeKB writeDelayMs serverDestFile [concurrentSends]</code> <br />
      * <ul>
-     *  <li><b>sendSizeKB</b>: how many KB to send</li>
+     *  <li><b>sendSizeKB</b>: how many KB to send, or -1 for unlimited</li>
      *  <li><b>writeDelayMs</b>: how long to wait between each .write (0 for no delay)</li>
      *  <li><b>serverDestFile</b>: file containing the StreamSinkServer's binary Destination</li>
+     *  <li><b>concurrentSends</b>: how many concurrent threads should send to the server at once</li>
      * </ul>
      */
     public static void main(String args[]) {
         StreamSinkClient client = null;
         int sendSizeKB = -1;
         int writeDelayMs = -1;
+        int concurrent = 1;
         
         switch (args.length) {
-            case 3:
+            case 3: // fall through
+            case 4:
                 try {
                     sendSizeKB = Integer.parseInt(args[0]);
                 } catch (NumberFormatException nfe) {
@@ -141,9 +148,13 @@ public class StreamSinkClient {
                     System.err.println("Write delay ms invalid [" + args[1] + "]");
                     return;
                 }
+                if (args.length == 4) {
+                    try { concurrent = Integer.parseInt(args[3]); } catch (NumberFormatException nfe) {}
+                }
                 client = new StreamSinkClient(sendSizeKB, writeDelayMs, args[2]);
                 break;
-            case 5:
+            case 5: // fall through
+            case 6:
                 try { 
                     int port = Integer.parseInt(args[1]);
                     sendSizeKB = Integer.parseInt(args[2]);
@@ -152,11 +163,26 @@ public class StreamSinkClient {
                 } catch (NumberFormatException nfe) {
                     System.err.println("arg error");
                 }
+                if (args.length == 6) {
+                    try { concurrent = Integer.parseInt(args[5]); } catch (NumberFormatException nfe) {}
+                }
                 break;
             default: 
-                System.out.println("Usage: StreamSinkClient [i2cpHost i2cpPort] sendSizeKB writeDelayMs serverDestFile");
+                System.out.println("Usage: StreamSinkClient [i2cpHost i2cpPort] sendSizeKB writeDelayMs serverDestFile [concurrentSends]");
+        }
+        if (client != null) {
+            for (int i = 0; i < concurrent; i++)
+                new I2PThread(new Runner(client), "Client " + i).start();
+        }   
+    }
+    
+    private static class Runner implements Runnable {
+        private StreamSinkClient _client;
+        public Runner(StreamSinkClient client) {
+            _client = client;
+        }
+        public void run() {
+            _client.runClient();
         }
-        if (client != null)
-            client.runClient();
     }
 }

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

@@ -6,6 +6,8 @@ import java.io.IOException;
 import java.io.InputStream;
 
 import java.net.ConnectException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Properties;
 
 import net.i2p.I2PAppContext;
@@ -26,6 +28,7 @@ public class StreamSinkServer {
     private String _destFile;
     private String _i2cpHost;
     private int _i2cpPort;
+    private int _handlers;
     
     /**
      * Create but do not start the streaming server.  
@@ -34,13 +37,14 @@ public class StreamSinkServer {
      * @param ourDestFile filename to write our binary destination to
      */
     public StreamSinkServer(String sinkDir, String ourDestFile) {
-        this(sinkDir, ourDestFile, null, -1);
+        this(sinkDir, ourDestFile, null, -1, 3);
     }
-    public StreamSinkServer(String sinkDir, String ourDestFile, String i2cpHost, int i2cpPort) {
+    public StreamSinkServer(String sinkDir, String ourDestFile, String i2cpHost, int i2cpPort, int handlers) {
         _sinkDir = sinkDir;
         _destFile = ourDestFile;
         _i2cpHost = i2cpHost;
         _i2cpPort = i2cpPort;
+        _handlers = handlers;
         _log = I2PAppContext.getGlobalContext().logManager().getLog(StreamSinkServer.class);
     }
     
@@ -56,7 +60,8 @@ public class StreamSinkServer {
         else 
             mgr = I2PSocketManagerFactory.createManager();
         Destination dest = mgr.getSession().getMyDestination();
-        System.out.println("Listening for connections on: " + dest.calculateHash().toBase64());
+        if (_log.shouldLog(Log.INFO))
+            _log.info("Listening for connections on: " + dest.calculateHash().toBase64());
         FileOutputStream fos = null;
         try {
             fos = new FileOutputStream(_destFile);
@@ -72,24 +77,16 @@ public class StreamSinkServer {
         }
         
         I2PServerSocket sock = mgr.getServerSocket();
-        while (true) {
-            try {
-                I2PSocket curSock = sock.accept();
-                handle(curSock);
-            } catch (I2PException ie) {
-                _log.error("Error accepting connection", ie);
-                return;
-            } catch (ConnectException ce) {
-                _log.error("Connection already dropped", ce);
-                return;
-            }
-        }
+        startup(sock);
     }
     
-    private void handle(I2PSocket socket) {
-        I2PThread t = new I2PThread(new ClientRunner(socket));
-        t.setName("Handle " + socket.getPeerDestination().calculateHash().toBase64().substring(0,4));
-        t.start();
+    public void startup(I2PServerSocket sock) {
+        for (int i = 0; i < _handlers; i++) {
+            I2PThread t = new I2PThread(new ClientRunner(sock));
+            t.setName("Handler " + i);
+            t.setDaemon(false);
+            t.start();
+        }
     }
     
     /**
@@ -97,27 +94,44 @@ public class StreamSinkServer {
      *
      */
     private class ClientRunner implements Runnable {
-        private I2PSocket _sock;
-        private FileOutputStream _fos;
-        public ClientRunner(I2PSocket socket) {
-            _sock = socket;
+        private I2PServerSocket _socket;
+        public ClientRunner(I2PServerSocket socket) {
+            _socket = socket;
+        }
+        public void run() {
+            while (true) {
+                try {
+                    I2PSocket socket = _socket.accept();
+                    if (socket != null)
+                        handle(socket);
+                } catch (I2PException ie) {
+                    _log.error("Error accepting connection", ie);
+                    return;
+                } catch (ConnectException ce) {
+                    _log.error("Connection already dropped", ce);
+                    return;
+                }       
+            }
+        }
+        
+        private void handle(I2PSocket sock) {
+            FileOutputStream fos = null;
             try {
                 File sink = new File(_sinkDir);
                 if (!sink.exists())
                     sink.mkdirs();
                 File cur = File.createTempFile("clientSink", ".dat", sink);
-                _fos = new FileOutputStream(cur);
-                System.out.println("Writing to " + cur.getAbsolutePath());
+                fos = new FileOutputStream(cur);
+                if (_log.shouldLog(Log.DEBUG))
+                    _log.debug("Writing to " + cur.getAbsolutePath());
             } catch (IOException ioe) {
                 _log.error("Error creating sink", ioe);
-                _fos = null;
+                return;
             }
-        }
-        public void run() {
-            if (_fos == null) return;
+            
             long start = System.currentTimeMillis();
             try {
-                InputStream in = _sock.getInputStream();
+                InputStream in = sock.getInputStream();
                 byte buf[] = new byte[4096];
                 long written = 0;
                 int read = 0;
@@ -125,47 +139,55 @@ public class StreamSinkServer {
                     //_fos.write(buf, 0, read);
                     written += read;
                     if (_log.shouldLog(Log.DEBUG))
-                        _log.debug("read and wrote " + read);
+                        _log.debug("read and wrote " + read + " (" + written + ")");
                 }
-                _fos.write(("written: [" + written + "]\n").getBytes());
+                fos.write(("written: [" + written + "]\n").getBytes());
                 long lifetime = System.currentTimeMillis() - start;
-                _log.error("Got EOF from client socket [written=" + written + " lifetime=" + lifetime + "]");
+                _log.info("Got EOF from client socket [written=" + written + " lifetime=" + lifetime + "]");
             } catch (IOException ioe) {
                 _log.error("Error writing the sink", ioe);
             } finally {
-                if (_fos != null) try { _fos.close(); } catch (IOException ioe) {}
-                if (_sock != null) try { _sock.close(); } catch (IOException ioe) {}
-                _log.error("Client socket closed");
+                if (fos != null) try { fos.close(); } catch (IOException ioe) {}
+                if (sock != null) try { sock.close(); } catch (IOException ioe) {}
+                _log.debug("Client socket closed");
             }
         }
     }
     
     /**
-     * Fire up the streaming server.  <code>Usage: StreamSinkServer [i2cpHost i2cpPort] sinkDir ourDestFile</code><br />
+     * Fire up the streaming server.  <code>Usage: StreamSinkServer [i2cpHost i2cpPort] sinkDir ourDestFile [numHandlers]</code><br />
      * <ul>
      *  <li><b>sinkDir</b>: Directory to store received files in</li>
      *  <li><b>ourDestFile</b>: filename to write our binary destination to</li>
+     *  <li><b>numHandlers</b>: how many concurrent connections to handle</li>
      * </ul>
      */
     public static void main(String args[]) {
         StreamSinkServer server = null;
         switch (args.length) {
             case 0:
-                server = new StreamSinkServer("dataDir", "server.key", "localhost", 7654);
+                server = new StreamSinkServer("dataDir", "server.key", "localhost", 7654, 3);
                 break;
             case 2:
                 server = new StreamSinkServer(args[0], args[1]);
                 break;
             case 4:
+            case 5:
+                int handlers = 3;
+                if (args.length == 5) {
+                    try {
+                        handlers = Integer.parseInt(args[4]);
+                    } catch (NumberFormatException nfe) {}
+                }
                 try { 
                     int port = Integer.parseInt(args[1]);
-                    server = new StreamSinkServer(args[2], args[3], args[0], port);
+                    server = new StreamSinkServer(args[2], args[3], args[0], port, handlers);
                 } catch (NumberFormatException nfe) {
-                    System.out.println("Usage: StreamSinkServer [i2cpHost i2cpPort] sinkDir ourDestFile");
+                    System.out.println("Usage: StreamSinkServer [i2cpHost i2cpPort] sinkDir ourDestFile [handlers]");
                 }
                 break;
             default:
-                System.out.println("Usage: StreamSinkServer [i2cpHost i2cpPort] sinkDir ourDestFile");
+                System.out.println("Usage: StreamSinkServer [i2cpHost i2cpPort] sinkDir ourDestFile [handlers]");
         }
         if (server != null)
             server.runServer();

apps/q/java/build.xml

@@ -17,7 +17,7 @@
     <property location="doc/q/api" name="javadoc.dir"/>
     <property name="project.name" value="${ant.project.name}"/>
     <property location="${project.name}.jar" name="jar"/>
-    <property location="${project.name}.war" name="war"/>
+    <property location="q.war" name="war"/>
   </target>
 
   <target name="builddep">
@@ -59,9 +59,9 @@
         <!-- To make a standalone app, insert into <jar>: -->
         <!-- <manifest><attribute name="Main-Class" value="com.foo.Main"/></manifest> -->
         <war compress="true" jarfile="${war}" webxml="web.xml">
-          <!-- <fileset dir="${classes.dir}" includes="**/QConsole.class"/> -->
-          <classes file="build/net/i2p/aum/q/QConsole.class"/>
-          <classes file="build/HTML/**"/>
+          <!-- <fileset file="build/net/i2p/aum/q/QConsole.class"/> -->
+          <classes dir="build" includes="**/QConsole.class"/>
+          <classes dir="build" includes="**/HTML/**"/>
           <!-- <fileset includes="**/HTML/*.class"/> -->
           <lib file="xmlrpc.jar"/>
         </war>

apps/q/java/src/net/i2p/aum/q/QNode.java

@@ -157,6 +157,8 @@ public abstract class QNode extends Thread
      */
 
     public String nodeType = "(base)";
+    
+    public boolean isRunning;
 
     // ----------------------------------------------------------
     // CONSTRUCTORS
@@ -580,6 +582,13 @@ public abstract class QNode extends Thread
         System.out.println("scheduleStartupJobs: c<p="+updateCatalogFromPeers+", isClient="+isClient);
     }
 
+    public void scheduleShutdown()
+    {
+        Hashtable job = new Hashtable();
+        job.put("cmd", "shutdown");
+        runAfter(1000, job, "shutdown");
+    }
+
     public void schedulePeerUploadJob(QDataItem item)
     {
         String uri = (String)item.get("uri");
@@ -790,6 +799,8 @@ public abstract class QNode extends Thread
     {
         log.info("Starting background tasks");
         
+        isRunning = true;
+        
         // mark our start time
         nodeStartTime = new Date();
         
@@ -833,7 +844,7 @@ public abstract class QNode extends Thread
 
         // fetch items from the job queue, and launch
         // threads to execute them
-        while (true)
+        while (isRunning)
         {
             // get a thread slot from the thread pool
             try {

apps/q/java/src/net/i2p/aum/q/QServerMethods.java

@@ -341,13 +341,15 @@ public class QServerMethods {
         //System.out.println("shutdown: our privkey="+node.privKeyStr);
         //System.out.println("shutdown: nodePrivKey="+nodePrivKey);
         if (nodePrivKey.equals(node.privKeyStr)) {
+
+            res.put("status", "ok");
+            //node.scheduleShutdown();
             // get a runtime
-            System.out.println("Node at "+node.dataDir+" shutting down");
+            //System.out.println("Node at "+node.dataDir+" shutting down");
             Runtime r = Runtime.getRuntime();
-            
             // and terminate the vm
-            r.exit(0);
-            //r.halt(0);
+            //r.exit(0);
+            r.halt(0);
         }
         else {
             res.put("status", "error");

apps/q/java/src/net/i2p/aum/q/QWorkerThread.java

@@ -62,6 +62,9 @@ class QWorkerThread extends Thread {
             else if (cmd.equals("test")) {
                 doTest();
             }
+            else if (cmd.equals("shutdown")) {
+                doShutdown();
+            }
             else {
                 node.log.error("workerthread.run: unrecognised command '"+cmd+"'");
                 System.out.println("workerthread.run: unrecognised command '"+cmd+"'");
@@ -90,6 +93,21 @@ class QWorkerThread extends Thread {
         System.out.println("TESTJOB: msg='"+msg+"'");
     }
     
+    public void doShutdown() throws Exception {
+        
+        try {
+            new File(node.jobsDir + node.sep + jobTime).delete();
+            new File(node.jobsDir + node.sep + jobTime + ".desc").delete();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        SimpleFile f = new SimpleFile("/tmp/eeee", "rws");
+        f.write("xxx");
+        node.isRunning = false;
+        Runtime.getRuntime().halt(0);
+    }
+    
     public void doLocalPutItem() throws Exception {
         Hashtable metadata = (Hashtable)job.get("metadata");
         String path = (String)job.get("localDataFilePath");

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

@@ -16,6 +16,7 @@ import java.util.Iterator;
 import java.util.Set;
 
 import net.i2p.time.Timestamper;
+import net.i2p.router.transport.udp.UDPTransport;
 
 /**
  * Handler to deal with form submissions from the main config form and act
@@ -27,11 +28,16 @@ public class ConfigNetHandler extends FormHandler {
     private boolean _guessRequested;
     private boolean _reseedRequested;
     private boolean _saveRequested;
+    private boolean _recheckReachabilityRequested;
     private boolean _timeSyncEnabled;
-    private String _port;
+    private boolean _requireIntroductions;
+    private String _tcpPort;
+    private String _udpPort;
     private String _inboundRate;
+    private String _inboundBurstRate;
     private String _inboundBurst;
     private String _outboundRate;
+    private String _outboundBurstRate;
     private String _outboundBurst;
     private String _reseedFrom;
     private String _sharePct;
@@ -43,6 +49,8 @@ public class ConfigNetHandler extends FormHandler {
             reseed();
         } else if (_saveRequested) {
             saveChanges();
+        } else if (_recheckReachabilityRequested) {
+            recheckReachability();
         } else {
             // noop
         }
@@ -52,22 +60,33 @@ public class ConfigNetHandler extends FormHandler {
     public void setReseed(String moo) { _reseedRequested = true; }
     public void setSave(String moo) { _saveRequested = true; }
     public void setEnabletimesync(String moo) { _timeSyncEnabled = true; }
+    public void setRecheckReachability(String moo) { _recheckReachabilityRequested = true; }
+    public void setRequireIntroductions(String moo) { _requireIntroductions = true; }
     
     public void setHostname(String hostname) { 
         _hostname = (hostname != null ? hostname.trim() : null); 
     }
-    public void setPort(String port) { 
-        _port = (port != null ? port.trim() : null); 
+    public void setTcpPort(String port) { 
+        _tcpPort = (port != null ? port.trim() : null); 
+    }
+    public void setUdpPort(String port) { 
+        _udpPort = (port != null ? port.trim() : null); 
     }
     public void setInboundrate(String rate) { 
         _inboundRate = (rate != null ? rate.trim() : null); 
     }
+    public void setInboundburstrate(String rate) { 
+        _inboundBurstRate = (rate != null ? rate.trim() : null); 
+    }
     public void setInboundburstfactor(String factor) { 
         _inboundBurst = (factor != null ? factor.trim() : null); 
     }
     public void setOutboundrate(String rate) { 
         _outboundRate = (rate != null ? rate.trim() : null); 
     }
+    public void setOutboundburstrate(String rate) { 
+        _outboundBurstRate = (rate != null ? rate.trim() : null); 
+    }
     public void setOutboundburstfactor(String factor) { 
         _outboundBurst = (factor != null ? factor.trim() : null); 
     }
@@ -191,6 +210,11 @@ public class ConfigNetHandler extends FormHandler {
         fos.close();
     }
     
+    private void recheckReachability() {
+        _context.commSystem().recheckReachability();
+        addFormNotice("Rechecking router reachability...");
+    }
+    
     /**
      * The user made changes to the network config and wants to save them, so
      * lets go ahead and do so.
@@ -207,14 +231,25 @@ public class ConfigNetHandler extends FormHandler {
                 restartRequired = true;
             }
         }
-        if ( (_port != null) && (_port.length() > 0) ) {
+        if ( (_tcpPort != null) && (_tcpPort.length() > 0) ) {
             String oldPort = _context.router().getConfigSetting(ConfigNetHelper.PROP_I2NP_TCP_PORT);
-            if ( (oldPort == null) && (_port.equals("8887")) ) {
+            if ( (oldPort == null) && (_tcpPort.equals("8887")) ) {
                 // still on default.. noop
-            } else if ( (oldPort == null) || (!oldPort.equalsIgnoreCase(_port)) ) {
+            } else if ( (oldPort == null) || (!oldPort.equalsIgnoreCase(_tcpPort)) ) {
                 // its not the default OR it has changed
-                _context.router().setConfigSetting(ConfigNetHelper.PROP_I2NP_TCP_PORT, _port);
-                addFormNotice("Updating TCP port from " + oldPort + " to " + _port);
+                _context.router().setConfigSetting(ConfigNetHelper.PROP_I2NP_TCP_PORT, _tcpPort);
+                addFormNotice("Updating TCP port from " + oldPort + " to " + _tcpPort);
+                restartRequired = true;
+            }
+        }
+        if ( (_udpPort != null) && (_udpPort.length() > 0) ) {
+            String oldPort = _context.router().getConfigSetting(ConfigNetHelper.PROP_I2NP_UDP_PORT);
+            if ( (oldPort == null) && (_udpPort.equals("8887")) ) {
+                // still on default.. noop
+            } else if ( (oldPort == null) || (!oldPort.equalsIgnoreCase(_udpPort)) ) {
+                // its not the default OR it has changed
+                _context.router().setConfigSetting(ConfigNetHelper.PROP_I2NP_TCP_PORT, _udpPort);
+                addFormNotice("Updating UDP port from " + oldPort + " to " + _udpPort);
                 restartRequired = true;
             }
         }
@@ -229,7 +264,14 @@ public class ConfigNetHandler extends FormHandler {
             }
         }
         
-        if (_timeSyncEnabled) {
+        if (_requireIntroductions) {
+            _context.router().setConfigSetting(UDPTransport.PROP_FORCE_INTRODUCERS, "true");
+            addFormNotice("Requiring SSU introduers");
+        } else {
+            _context.router().removeConfigSetting(UDPTransport.PROP_FORCE_INTRODUCERS);
+        }
+        
+        if (true || _timeSyncEnabled) {
             // Time sync enable, means NOT disabled 
             _context.router().setConfigSetting(Timestamper.PROP_DISABLED, "false");
         } else {
@@ -259,14 +301,22 @@ public class ConfigNetHandler extends FormHandler {
             _context.router().setConfigSetting(ConfigNetHelper.PROP_OUTBOUND_KBPS, _outboundRate);
             updated = true;
         }
+        if ( (_inboundBurstRate != null) && (_inboundBurstRate.length() > 0) ) {
+            _context.router().setConfigSetting(ConfigNetHelper.PROP_INBOUND_BURST_KBPS, _inboundBurstRate);
+            updated = true;
+        }
+        if ( (_outboundBurstRate != null) && (_outboundBurstRate.length() > 0) ) {
+            _context.router().setConfigSetting(ConfigNetHelper.PROP_OUTBOUND_BURST_KBPS, _outboundBurstRate);
+            updated = true;
+        }
         
-        String inRate = _context.router().getConfigSetting(ConfigNetHelper.PROP_INBOUND_KBPS);
+        String inBurstRate = _context.router().getConfigSetting(ConfigNetHelper.PROP_INBOUND_BURST_KBPS);
         
         if (_inboundBurst != null) {
             int rateKBps = 0;
             int burstSeconds = 0;
             try {
-                rateKBps = Integer.parseInt(inRate);
+                rateKBps = Integer.parseInt(inBurstRate);
                 burstSeconds = Integer.parseInt(_inboundBurst);
             } catch (NumberFormatException nfe) {
                 // ignore
@@ -278,13 +328,13 @@ public class ConfigNetHandler extends FormHandler {
             }
         }
         
-        String outRate = _context.router().getConfigSetting(ConfigNetHelper.PROP_OUTBOUND_KBPS);
+        String outBurstRate = _context.router().getConfigSetting(ConfigNetHelper.PROP_OUTBOUND_BURST_KBPS);
         
         if (_outboundBurst != null) {
             int rateKBps = 0;
             int burstSeconds = 0;
             try {
-                rateKBps = Integer.parseInt(outRate);
+                rateKBps = Integer.parseInt(outBurstRate);
                 burstSeconds = Integer.parseInt(_outboundBurst);
             } catch (NumberFormatException nfe) {
                 // ignore

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

@@ -2,6 +2,10 @@ package net.i2p.router.web;
 
 import net.i2p.time.Timestamper;
 import net.i2p.router.RouterContext;
+import net.i2p.router.CommSystemFacade;
+import net.i2p.data.RouterAddress;
+import net.i2p.router.transport.udp.UDPAddress;
+import net.i2p.router.transport.udp.UDPTransport;
 
 public class ConfigNetHelper {
     private RouterContext _context;
@@ -24,11 +28,13 @@ public class ConfigNetHelper {
     /** copied from various private TCP components */
     public final static String PROP_I2NP_TCP_HOSTNAME = "i2np.tcp.hostname";
     public final static String PROP_I2NP_TCP_PORT = "i2np.tcp.port";
+    public final static String PROP_I2NP_UDP_PORT = "i2np.udp.port";
+    public final static String PROP_I2NP_INTERNAL_UDP_PORT = "i2np.udp.internalPort";
     
     public String getHostname() {
         return _context.getProperty(PROP_I2NP_TCP_HOSTNAME);
     }
-    public String getPort() {
+    public String getTcpPort() {
         int port = 8887;
         String val = _context.getProperty(PROP_I2NP_TCP_PORT);
         if (val != null) {
@@ -41,6 +47,14 @@ public class ConfigNetHelper {
         return "" + port;
     }
     
+    public String getUdpAddress() {
+        RouterAddress addr = _context.router().getRouterInfo().getTargetAddress("SSU");
+        if (addr == null)
+            return "unknown";
+        UDPAddress ua = new UDPAddress(addr);
+        return ua.toString();
+    }
+    
     public String getEnableTimeSyncChecked() {
         String disabled = _context.getProperty(Timestamper.PROP_DISABLED, "false");
         if ( (disabled != null) && ("true".equalsIgnoreCase(disabled)) )
@@ -49,8 +63,29 @@ public class ConfigNetHelper {
             return " checked ";
     }
     
+    public String getRequireIntroductionsChecked() {
+        short status = _context.commSystem().getReachabilityStatus();
+        switch (status) {
+            case CommSystemFacade.STATUS_OK:
+                if ("true".equalsIgnoreCase(_context.getProperty(UDPTransport.PROP_FORCE_INTRODUCERS, "false")))
+                    return "checked=\"true\"";
+                return "";
+            case CommSystemFacade.STATUS_DIFFERENT:
+            case CommSystemFacade.STATUS_REJECT_UNSOLICITED:
+                return "checked=\"true\"";
+            case CommSystemFacade.STATUS_UNKNOWN:
+                if ("true".equalsIgnoreCase(_context.getProperty(UDPTransport.PROP_FORCE_INTRODUCERS, "false")))
+                    return "checked=\"true\"";
+                return "";
+            default:
+                return "checked=\"true\"";
+        }
+    }
+    
     public static final String PROP_INBOUND_KBPS = "i2np.bandwidth.inboundKBytesPerSecond";
     public static final String PROP_OUTBOUND_KBPS = "i2np.bandwidth.outboundKBytesPerSecond";
+    public static final String PROP_INBOUND_BURST_KBPS = "i2np.bandwidth.inboundBurstKBytesPerSecond";
+    public static final String PROP_OUTBOUND_BURST_KBPS = "i2np.bandwidth.outboundBurstKBytesPerSecond";
     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";
@@ -61,14 +96,28 @@ public class ConfigNetHelper {
         if (rate != null)
             return rate;
         else
-            return "-1";
+            return "16";
     }
     public String getOutboundRate() {
         String rate = _context.getProperty(PROP_OUTBOUND_KBPS);
         if (rate != null)
             return rate;
         else
-            return "-1";
+            return "16";
+    }
+    public String getInboundBurstRate() {
+        String rate = _context.getProperty(PROP_INBOUND_BURST_KBPS);
+        if (rate != null)
+            return rate;
+        else
+            return "32";
+    }
+    public String getOutboundBurstRate() {
+        String rate = _context.getProperty(PROP_OUTBOUND_BURST_KBPS);
+        if (rate != null)
+            return rate;
+        else
+            return "32";
     }
     public String getInboundBurstFactorBox() {
         String rate = _context.getProperty(PROP_INBOUND_KBPS);

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

@@ -0,0 +1,96 @@
+package net.i2p.router.web;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import net.i2p.util.Log;
+import net.i2p.stat.StatManager;
+
+/**
+ * Handler to deal with form submissions from the stats config form and act
+ * upon the values.
+ *
+ */
+public class ConfigStatsHandler extends FormHandler {
+    private String _filename;
+    private List _stats;
+    private boolean _explicitFilter;
+    private String _explicitFilterValue;
+    
+    public ConfigStatsHandler() {
+        super();
+        _stats = new ArrayList();
+        _explicitFilter = false;
+    }
+    
+    protected void processForm() {
+        saveChanges();
+    }
+    
+    public void setFilename(String filename) {
+        _filename = (filename != null ? filename.trim() : null);
+    }
+
+    public void setStatList(String stats[]) {
+        if (stats != null) {
+            for (int i = 0; i < stats.length; i++) {
+                String cur = stats[i].trim();
+                if (_log.shouldLog(Log.DEBUG))
+                    _log.debug("Stat: [" + cur + "]");
+                if ( (cur.length() > 0) && (!_stats.contains(cur)) )
+                    _stats.add(cur);
+            }
+        }
+        if (_log.shouldLog(Log.DEBUG))
+            _log.debug("Updated stats: " + _stats);
+    }
+
+    public void setExplicitFilter(String foo) { _explicitFilter = true; }
+    public void setExplicitFilterValue(String filter) { _explicitFilterValue = filter; }
+    
+    /**
+     * The user made changes to the config and wants to save them, so
+     * lets go ahead and do so.
+     *
+     */
+    private void saveChanges() {
+        if (_filename == null)
+            _filename = StatManager.DEFAULT_STAT_FILE;
+        _context.router().setConfigSetting(StatManager.PROP_STAT_FILE, _filename);
+        
+        if (_explicitFilter) {
+            _stats.clear();
+            
+            if (_explicitFilterValue.indexOf(',') != -1) {
+                StringTokenizer tok = new StringTokenizer(_explicitFilterValue, ",");
+                while (tok.hasMoreTokens()) {
+                    String cur = tok.nextToken().trim();
+                    if ( (cur.length() > 0) && (!_stats.contains(cur)) )
+                        _stats.add(cur);
+                }
+            } else {
+                String stat = _explicitFilterValue.trim();
+                if ( (stat.length() > 0) && (!_stats.contains(stat)) )
+                    _stats.add(stat);
+            }
+        }
+        
+        StringBuffer stats = new StringBuffer();
+        for (int i = 0; i < _stats.size(); i++) {
+            stats.append((String)_stats.get(i));
+            if (i + 1 < _stats.size())
+                stats.append(',');
+        }
+            
+        _context.router().setConfigSetting(StatManager.PROP_STAT_FILTER, stats.toString());
+        boolean ok = _context.router().saveConfig();
+        if (ok) 
+            addFormNotice("Stat filter and location updated successfully to: " + stats.toString());
+        else
+            addFormError("Failed to update the stat filter and location");
+    }
+    
+}

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

@@ -0,0 +1,125 @@
+package net.i2p.router.web;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+import net.i2p.stat.RateStat;
+import net.i2p.stat.FrequencyStat;
+import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
+
+public class ConfigStatsHelper {
+    private RouterContext _context;
+    private Log _log;
+    private String _filter;
+    private Set _filters;
+    /** list of names of stats which are remaining, ordered by nested groups */
+    private List _stats;
+    private String _currentStatName;
+    private String _currentStatDescription;
+    private String _currentGroup;
+    /** true if the current stat is the first in the group */
+    private boolean _currentIsFirstInGroup;
+    /** true if the stat is being logged */
+    private boolean _currentIsLogged;
+    
+    /**
+     * 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);
+            _log = _context.logManager().getLog(ConfigStatsHelper.class);
+        } catch (Throwable t) {
+            t.printStackTrace();
+        }
+        
+        _stats = new ArrayList();
+        Map groups = _context.statManager().getStatsByGroup();
+        for (Iterator iter = groups.values().iterator(); iter.hasNext(); ) {
+            Set stats = (Set)iter.next();
+            for (Iterator statIter = stats.iterator(); statIter.hasNext(); ) 
+                _stats.add(statIter.next());
+        }
+        _filter = _context.statManager().getStatFilter(); 
+        if (_filter == null)
+            _filter = "";
+        
+        _filters = new HashSet();
+        StringTokenizer tok = new StringTokenizer(_filter, ",");
+        while (tok.hasMoreTokens())
+            _filters.add(tok.nextToken().trim());
+    }
+
+    public ConfigStatsHelper() {}
+    
+    public String getFilename() { return _context.statManager().getStatFile(); }
+    
+    /** 
+     * move the cursor to the next known stat, returning true if a valid
+     * stat is available.
+     *
+     * @return true if a valid stat is available, otherwise false
+     */
+    public boolean hasMoreStats() {
+        if (_stats.size() <= 0)
+            return false;
+        _currentStatName = (String)_stats.remove(0);
+        RateStat rs = _context.statManager().getRate(_currentStatName);
+        if (rs != null) {
+            _currentStatDescription = rs.getDescription();
+            if (_currentGroup == null)
+                _currentIsFirstInGroup = true;
+            else if (!rs.getGroupName().equals(_currentGroup))
+                _currentIsFirstInGroup = true;
+            else
+                _currentIsFirstInGroup = false;
+            _currentGroup = rs.getGroupName();
+        } else {
+            FrequencyStat fs = _context.statManager().getFrequency(_currentStatName);
+            if (fs != null) {
+                _currentStatDescription = fs.getDescription();
+                if (_currentGroup == null)
+                    _currentIsFirstInGroup = true;
+                else if (!fs.getGroupName().equals(_currentGroup))
+                    _currentIsFirstInGroup = true;
+                else
+                    _currentIsFirstInGroup = false;
+                _currentGroup = fs.getGroupName();
+            } else {
+                if (_log.shouldLog(Log.ERROR))
+                    _log.error("Stat does not exist?!  [" + _currentStatName + "]");
+                return false;
+            }
+        }
+        
+        if (_filters.contains("*") || _filters.contains(_currentStatName))
+            _currentIsLogged = true;
+        else
+            _currentIsLogged = false;
+        return true;
+    }
+    
+    /** Is the current stat the first in the group? */
+    public boolean groupRequired() {
+        if (_currentIsFirstInGroup) {
+            _currentIsFirstInGroup = false;
+            return true;
+        } else {
+            return false;
+        }
+    }
+    /** What group is the current stat in */
+    public String getCurrentGroupName() { return _currentGroup; }
+    public String getCurrentStatName() { return _currentStatName; }
+    public String getCurrentStatDescription() { return _currentStatDescription; }
+    public boolean getCurrentIsLogged() { return _currentIsLogged; }
+    public String getExplicitFilter() { return _filter; }
+}

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

@@ -1,6 +1,10 @@
 package net.i2p.router.web;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
+import net.i2p.router.Router;
+import net.i2p.router.web.ConfigServiceHandler.UpdateWrapperManagerTask;
+import net.i2p.util.Log;
 
 /**
  *
@@ -31,6 +35,15 @@ public class ConfigUpdateHandler extends FormHandler {
     public static final String DEFAULT_PROXY_PORT = "4444";
     
     protected void processForm() {
+        if ("Check for update now".equals(_action)) {
+            NewsFetcher fetcher = NewsFetcher.getInstance(I2PAppContext.getGlobalContext());
+            fetcher.fetchNews();
+            if (fetcher.updateAvailable())
+                addFormNotice("Update available, click link on left");
+            else
+                addFormNotice("No update available");
+        }
+
         if ( (_newsURL != null) && (_newsURL.length() > 0) ) {
             String oldURL = _context.router().getConfigSetting(PROP_NEWS_URL);
             if ( (oldURL == null) || (!_newsURL.equals(oldURL)) ) {
@@ -38,6 +51,7 @@ public class ConfigUpdateHandler extends FormHandler {
                 addFormNotice("Updating news URL to " + _newsURL);
             }
         }
+        
         if ( (_updateURL != null) && (_updateURL.length() > 0) ) {
             String oldURL = _context.router().getConfigSetting(PROP_UPDATE_URL);
             if ( (oldURL == null) || (!_updateURL.equals(oldURL)) ) {
@@ -56,7 +70,7 @@ public class ConfigUpdateHandler extends FormHandler {
         
         if ( (_proxyPort != null) && (_proxyPort.length() > 0) ) {
             String oldPort = _context.router().getConfigSetting(PROP_PROXY_PORT);
-            if ( (oldPort == null) || (!_proxyHost.equals(oldPort)) ) {
+            if ( (oldPort == null) || (!_proxyPort.equals(oldPort)) ) {
                 _context.router().setConfigSetting(PROP_PROXY_PORT, _proxyPort);
                 addFormNotice("Updating proxy port to " + _proxyPort);
             }

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

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.ArrayList;
 
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Simple form handler base class - does not depend on servlets or jsp,
@@ -16,8 +17,10 @@ import net.i2p.router.RouterContext;
  */
 public class FormHandler {
     protected RouterContext _context;
+    protected Log _log;
     private String _nonce;
     protected String _action;
+    protected String _passphrase;
     private List _errors;
     private List _notices;
     private boolean _processed;
@@ -30,6 +33,7 @@ public class FormHandler {
         _processed = false;
         _valid = true;
         _nonce = null;
+        _passphrase = null;
     }
     
     /**
@@ -41,6 +45,7 @@ public class FormHandler {
     public void setContextId(String contextId) {
         try {
             _context = ContextHelper.getContext(contextId);
+            _log = _context.logManager().getLog(getClass());
         } catch (Throwable t) {
             t.printStackTrace();
         }
@@ -48,6 +53,7 @@ public class FormHandler {
 
     public void setNonce(String val) { _nonce = val; }
     public void setAction(String val) { _action = val; }
+    public void setPassphrase(String val) { _passphrase = val; }
     
     /**
      * Override this to perform the final processing (in turn, adding formNotice
@@ -116,8 +122,14 @@ public class FormHandler {
         String noncePrev = System.getProperty(getClass().getName() + ".noncePrev");
         if ( ( (nonce == null) || (!_nonce.equals(nonce)) ) &&
              ( (noncePrev == null) || (!_nonce.equals(noncePrev)) ) ) {
-            addFormError("Invalid nonce, are you being spoofed?");
-            _valid = false;
+                 
+            String expected = _context.getProperty("consolePassword");
+            if ( (expected != null) && (expected.trim().length() > 0) && (expected.equals(_passphrase)) ) {
+                // ok
+            } else {
+                addFormError("Invalid nonce, are you being spoofed?");
+                _valid = false;
+            }
         }
     }
     

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

@@ -91,7 +91,7 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
             return false;
         }
     }
-    private void fetchNews() {
+    public void fetchNews() {
         String newsURL = _context.getProperty(ConfigUpdateHandler.PROP_NEWS_URL, ConfigUpdateHandler.DEFAULT_NEWS_URL);
         boolean shouldProxy = Boolean.valueOf(_context.getProperty(ConfigUpdateHandler.PROP_SHOULD_PROXY, ConfigUpdateHandler.DEFAULT_SHOULD_PROXY)).booleanValue();
         String proxyHost = _context.getProperty(ConfigUpdateHandler.PROP_PROXY_HOST, ConfigUpdateHandler.DEFAULT_PROXY_HOST);
@@ -198,7 +198,7 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
     public void bytesTransferred(long alreadyTransferred, int currentWrite, long bytesTransferred, long bytesRemaining, String url) {
         // ignore
     }
-    public void transferComplete(long alreadyTransferred, long bytesTransferred, long bytesRemaining, String url, String outputFile) {
+    public void transferComplete(long alreadyTransferred, long bytesTransferred, long bytesRemaining, String url, String outputFile, boolean notModified) {
         if (_log.shouldLog(Log.INFO))
             _log.info("News fetched from " + url + " with " + (alreadyTransferred+bytesTransferred));
         
@@ -224,4 +224,5 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
         File temp = new File(TEMP_NEWS_FILE);
         temp.delete();
     }
+    public void headerReceived(String url, int attemptNum, String key, String val) {}
 }

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

@@ -25,8 +25,11 @@ public class NoticeHelper {
     
     public String getSystemNotice() {
         if (_context.router().gracefulShutdownInProgress()) {
-            return "Graceful shutdown in " 
-                   + DataHelper.formatDuration(_context.router().getShutdownTimeRemaining());
+            long remaining = _context.router().getShutdownTimeRemaining();
+            if (remaining > 0)
+                return "Graceful shutdown in " + DataHelper.formatDuration(remaining);
+            else
+                return "Graceful shutdown imminent, please be patient as state is written to disk";
         } else {
             return "";
         }

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

@@ -0,0 +1,37 @@
+package net.i2p.router.web;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import net.i2p.router.RouterContext;
+
+public class PeerHelper {
+    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 PeerHelper() {}
+    
+    public void setOut(Writer out) { _out = out; }
+    
+    public String getPeerSummary() {
+        try {
+            _context.commSystem().renderStatusHTML(_out);
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+        return "";
+    }
+}

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

@@ -28,14 +28,19 @@ public class ReseedHandler {
         if (nonce == null) return;
         if (nonce.equals(System.getProperty("net.i2p.router.web.ReseedHandler.nonce")) ||
             nonce.equals(System.getProperty("net.i2p.router.web.ReseedHandler.noncePrev"))) {
-            synchronized (_reseedRunner) {
-                if (_reseedRunner.isRunning()) {
-                    return;
-                } else {
-                    System.setProperty("net.i2p.router.web.ReseedHandler.reseedInProgress", "true");
-                    I2PThread reseed = new I2PThread(_reseedRunner, "Reseed");
-                    reseed.start();
-                }
+            requestReseed();
+        }
+    }
+    
+    public static void requestReseed() {
+        synchronized (_reseedRunner) {
+            if (_reseedRunner.isRunning()) {
+                return;
+            } else {
+                System.setProperty("net.i2p.router.web.ReseedHandler.reseedInProgress", "true");
+                System.out.println("Reseeding");
+                I2PThread reseed = new I2PThread(_reseedRunner, "Reseed");
+                reseed.start();
             }
         }
     }
@@ -46,7 +51,8 @@ public class ReseedHandler {
         public boolean isRunning() { return _isRunning; }
         public void run() {
             _isRunning = true;
-            reseed();
+            reseed(false);
+            System.out.println("Reseeding complete");
             System.setProperty("net.i2p.router.web.ReseedHandler.reseedInProgress", "false");
             _isRunning = false;
         }
@@ -59,7 +65,7 @@ public class ReseedHandler {
      * save them into this router's netDb dir.
      *
      */
-    private static void reseed() {
+    private static void reseed(boolean echoStatus) {
         String seedURL = System.getProperty("i2p.reseedURL", DEFAULT_SEED_URL);
         if ( (seedURL == null) || (seedURL.trim().length() <= 0) ) 
             seedURL = DEFAULT_SEED_URL;
@@ -85,10 +91,16 @@ public class ReseedHandler {
                 try {
                     fetchSeed(seedURL, (String)iter.next());
                     fetched++;
+                    if (echoStatus) {
+                        System.out.print(".");
+                        if (fetched % 60 == 0)
+                            System.out.println();
+                    }
                 } catch (Exception e) {
                     errors++;
                 }
             }
+            if (echoStatus) System.out.println();
         } catch (Throwable t) {
             I2PAppContext.getGlobalContext().logManager().getLog(ReseedHandler.class).error("Error reseeding", t);
         }
@@ -172,7 +184,11 @@ public class ReseedHandler {
     }
     
     public static void main(String args[]) {
-        reseed();
-        //System.out.println("Done reseeding");
+        if ( (args != null) && (args.length == 1) && (!Boolean.valueOf(args[0]).booleanValue()) ) {
+            System.out.println("Not reseeding, as requested");
+            return; // not reseeding on request
+        }
+        System.out.println("Reseeding");
+        reseed(true);
     }
 }

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

@@ -72,6 +72,24 @@ public class RouterConsoleRunner {
         } catch (Throwable t) {
             t.printStackTrace();
         }
+
+        // we check the i2p installation directory (.) for a flag telling us not to reseed, 
+        // but also check the home directory for that flag too, since new users installing i2p
+        // don't have an installation directory that they can put the flag in yet.
+        File noReseedFile = new File(new File(System.getProperty("user.home")), ".i2pnoreseed");
+        File noReseedFileAlt1 = new File(new File(System.getProperty("user.home")), "noreseed.i2p");
+        File noReseedFileAlt2 = new File(".i2pnoreseed");
+        File noReseedFileAlt3 = new File("noreseed.i2p");
+        if (!noReseedFile.exists() && !noReseedFileAlt1.exists() && !noReseedFileAlt2.exists() && !noReseedFileAlt3.exists()) {
+            File netDb = new File("netDb");
+            // sure, some of them could be "my.info" or various leaseSet- files, but chances are, 
+            // if someone has those files, they've already been seeded (at least enough to let them
+            // get i2p started - they can reseed later in the web console)
+            String names[] = (netDb.exists() ? netDb.list() : null);
+            if ( (names == null) || (names.length < 15) ) {
+                ReseedHandler.requestReseed();
+            }
+        }
         
         NewsFetcher fetcher = NewsFetcher.getInstance(I2PAppContext.getGlobalContext());
         I2PThread t = new I2PThread(fetcher, "NewsFetcher");

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

@@ -12,6 +12,7 @@ import net.i2p.data.Destination;
 import net.i2p.data.LeaseSet;
 import net.i2p.stat.Rate;
 import net.i2p.stat.RateStat;
+import net.i2p.router.CommSystemFacade;
 import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
 import net.i2p.router.RouterVersion;
@@ -94,7 +95,24 @@ public class SummaryHelper {
     }
     
     public boolean allowReseed() {
-        return (_context.netDb().getKnownRouters() < 10);
+        return (_context.netDb().getKnownRouters() < 30);
+    }
+    
+    public int getAllPeers() { return _context.netDb().getKnownRouters(); }
+    
+    public String getReachability() {
+        int status = _context.commSystem().getReachabilityStatus();
+        switch (status) {
+            case CommSystemFacade.STATUS_OK:
+                return "OK";
+            case CommSystemFacade.STATUS_DIFFERENT:
+                return "ERR-SymmetricNAT";
+            case CommSystemFacade.STATUS_REJECT_UNSOLICITED:
+                return "OK (NAT)";
+            case CommSystemFacade.STATUS_UNKNOWN: // fallthrough
+            default:
+                return "Unknown";
+        }
     }
     
     /**
@@ -188,13 +206,12 @@ public class SummaryHelper {
         if (_context == null) 
             return "0.0";
         
-        RateStat receiveRate = _context.statManager().getRate("transport.receiveMessageSize");
+        RateStat receiveRate = _context.statManager().getRate("bw.recvRate");
+        if (receiveRate == null) return "0.0";
         Rate rate = receiveRate.getRate(60*1000);
-        double bytes = rate.getLastTotalValue();
-        double bps = (bytes*1000.0d)/(rate.getPeriod()*1024.0d); 
-
-	DecimalFormat fmt = new DecimalFormat("##0.00");
-        return fmt.format(bps);
+        double kbps = rate.getAverageValue()/1024;
+        DecimalFormat fmt = new DecimalFormat("##0.00");
+        return fmt.format(kbps);
     }
     /**
      * How fast we have been sending data over the last minute (pretty printed
@@ -205,13 +222,12 @@ public class SummaryHelper {
         if (_context == null) 
             return "0.0";
         
-        RateStat receiveRate = _context.statManager().getRate("transport.sendMessageSize");
+        RateStat receiveRate = _context.statManager().getRate("bw.sendRate");
+        if (receiveRate == null) return "0.0";
         Rate rate = receiveRate.getRate(60*1000);
-        double bytes = rate.getLastTotalValue();
-        double bps = (bytes*1000.0d)/(rate.getPeriod()*1024.0d); 
-
-	DecimalFormat fmt = new DecimalFormat("##0.00");
-        return fmt.format(bps);
+        double kbps = rate.getAverageValue()/1024;
+        DecimalFormat fmt = new DecimalFormat("##0.00");
+        return fmt.format(kbps);
     }
     
     /**
@@ -223,13 +239,12 @@ public class SummaryHelper {
         if (_context == null) 
             return "0.0";
         
-        RateStat receiveRate = _context.statManager().getRate("transport.receiveMessageSize");
+        RateStat receiveRate = _context.statManager().getRate("bw.recvRate");
+        if (receiveRate == null) return "0.0";
         Rate rate = receiveRate.getRate(5*60*1000);
-        double bytes = rate.getLastTotalValue();
-        double bps = (bytes*1000.0d)/(rate.getPeriod()*1024.0d); 
-
-	DecimalFormat fmt = new DecimalFormat("##0.00");
-        return fmt.format(bps);
+        double kbps = rate.getAverageValue()/1024;
+        DecimalFormat fmt = new DecimalFormat("##0.00");
+        return fmt.format(kbps);
     }
     
     /**
@@ -241,13 +256,12 @@ public class SummaryHelper {
         if (_context == null) 
             return "0.0";
         
-        RateStat receiveRate = _context.statManager().getRate("transport.sendMessageSize");
+        RateStat receiveRate = _context.statManager().getRate("bw.sendRate");
+        if (receiveRate == null) return "0.0";
         Rate rate = receiveRate.getRate(5*60*1000);
-        double bytes = rate.getLastTotalValue();
-        double bps = (bytes*1000.0d)/(rate.getPeriod()*1024.0d); 
-
-	DecimalFormat fmt = new DecimalFormat("##0.00");
-        return fmt.format(bps);
+        double kbps = rate.getAverageValue()/1024;
+        DecimalFormat fmt = new DecimalFormat("##0.00");
+        return fmt.format(kbps);
     }
     
     /**
@@ -259,20 +273,11 @@ public class SummaryHelper {
         if (_context == null) 
             return "0.0";
         
-        long received = _context.bandwidthLimiter().getTotalAllocatedInboundBytes();
-
+        RateStat receiveRate = _context.statManager().getRate("bw.recvRate");
+        if (receiveRate == null) return "0.0";
+        double kbps = receiveRate.getLifetimeAverageValue()/1024;
         DecimalFormat fmt = new DecimalFormat("##0.00");
-
-        // we use the unadjusted time, since thats what getWhenStarted is based off
-        long lifetime = _context.clock().now()-_context.clock().getOffset()
-                        - _context.router().getWhenStarted();
-        lifetime /= 1000;
-        if (received > 0) {
-            double receivedKBps = received / (lifetime*1024.0);
-            return fmt.format(receivedKBps);
-        } else {
-            return "0.0";
-        }
+        return fmt.format(kbps);
     }
     
     /**
@@ -284,20 +289,11 @@ public class SummaryHelper {
         if (_context == null) 
             return "0.0";
         
-        long sent = _context.bandwidthLimiter().getTotalAllocatedOutboundBytes();
-
+        RateStat sendRate = _context.statManager().getRate("bw.sendRate");
+        if (sendRate == null) return "0.0";
+        double kbps = sendRate.getLifetimeAverageValue()/1024;
         DecimalFormat fmt = new DecimalFormat("##0.00");
-
-        // we use the unadjusted time, since thats what getWhenStarted is based off
-        long lifetime = _context.clock().now()-_context.clock().getOffset() 
-                        - _context.router().getWhenStarted();
-        lifetime /= 1000;
-        if (sent > 0) {
-            double sendKBps = sent / (lifetime*1024.0);
-            return fmt.format(sendKBps);
-        } else {
-            return "0.0";
-        }
+        return fmt.format(kbps);
     }
     
     /**

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

@@ -3,6 +3,7 @@ package net.i2p.router.web;
 import java.io.File;
 import java.text.DecimalFormat;
 
+import net.i2p.I2PAppContext;
 import net.i2p.crypto.TrustedUpdate;
 import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
@@ -93,7 +94,7 @@ public class UpdateHandler {
         public void run() {
             _isRunning = true;
             update();
-            System.setProperty("net.i2p.router.web.ReseedHandler.updateInProgress", "false");
+            System.setProperty("net.i2p.router.web.UpdateHandler.updateInProgress", "false");
             _isRunning = false;
         }
         private void update() {
@@ -143,7 +144,7 @@ public class UpdateHandler {
             buf.append(" transferred<br />");
             _status = buf.toString();
         }
-        public void transferComplete(long alreadyTransferred, long bytesTransferred, long bytesRemaining, String url, String outputFile) {
+        public void transferComplete(long alreadyTransferred, long bytesTransferred, long bytesRemaining, String url, String outputFile, boolean notModified) {
             _status = "<b>Update downloaded</b><br />";
             TrustedUpdate up = new TrustedUpdate(_context);
             boolean ok = up.migrateVerified(RouterVersion.VERSION, SIGNED_UPDATE_FILE, "i2pupdate.zip");
@@ -165,6 +166,7 @@ public class UpdateHandler {
             _status = "<b>Transfer failed</b><br />";
             System.setProperty("net.i2p.router.web.UpdateHandler.updateInProgress", "false");
         }
+        public void headerReceived(String url, int attemptNum, String key, String val) {}
     }
     
     private void restart() {

apps/routerconsole/jsp/config.jsp

@@ -2,7 +2,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<title>I2P Router Console - logs</title>
+<title>I2P Router Console - config networking</title>
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head><body>
 
@@ -28,51 +28,38 @@
  <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigNetHandler.nonce")%>" />
  <input type="hidden" name="action" value="blah" />
 
- TCP port:
-     <input name="port" type="text" size="4" value="<jsp:getProperty name="nethelper" property="port" />" /> <br />
- <b>You must poke a hole in your firewall or NAT (if applicable) so that you can receive inbound TCP
- connections on it.</b>  Nothing will work if you don't.  Sorry.  We know how to make it so
- this restriction won't be necessary, but its later on in the 
- <a href="http://www.i2p.net/roadmap">roadmap</a> and we only have so many coder-hours (but if you want
- to help, please <a href="http://www.i2p.net/getinvolved">get involved!</a>)
+ <b>External UDP address:</b> <i><jsp:getProperty name="nethelper" property="udpAddress" /></i><br />
+ <b>Require SSU introductions? </b>
+<input type="checkbox" name="requireIntroductions" value="true" <jsp:getProperty name="nethelper" property="requireIntroductionsChecked" /> /><br />
+ <p>If you can, please poke a hole in your NAT or firewall to allow unsolicited UDP packets to reach
+    you on your external UDP address.  If you can't, I2P now includes supports UDP hole punching
+    with "SSU introductions" - peers who will relay a request from someone you don't know to your
+    router for your router so that you can make an outbound connection to them.  I2P will use these
+    introductions automatically if it detects that the port is not forwarded (as shown by
+    the <i>Status: OK (NAT)</i> line), or you can manually require them here.  
+    Users behind symmetric NATs, such as OpenBSD's pf, are not currently supported.</p>
+<input type="submit" name="recheckReachability" value="Check network reachability..." />
  <hr />
  
  <b>Bandwidth limiter</b><br />
  Inbound rate: 
-    <input name="inboundrate" type="text" size="2" value="<jsp:getProperty name="nethelper" property="inboundRate" />" /> KBytes per second
+    <input name="inboundrate" type="text" size="2" value="<jsp:getProperty name="nethelper" property="inboundRate" />" /> KBps
  bursting up to 
+    <input name="inboundburstrate" type="text" size="2" value="<jsp:getProperty name="nethelper" property="inboundBurstRate" />" /> KBps for
     <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
+    <input name="outboundrate" type="text" size="2" value="<jsp:getProperty name="nethelper" property="outboundRate" />" /> KBps
  bursting up to 
+    <input name="outboundburstrate" type="text" size="2" value="<jsp:getProperty name="nethelper" property="outboundBurstRate" />" /> KBps for
   <jsp:getProperty name="nethelper" property="outboundBurstFactorBox" /><br />
- <i>A negative rate means there is no limit</i><br />
+ <i>KBps = kilobytes per second = 1024 bytes per second.<br />
+    A negative rate means a default limit of 16KBytes per second.</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
-    be within a few seconds of "correct".  You will need to be able to send outbound UDP
-    packets on port 123 to one of the pool.ntp.org machines (or some other SNTP server).</i>
- <hr />
  <input type="submit" name="save" value="Save changes" /> <input type="reset" value="Cancel" /><br />
- <i>Changing the TCP port will force a 'soft restart' - dropping your connections and clients as 
-    if the router was stopped and restarted.  <b>Please be patient</b> - it may take
-    a few seconds to complete.</i>
  </form>
- <hr />
- <b>Advanced network config:</b>
- <p>
- 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
- apache folder pointing at the netDb/ directory of a router - anyone can run one, and you can
- configure your router to seed off an alternate URL by adding the java environmental property
- "i2p.reseedURL=someURL" (e.g. java -Di2p.reseedURL=http://dev.i2p.net/i2pdb/ ...).  You can
- also do it manually by getting routerInfo-*.dat files from someone (a friend, someone on IRC,
- whatever) and saving them to your netDb/ directory.</p>
 </div>
 
 </body>

apps/routerconsole/jsp/configlogging.jsp

@@ -3,7 +3,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<title>I2P Router Console - config clients</title>
+<title>I2P Router Console - config logging</title>
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head><body>
 <jsp:useBean class="net.i2p.router.web.ConfigLoggingHelper" id="logginghelper" scope="request" />

apps/routerconsole/jsp/confignav.jsp

@@ -8,5 +8,7 @@
  %>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("configstats.jsp") != -1) {
+ %>Stats | <% } else { %><a href="configstats.jsp">Stats</a> | <% }
  if (request.getRequestURI().indexOf("configadvanced.jsp") != -1) {
  %>Advanced<% } else { %><a href="configadvanced.jsp">Advanced</a><% } %></h4>

apps/routerconsole/jsp/configservice.jsp

@@ -3,7 +3,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<title>I2P Router Console - config clients</title>
+<title>I2P Router Console - config service</title>
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head><body>
 

apps/routerconsole/jsp/configstats.jsp

@@ -0,0 +1,104 @@
+<%@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 stats</title>
+<link rel="stylesheet" href="default.css" type="text/css" />
+<script type="text/javascript">
+function init()
+{
+	checkAll = false;
+}
+function toggleAll(category)
+{
+	var inputs = document.getElementsByTagName("input");
+	for(index = 0; index < inputs.length; index++)
+	{
+		if(inputs[index].id == category)
+		{
+			if(inputs[index].checked == 0)
+			{
+				inputs[index].checked = 1;
+			}
+			else if(inputs[index].checked == 1)
+			{
+				inputs[index].checked = 0;
+			}
+		}
+		if(category == '*')
+		{
+			if (checkAll == false)
+			{
+				inputs[index].checked = 1;
+			}
+			else if (checkAll == true)
+			{
+				inputs[index].checked = 0;
+			}
+		}
+	}
+	if(category == '*')
+	{
+		if (checkAll == false)
+		{
+			checkAll = true;
+		}
+		else if (checkAll == true)
+		{
+			checkAll = false;
+		}
+	}
+}
+</script>
+</head><body onLoad="init();">
+<%@include file="nav.jsp" %>
+<%@include file="summary.jsp" %>
+
+<div class="main" id="main">
+ <%@include file="confignav.jsp" %>
+ 
+ <jsp:useBean class="net.i2p.router.web.ConfigStatsHandler" id="formhandler" scope="request" />
+ <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
+ <jsp:setProperty name="formhandler" property="*" />
+ <font color="red"><jsp:getProperty name="formhandler" property="errors" /></font>
+ <i><jsp:getProperty name="formhandler" property="notices" /></i>
+
+ <jsp:useBean class="net.i2p.router.web.ConfigStatsHelper" id="statshelper" scope="request" />
+ <jsp:setProperty name="statshelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
+ 
+ <form id="statsForm" name="statsForm" action="configstats.jsp" method="POST">
+ <% String prev = System.getProperty("net.i2p.router.web.ConfigStatsHandler.nonce");
+    if (prev != null) System.setProperty("net.i2p.router.web.ConfigStatsHandler.noncePrev", prev);
+    System.setProperty("net.i2p.router.web.ConfigStatsHandler.nonce", new java.util.Random().nextLong()+""); %>
+ <input type="hidden" name="action" value="foo" />
+ <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigStatsHandler.nonce")%>" />
+ Stat file: <input type="text" name="filename" value="<%=statshelper.getFilename()%>" /><br />
+ Filter: (<a href="javascript: void(null);" onclick="toggleAll('*')">toggle all</a>)<br />
+ <table>
+ <% while (statshelper.hasMoreStats()) {
+      while (statshelper.groupRequired()) { %>
+ <tr><td valign="top" align="left" colspan="2">
+     <b><%=statshelper.getCurrentGroupName()%></b>
+     (<a href="javascript: void(null);" onclick="toggleAll('<%=statshelper.getCurrentGroupName()%>')">toggle all</a>)
+     </td></tr><%
+     } // end iterating over required groups for the current stat %>
+ <tr><td valign="top" align="left">
+     <input id="<%=statshelper.getCurrentGroupName()%>" type="checkbox" name="statList" value="<%=statshelper.getCurrentStatName()%>" <% 
+     if (statshelper.getCurrentIsLogged()) { %>checked="true" <% } %>/></td>
+     <td valign="top" align="left"><b><%=statshelper.getCurrentStatName()%>:</b><br />
+     <%=statshelper.getCurrentStatDescription()%></td></tr><%
+    } // end iterating over all stats %>
+ <tr><td colspan="2"><hr /></td></tr>
+ <tr><td><input type="checkbox" name="explicitFilter" /></td>
+     <td>Advanced filter: 
+     <input type="text" name="explicitFilterValue" value="<%=statshelper.getExplicitFilter()%>" size="40" /></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
+ <tr><td><input type="submit" name="shouldsave" value="Save changes" /> </td>
+     <td><input type="reset" value="Cancel" /></td></tr>
+ </form>
+ </table>
+</div>
+
+</body>
+</html>

apps/routerconsole/jsp/configupdate.jsp

@@ -27,7 +27,7 @@
     if (prev != null) System.setProperty("net.i2p.router.web.ConfigUpdateHandler.noncePrev", prev);
     System.setProperty("net.i2p.router.web.ConfigUpdateHandler.nonce", new java.util.Random().nextLong()+""); %>
  <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigUpdateHandler.nonce")%>" />
- <input type="hidden" name="action" value="update" />
+ <input type="submit" name="action" value="Check for update now" /><br /><br />
  News URL:
  <input type="text" size="60" name="newsURL" value="<jsp:getProperty name="updatehelper" property="newsURL" />"><br />
  Refresh frequency:
@@ -36,10 +36,10 @@
  <input type="text" size="60" name="updateURL" value="<jsp:getProperty name="updatehelper" property="updateURL" />"><br />
  Update policy:
  <jsp:getProperty name="updatehelper" property="updatePolicySelectBox" /><br />
- Update anonymously?
+Update through the eepProxy?
  <jsp:getProperty name="updatehelper" property="updateThroughProxy" /><br />
- Proxy host: <input type="text" size="10" name="proxyHost" value="<jsp:getProperty name="updatehelper" property="proxyHost" />" /><br />
- Proxy port: <input type="text" size="4" name="proxyPort" value="<jsp:getProperty name="updatehelper" property="proxyPort" />" /><br />
+ eepProxy host: <input type="text" size="10" name="proxyHost" value="<jsp:getProperty name="updatehelper" property="proxyHost" />" /><br />
+ eepProxy port: <input type="text" size="4" name="proxyPort" value="<jsp:getProperty name="updatehelper" property="proxyPort" />" /><br />
  <!-- prompt for the eepproxy -->
  Trusted keys:
  <textarea name="trustedKeys" disabled="true" cols="60" rows="2"><jsp:getProperty name="updatehelper" property="trustedKeys" /></textarea>

apps/routerconsole/jsp/help.jsp

@@ -45,7 +45,7 @@ more information).</p>
 <p>The router by default also includes human's public domain <a href="http://www.i2p.net/sam">SAM</a> bridge,
 which other client applications (such the <a href="http://duck.i2p/i2p-bt/">bittorrent port</a>) can use.  
 There is also an optimized library for doing large number calculations - jbigi - which in turn uses the 
-LGPL licensed <a href="http://swox.com/gmp/">GMP</a> library, tuned for various PC architectures.  For 
+LGPL licensed <a href="http://swox.com/gmp/">GMP</a> library, tuned for various PC architectures.  Launchers for windows users are built with <a href="http://launch4j.sourceforge.net/">Launch4J</a>, and the installer is built with <a href="http://www.izforge.com/izpack/">IzPack</a>.  For 
 details on other applications available, as well as their licenses, please see the 
 <a href="http://www.i2p.net/licenses">license policy</a>.  Source for the I2P code and most bundled
 client applications can be found on our <a href="http://www.i2p.net/download">download page</a>, and is

apps/routerconsole/jsp/nav.jsp

@@ -15,14 +15,16 @@
 </div>
 
 <h4>
+ <a href="susimail/susimail">Susimail</a> |
+ <a href="susidns/">SusiDNS</a> |
+ <a href="syndie/">Syndie</a> |
+ <a href="i2ptunnel/">I2PTunnel</a> |
  <a href="tunnels.jsp">Tunnels</a> |
  <a href="profiles.jsp">Profiles</a> |
  <a href="netdb.jsp">NetDB</a> |
  <a href="logs.jsp">Logs</a> |
- <a href="oldconsole.jsp">Internals</a> |
  <a href="oldstats.jsp">Stats</a> |
- <a href="i2ptunnel/" target="_blank">I2PTunnel</a> |
- <a href="susimail/susimail" target="_blank">Susimail</a>
+ <a href="oldconsole.jsp">Internals</a>
  <jsp:useBean class="net.i2p.router.web.NavHelper" id="navhelper" scope="request" />
  <jsp:setProperty name="navhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
  <jsp:getProperty name="navhelper" property="clientAppLinks" />

apps/routerconsole/jsp/oldconsole.jsp

@@ -3,7 +3,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<title>I2P Router Console - home</title>
+<title>I2P Router Console - internals</title>
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head><body>
 

apps/routerconsole/jsp/oldstats.jsp

@@ -3,7 +3,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html><head>
-<title>I2P Router Console - home</title>
+<title>I2P Router Console - statistics</title>
 <link rel="stylesheet" href="default.css" type="text/css" />
 </head><body>
 

apps/routerconsole/jsp/peers.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 - peer connections</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.PeerHelper" id="peerHelper" scope="request" />
+ <jsp:setProperty name="peerHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
+ <jsp:setProperty name="peerHelper" property="out" value="<%=out%>" />
+ <jsp:getProperty name="peerHelper" property="peerSummary" />
+</div>
+
+</body>
+</html>

apps/routerconsole/jsp/summary.jsp

@@ -14,7 +14,8 @@
  <b>Version:</b> <jsp:getProperty name="helper" property="version" /><br />
  <b>Uptime:</b> <jsp:getProperty name="helper" property="uptime" /><br />
  <b>Now:</b> <jsp:getProperty name="helper" property="time" /><br />
- <b>Memory:</b> <jsp:getProperty name="helper" property="memory" /><br /><%
+ <b>Memory:</b> <jsp:getProperty name="helper" property="memory" /><br />
+ <b>Status:</b> <a href="config.jsp"><jsp:getProperty name="helper" property="reachability" /></a><br /><%
     if (helper.updateAvailable()) {
         if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress", "false"))) {
             out.print(update.getStatus());
@@ -33,13 +34,14 @@
     }
  %><hr />
  
- <u><b>Peers</b></u><br />
+ <u><b><a href="peers.jsp">Peers</a></b></u><br />
  <b>Active:</b> <jsp:getProperty name="helper" property="activePeers" />/<jsp:getProperty name="helper" property="activeProfiles" /><br />
  <b>Fast:</b> <jsp:getProperty name="helper" property="fastPeers" /><br />
  <b>High capacity:</b> <jsp:getProperty name="helper" property="highCapacityPeers" /><br />
  <b>Well integrated:</b> <jsp:getProperty name="helper" property="wellIntegratedPeers" /><br />
  <b>Failing:</b> <jsp:getProperty name="helper" property="failingPeers" /><br />
- <b>Shitlisted:</b> <jsp:getProperty name="helper" property="shitlistedPeers" /><br /><%
+ <!-- <b>Shitlisted:</b> <jsp:getProperty name="helper" property="shitlistedPeers" /><br /> -->
+ <b>Known:</b> <jsp:getProperty name="helper" property="allPeers" /><br /><%
      if (helper.getActivePeers() <= 0) {
         %><b><a href="config.jsp">check your NAT/firewall</a></b><br /><%
      }

apps/routerconsole/jsp/web.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE web-app
     PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
     "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">
@@ -14,4 +14,4 @@
         <welcome-file>index.html</welcome-file>
         <welcome-file>index.jsp</welcome-file>
     </welcome-file-list>
-</web-app>
+</web-app>

apps/sam/c/Makefile

@@ -0,0 +1,64 @@
+FLAGS+=-g
+CFLAGS+=$(FLAGS)
+LDFLAGS+=$(FLAGS)
+
+OBJS:=obj/sam.lo obj/strl.lo obj/parse.lo obj/tinystring.lo
+DEPS:=$(patsubst obj/%.lo, .deps/%.d, $(OBJS))
+DESTDIR:=$(if $(DESTDIR),$(DESTDIR)/lib,/usr/lib)
+
+MAKEFLAGS=-s -r
+
+PERL=$(shell which perl 2>/dev/null)
+ifneq ($(PERL),)
+STATUS=$(PERL) ./status
+else
+STATUS=echo
+endif
+
+LIBTOOL_LOG=libtool.log
+
+all:: cleanlog .deps/finish
+
+cleanlog:
+	echo >$(LIBTOOL_LOG)
+
+lib/libsam.so: obj/libsam.la
+	libtool --mode=install install $^ `pwd`/$@ >>$(LIBTOOL_LOG)
+
+obj/libsam-static.la: $(OBJS)
+	$(STATUS) library '(static)'
+	libtool --mode=link gcc -static $(LDFLAGS) -o $@ $^ >>$(LIBTOOL_LOG)
+
+obj/libsam.la: $(OBJS)
+	$(STATUS) library '(shared)'
+	libtool --mode=link gcc -rpath  $(DESTDIR) $(LDFLAGS) -o $@ $^ >>$(LIBTOOL_LOG)
+
+obj/%.lo: src/%.c
+	$(STATUS) compile $*
+	libtool --mode=compile gcc $(CFLAGS) -Iinc/ -c -o $@ $< >>$(LIBTOOL_LOG)
+
+$(OBJS):|obj
+obj:
+	$(STATUS) MKDIR $@
+	mkdir -p $@
+
+.deps/%.d: src/%.c
+	$(STATUS) deps $*
+	gcc -Iinc/ -MM -MT obj/$*.o $< -o $@
+
+-include $(DEPS)
+
+DEPS+=.deps/finish
+.deps/finish: lib/libsam.so
+	libtool --finish $(DESTDIR) >>$(LIBTOOL_LOG) && touch $@
+$(DEPS):|.deps
+.deps:
+	$(STATUS) MKDIR $@
+	mkdir -p $@
+
+clean:
+	$(STATUS) clean
+	libtool --mode=clean rm -f obj/*.l* lib/*.l* lib/*.so* lib/*.a >>$(LIBTOOL_LOG)
+	rm -Rf .deps libtool.log
+
+.PHONY: all cleanlog clean

apps/sam/c/Makefile.common

@@ -1,25 +0,0 @@
-#
-# This Makefile contains instructions common to all platforms
-#
-
-#
-# Build rules
-#
-
-all: clean depend libsam
-
-depend:
-	$(CC) $(CFLAGS) -MM $(SRCDIR)/*.c > .depend
-
-$(OBJDIR)/%.o: $(SRCDIR)/%.c
-	$(CC) $(CFLAGS) -o $@ -c $<
-
-libsam: $(OBJS)
-	$(AR) rcs $(LIBDIR)/libsam.a $(OBJS)
-
-#
-# Cleanup rules
-#
-
-clean:
-	-$(RM) -f $(LIBDIR)/libsam.a $(OBJDIR)/*.o .depend

apps/sam/c/Makefile.cygwin

@@ -1,48 +0,0 @@
-#
-# This Makefile is compatible with GNU Make and should work on Cygwin
-#
-
-#
-# Your operating system
-#
-
-OS = CYGWIN
-
-#
-# Directories
-#
-
-INCDIR = inc
-LIBDIR = lib
-OBJDIR = obj
-SRCDIR = src
-
-#
-# Programs
-#
-
-AR = ar
-CC = gcc
-RM = rm
-
-#
-# Flags
-#
-
-CFLAGS = -g -O2 -pipe -std=c99 -Wall
-CFLAGS += -DOS=$(OS)
-CFLAGS += -I$(INCDIR)
-
-#
-# Object files
-#
-
-OBJS =	$(OBJDIR)/sam.o \
-		$(OBJDIR)/snprintf.o \
-		$(OBJDIR)/strl.o
-
-#
-# Include the make instructions common to all platforms
-#
-
-include Makefile.common

apps/sam/c/Makefile.freebsd

@@ -1,46 +0,0 @@
-#
-# This Makefile is compatible with GNU Make and should work on FreeBSD
-#
-
-#
-# Your operating system
-#
-
-OS = FREEBSD
-
-#
-# Directories
-#
-
-INCDIR = inc
-LIBDIR = lib
-OBJDIR = obj
-SRCDIR = src
-
-#
-# Programs
-#
-
-AR = ar
-CC = gcc
-RM = rm
-
-#
-# Flags
-#
-
-CFLAGS = -g -O2 -pipe -std=c99 -Wall
-CFLAGS += -DOS=$(OS)
-CFLAGS += -I$(INCDIR)
-
-#
-# Object files
-#
-
-OBJS =	$(OBJDIR)/sam.o
-
-#
-# Include the make instructions common to all platforms
-#
-
-include Makefile.common

apps/sam/c/Makefile.linux

@@ -1,47 +0,0 @@
-#
-# This Makefile is compatible with GNU Make and should work on Linux
-#
-
-#
-# Your operating system
-#
-
-OS = LINUX
-
-#
-# Directories
-#
-
-INCDIR = inc
-LIBDIR = lib
-OBJDIR = obj
-SRCDIR = src
-
-#
-# Programs
-#
-
-AR = ar
-CC = gcc
-RM = rm
-
-#
-# Flags
-#
-
-CFLAGS = -g -O2 -pipe -std=c99 -Wall
-CFLAGS += -DOS=$(OS)
-CFLAGS += -I$(INCDIR)
-
-#
-# Object files
-#
-
-OBJS =	$(OBJDIR)/sam.o \
-		$(OBJDIR)/strl.o
-
-#
-# Include the make instructions common to all platforms
-#
-
-include Makefile.common

apps/sam/c/Makefile.mingw

@@ -1,47 +0,0 @@
-#
-# This Makefile is compatible with GNU Make and should work on Windows (MingW)
-#
-
-#
-# Your operating system
-#
-
-OS = MINGW
-
-#
-# Directories
-#
-
-INCDIR = inc
-LIBDIR = lib
-OBJDIR = obj
-SRCDIR = src
-
-#
-# Programs
-#
-
-AR = C:\MinGW\bin\ar
-CC = C:\MinGW\bin\gcc
-RM = C:\MinGW\bin\rm
-
-#
-# Flags
-#
-
-CFLAGS = -g -O2 -pipe -std=c99 -Wall
-CFLAGS += -DOS=$(OS)
-CFLAGS += -I$(INCDIR)
-
-#
-# Object files
-#
-
-OBJS =	$(OBJDIR)/sam.o \
-		$(OBJDIR)/strl.o
-
-#
-# Include the make instructions common to all platforms
-#
-
-include Makefile.common

apps/sam/c/examples/i2p-ping/Makefile

@@ -1,39 +1,54 @@
-#
-# This Makefile is compatible with GNU Make and should work on POSIX systems
-#
+FLAGS+=-g
 
-#
-# Programs
-#
+CFLAGS = $(FLAGS) -pipe -std=c99 -Wall
+CFLAGS += -I../../inc
+LDFLAGS = $(FLAGS) -L../../lib -lsam
 
-CC = gcc
-INSTALL = install
-RM = rm
+OBJS:=i2p-ping.lo
+DEPS:=$(patsubst obj/%.lo, .deps/%.d, $(OBJS))
+DESTDIR:=$(if $(DESTDIR),$(DESTDIR)/lib,/usr/lib)
 
-#
-# Flags
-#
+MAKEFLAGS=-s -r
+PERL=$(shell which perl 2>/dev/null)
+ifneq ($(PERL),)
+STATUS=$(PERL) ../../status
+else
+STATUS=echo
+endif
 
-CFLAGS = -g -O2 -pipe -std=c99 -Wall
-CFLAGS += -I../../inc -L../../lib
-LIBS = -lsam
+LIBTOOL_LOG=libtool.log
 
-#
-# Build rules
-#
+all:: cleanlog i2p-ping
 
-all: clean i2p-ping
+cleanlog:
+	>$(LIBTOOL_LOG)
 
-i2p-ping: i2p-ping.c
-	$(CC) $(CFLAGS) -o i2p-ping.o -c i2p-ping.c
-	$(CC) $(CFLAGS) -o i2p-ping i2p-ping.o $(LIBS)
+i2p-ping: $(OBJS)
+	$(STATUS) link
+	libtool --mode=link gcc $(LDFLAGS) -o $@ $^ >>$(LIBTOOL_LOG)
 
-install: i2p-ping
-	$(INSTALL) i2p-ping $(HOME)/bin
-
-#
-# Cleanup rules
-#
+%.lo: %.c
+	$(STATUS) compile $*
+	libtool --mode=compile gcc $(CFLAGS) -Iinc/ -c -o $@ $< >>$(LIBTOOL_LOG)
+.deps/%.d: src/%.c
+	$(STATUS) deps $*
+	gcc -Iinc/ -MM -MT obj/$*.o $^ -o $@
 
 clean:
-	-$(RM) -f i2p-ping *.o
+	$(STATUS) clean
+	rm -Rf .deps obj libtool.log
+	libtool --mode=clean rm -f i2p-ping i2p-ping.lo >>$(LIBTOOL_LOG)
+
+$(OBJS):|obj
+obj:
+	$(STATUS) MKDIR $@
+	mkdir -p $@
+
+-include $(DEPS)
+$(DEPS):|.deps
+.deps:
+	$(STATUS) MKDIR $@
+	mkdir -p $@
+
+
+.PHONY: all cleanlog clean

apps/sam/c/inc/parse.h

@@ -0,0 +1,24 @@
+#ifndef _PARSE_HEADER_FEEP
+#define _PARSE_HEADER_FEEP
+
+#include "tinystring.h"
+
+typedef struct arg_s {
+  string_t name;
+  string_t value;
+  //  int pos;
+} arg_t;
+
+typedef struct {
+  arg_t* arg;
+  int num;
+} args_t;
+
+args_t arg_parse(const char*);
+void arg_done(args_t);
+arg_t* arg_get(args_t,int);
+arg_t* arg_find(args_t,string_t);
+
+#define AG(a,b) arg_get(a,b)
+
+#endif /* _PARSE_HEADER_FEEP */

apps/sam/c/inc/sam.h

@@ -121,9 +121,9 @@ bool		sam_read_buffer(sam_sess_t *session);
 const char *sam_strerror(samerr_t code);
 /* SAM controls - callbacks */
 void		(*sam_diedback)(sam_sess_t *session);
-void		(*sam_logback)(char *str);
-void		(*sam_namingback)(sam_sess_t *session, char *name,
-				sam_pubkey_t pubkey, samerr_t result);
+void		(*sam_logback)(const char *str);
+void            (*sam_namingback)(sam_sess_t *session, const char *name, 
+                                  sam_pubkey_t pubkey, samerr_t result, const char* message);
 
 /* Stream commands */
 void		sam_stream_close(sam_sess_t *session, sam_sid_t stream_id);
@@ -131,14 +131,15 @@ sam_sid_t	sam_stream_connect(sam_sess_t *session, const sam_pubkey_t dest);
 samerr_t	sam_stream_send(sam_sess_t *session, sam_sid_t stream_id,
 				const void *data, size_t size);
 /* Stream commands - callbacks */
-void		(*sam_closeback)(sam_sess_t *session, sam_sid_t stream_id,
-				samerr_t reason);
+void            (*sam_closeback)(sam_sess_t *session, sam_sid_t stream_id, 
+                                 samerr_t reason, const char* message);
+
 void		(*sam_connectback)(sam_sess_t *session, sam_sid_t stream_id,
-				sam_pubkey_t dest);
-void		(*sam_databack)(sam_sess_t *session, sam_sid_t stream_id,
+                                   sam_pubkey_t dest);
+    void		(*sam_databack)(sam_sess_t *session, sam_sid_t stream_id,
 				void *data, size_t size);
-void		(*sam_statusback)(sam_sess_t *session, sam_sid_t stream_id,
-				samerr_t result);
+void            (*sam_statusback)(sam_sess_t *session, sam_sid_t stream_id,
+                                  samerr_t result, const char* message);
 
 /* Stream send queue (experimental) */
 void		sam_sendq_add(sam_sess_t *session, sam_sid_t stream_id,

apps/sam/c/inc/tinystring.h

@@ -0,0 +1,48 @@
+#ifndef TINYSTRING_HEADER
+#define TINYSTRING_HEADER
+
+#include <sys/types.h>
+
+#ifndef bool
+#define bool short int
+#endif
+
+struct string_s;
+#define string_t struct string_s*
+//Mysteeeerious *waggles mysteriously*
+
+/*{
+  char* data;
+  long int size;
+} *string_t;
+*/
+
+string_t string_create(const char*);
+string_t string_ncreate(const char* cstr,long int length);
+
+string_t string_wrap(const char*); 
+//Does not malloc, do NOT pass to string_free
+
+string_t string_fmt(const char* fmt, ...);
+string_t string_cat(string_t,string_t);
+
+/* Source Dest */
+void string_copy(string_t,string_t);
+void string_copy_raw(string_t,void*,size_t);
+
+const char* string_data(string_t);
+long int string_size(string_t);
+
+void string_free(string_t);
+
+bool string_equal(string_t,string_t);
+bool string_equali(string_t,string_t);
+int string_cmp(string_t,string_t);
+int string_cmpi(string_t,string_t);
+
+#define _sw(a) string_wrap(a)
+#define _scr(a,b,c) string_copy_raw(a,b,c)
+
+#define string_is(a,b) (! strncmp(string_data(a),(b),string_size(a)))
+
+#endif /* TINYSTRING_HEADER */

apps/sam/c/src/parse.c

@@ -0,0 +1,78 @@
+#include "parse.h"
+
+#include <assert.h>
+#include <ctype.h>
+#include <malloc.h>
+#define _GNU_SOURCE
+#include <string.h>
+
+args_t arg_parse(const char* line_raw) {
+    args_t self;
+    int numargs = 0;
+    const char *end, *last;
+    /* First pass to count how many args... */
+    end = line_raw;
+    while(*end && isspace(*end)) ++end;
+    //Skip initial space...
+    for(;;) {
+        while(*end && !isspace(*end)) ++end;
+        //Go to end of argument
+        ++numargs;
+        while(*end && isspace(*end)) ++end;
+        //Go to end of space after argument
+        if(!*end) break;
+    }
+    self.num = numargs; // One more # args than spaces.
+    self.arg = malloc(sizeof(arg_t)*numargs);
+
+    /* Second pass to assign args.  (Lemee alone, is more efficient than a linked list!) */
+    last = line_raw;
+    numargs = 0; //Now numargs is which current arg.
+    end = line_raw;
+    while(*end && isspace(*end)) ++end;
+    //Skip initial space...
+    for(;;) {
+        arg_t* nextarg = self.arg + numargs;;
+        const char* isbinary;
+        while(*end && !isspace(*end)) ++end;
+        //Go to end of argument
+        isbinary = strchr(last,'='); //Is there a value?
+        
+        //Make sure not to pass end in our search for =
+        if(isbinary && (isbinary < end)) {
+            nextarg->name = string_ncreate(last,isbinary-last);
+            nextarg->value = string_ncreate(isbinary+1,end-isbinary-1);
+        } else {
+            nextarg->name = string_ncreate(last,end-last);
+            nextarg->value = string_create(NULL);
+        }
+        ++numargs;
+        while(*end && isspace(*end)) ++end;
+        //Go to end of space after argument
+        if(!*end) break;
+        last = end;
+    }
+    return self;
+}
+
+void arg_done(args_t self) {
+    free(self.arg);
+    self.arg = NULL;
+    self.num = 0;
+}
+
+arg_t* arg_get(args_t self, int index) {
+    if(index >= self.num) return NULL;
+    return self.arg + index;
+}
+
+arg_t* arg_find(args_t self,string_t testname) {
+    int index;
+    for(index=0;index<self.num;++index) {
+        if(string_equali(self.arg[index].name,testname)) {
+            return self.arg + index;
+        }
+    }
+
+    return NULL;
+}

apps/sam/c/src/sam.c

@@ -30,6 +30,10 @@
 
 #include "sam.h"
 #include "platform.h"
+#include "parse.h"
+#include "tinystring.h"
+
+#include <assert.h>
 
 static bool			sam_hello(sam_sess_t *session);
 static void			sam_log(const char *format, ...);
@@ -57,7 +61,7 @@ static ssize_t		sam_write(sam_sess_t *session, const void *buf, size_t n);
  */
 
 /* a peer closed the connection */
-void (*sam_closeback)(sam_sess_t *session, sam_sid_t stream_id, samerr_t reason)
+void (*sam_closeback)(sam_sess_t *session, sam_sid_t stream_id, samerr_t reason, const char* message)
 	= NULL;
 
 /* a peer connected to us */
@@ -76,15 +80,14 @@ void (*sam_dgramback)(sam_sess_t *session, sam_pubkey_t dest, void *data,
 void (*sam_diedback)(sam_sess_t *session) = NULL;
 
 /* logging callback */
-void (*sam_logback)(char *str) = NULL;
+void (*sam_logback)(const char *str) = NULL;
 
 /* naming lookup reply - `pubkey' will be NULL if `result' isn't SAM_OK */
-void (*sam_namingback)(sam_sess_t *session, char *name, sam_pubkey_t pubkey,
-	samerr_t result) = NULL;
+void (*sam_namingback)(sam_sess_t *session, const char *name, sam_pubkey_t pubkey, samerr_t result, const char* message) = NULL;
 
 /* our connection to a peer has completed */
 void (*sam_statusback)(sam_sess_t *session, sam_sid_t stream_id,
-	samerr_t result) = NULL;
+	samerr_t result, const char* message) = NULL;
 
 /* a peer sent some raw data (`data' MUST be freed) */
 void (*sam_rawback)(sam_sess_t *session, void *data, size_t size) = NULL;
@@ -290,13 +293,13 @@ static void sam_log(const char *format, ...)
  */
 void sam_naming_lookup(sam_sess_t *session, const char *name)
 {
-	assert(session != NULL);
-	char cmd[SAM_CMD_LEN];
+    assert(session != NULL);
+    char cmd[SAM_CMD_LEN];
 
-	snprintf(cmd, sizeof cmd, "NAMING LOOKUP NAME=%s\n", name);
-	sam_write(session, cmd, strlen(cmd));
+    snprintf(cmd, sizeof cmd, "NAMING LOOKUP NAME=%s\n", name);
+    sam_write(session, cmd, strlen(cmd));
 
-	return;
+    return;
 }
 
 /*
@@ -304,242 +307,193 @@ void sam_naming_lookup(sam_sess_t *session, const char *name)
  *
  * s - string of data that we read (read past tense)
  */
+bool sam_parse_args(sam_sess_t *session, args_t args);
 static void sam_parse(sam_sess_t *session, char *s)
 {
-	assert(session != NULL);
-#define SAM_DGRAM_RECEIVED_REPLY "DATAGRAM RECEIVED"
-#define SAM_NAMING_REPLY "NAMING REPLY"
-#define SAM_NAMING_REPLY_OK "NAMING REPLY RESULT=OK"
-#define SAM_NAMING_REPLY_IK "NAMING REPLY RESULT=INVALID_KEY"
-#define SAM_NAMING_REPLY_KNF "NAMING REPLY RESULT=KEY_NOT_FOUND"
-#define SAM_RAW_RECEIVED_REPLY "RAW RECEIVED"
-#define SAM_STREAM_CLOSED_REPLY "STREAM CLOSED"
-#define SAM_STREAM_CONNECTED_REPLY "STREAM CONNECTED"
-#define SAM_STREAM_RECEIVED_REPLY "STREAM RECEIVED"
-#define SAM_STREAM_STATUS_REPLY "STREAM STATUS"
-#define SAM_STREAM_STATUS_REPLY_OK "STREAM STATUS RESULT=OK"
-#define SAM_STREAM_STATUS_REPLY_CRP "STREAM STATUS RESULT=CANT_REACH_PEER"
-#define SAM_STREAM_STATUS_REPLY_I2E "STREAM STATUS RESULT=I2P_ERROR"
-#define SAM_STREAM_STATUS_REPLY_IK "STREAM STATUS RESULT=INVALID_KEY"
-#define SAM_STREAM_STATUS_REPLY_TO "STREAM STATUS RESULT=TIMEOUT"
+    //Wrapper for ease of memory management
+    args_t args;
+    assert(session != NULL);
+    args = arg_parse(s);
+    if(!sam_parse_args(session, args)) {
+        SAMLOG("Unknown SAM command received: %s", s);
+    }
+    arg_done(args);
+}
 
-	/*
-	 * TODO: add raw parsing
-	 */
+long int strtol_checked(const char* str) {
+    static char* end = NULL;
+    long int ret = strtol(str,&end,10);
+    assert(str != end || "No number found at all!");    
+    return ret;
+}
 
-	if (strncmp(s, SAM_DGRAM_RECEIVED_REPLY,
-			strlen(SAM_DGRAM_RECEIVED_REPLY)) == 0) {
-		char *p;
-		sam_pubkey_t dest;
-		size_t size;
-		void *data;
-
-		p = strchr(s, '=');  /* DESTINATION= */
-		assert(p != NULL);
-		p++;
-		strlcpy(dest, p, sizeof dest);
-		p = strchr(p, '=');  /* SIZE= */
-		assert(p != NULL);
-		p++;
-		size = strtol(p, NULL, 10);
-		assert(size != 0);
-		data = malloc(size + 1);  /* +1 for NUL termination, so when we are
-									receiving a string it will just work and it
-									won't be necessary to send NUL.  When binary
-									data is sent, the extra NUL character will
-									just be ignored by the client program,
-									because it is not added to the size */
-		if (data == NULL) {
-			SAMLOGS("Out of memory");
-			abort();
-		}
-		if (sam_read2(session, data, size) != -1) {
-			p = data + size;
-			*p = '\0';  /* see above NUL note */
-			sam_dgramback(session, dest, data, size); /* `data' must be freed */
-		} else
-			free(data);
-
-		return;
-
-	} else if (strncmp(s, SAM_NAMING_REPLY, strlen(SAM_NAMING_REPLY)) == 0) {
-		char *p;
-		char *q;
-		char name[SAM_NAME_LEN];
-
-		p = strchr(s, '=');  /* can't use strrchar because of option
-								MESSAGE= */
-		assert(p != NULL);  /* RESULT= */
-		p++;
-		p = strchr(p, '=');  /* NAME= */
-		assert(p != NULL);
-		p++;
-
-		if (strncmp(s, SAM_NAMING_REPLY_OK, strlen(SAM_NAMING_REPLY_OK)) == 0) {
-			sam_pubkey_t pubkey;
-
-			q = strchr(p, ' ');  /* ' 'VAL.. */
-			assert(q != NULL);
-			*q = '\0';
-			q++;
-			q = strchr(q, '=');  /* VALUE= */
-			assert(q != NULL);
-			q++;
-			strlcpy(name, p, sizeof name);
-			strlcpy(pubkey, q, sizeof pubkey);
-			sam_namingback(session, name, pubkey, SAM_OK);
-
-		} else if (strncmp(s, SAM_NAMING_REPLY_IK,
-				strlen(SAM_NAMING_REPLY_IK)) == 0) {
-			q = strchr(p, ' ');  /* ' 'MES.. (optional) */
-			if (q != NULL)
-				*q = '\0';
-			strlcpy(name, p, sizeof name);
-			sam_namingback(session, name, NULL, SAM_INVALID_KEY);
-
-		} else if (strncmp(s, SAM_NAMING_REPLY_KNF,
-				strlen(SAM_NAMING_REPLY_KNF)) == 0) {
-			q = strchr(p, ' ');  /* ' 'MES.. (optional) */
-			if (q != NULL)
-				*q = '\0';
-			strlcpy(name, p, sizeof name);
-			sam_namingback(session, name, NULL, SAM_KEY_NOT_FOUND);
-
-		} else {
-			q = strchr(p, ' ');  /* ' 'MES.. (optional) */
-			if (q != NULL)
-				*q = '\0';
-			strlcpy(name, p, sizeof name);
-			sam_namingback(session, name, NULL, SAM_UNKNOWN);
-		}
-
-		return;
-
-	} else if (strncmp(s, SAM_STREAM_CLOSED_REPLY,
-			strlen(SAM_STREAM_CLOSED_REPLY)) == 0) {
-		char *p;
-		sam_sid_t stream_id;
-
-		p = strchr(s, '=');  /* can't use strrchar because of option MESSAGE= */
-		assert(p != NULL);  /* ID= */
-		p++;
-		stream_id = strtol(p, NULL, 10);
-		assert(stream_id != 0);
-		p = strchr(p, '=');  /* RESULT= */
-		assert(p != NULL);
-		p++;
-		if (strncmp(p, "OK", strlen("OK")) == 0)
-			sam_closeback(session, stream_id, SAM_OK);
-		else if (strncmp(p, "CANT_REACH_PEER", strlen("CANT_REACH_PEER")) == 0)
-			sam_closeback(session, stream_id, SAM_CANT_REACH_PEER);
-		else if (strncmp(p, "I2P_ERROR", strlen("I2P_ERROR")) == 0)
-			sam_closeback(session, stream_id, SAM_I2P_ERROR);
-		else if (strncmp(p, "PEER_NOT_FOUND", strlen("PEER_NOT_FOUND")) == 0)
-			sam_closeback(session, stream_id, SAM_PEER_NOT_FOUND);
-		else if (strncmp(p, "TIMEOUT", strlen("TIMEOUT")) == 0)
-			sam_closeback(session, stream_id, SAM_TIMEOUT);
-		else
-			sam_closeback(session, stream_id, SAM_UNKNOWN);
-
-		return;
-
-	} else if (strncmp(s, SAM_STREAM_CONNECTED_REPLY,
-			strlen(SAM_STREAM_CONNECTED_REPLY)) == 0) {
-		char *p;
-		sam_sid_t stream_id;
-		sam_pubkey_t dest;
-
-		p = strrchr(s, '=');  /* ID= */
-		assert(p != NULL);
-		*p = '\0';
-		p++;
-		stream_id = strtol(p, NULL, 10);
-		assert(stream_id != 0);
-		p = strstr(s, "N=");  /* DESTINATION= */
-		p += 2;
-		strlcpy(dest, p, sizeof dest);
-		sam_connectback(session, stream_id, dest);
+bool sam_parse_args(sam_sess_t *session, args_t args)
+{
+    arg_t* arg; // The current argument being examined...
+    const char* message = NULL; // Almost EVERYTHING can have a message...
 	
-		return;
+    if(args.num <= 0) return 0;
 
-	} else if (strncmp(s, SAM_STREAM_RECEIVED_REPLY,
-			strlen(SAM_STREAM_RECEIVED_REPLY)) == 0) {
-		char *p;
-		sam_sid_t stream_id;
+#define ARG_IS(a,b) string_equal(AG(args,a)->name,string_wrap(b))
+#define ARG_FIND(a) arg_find(args,_sw(a))
+
+    // Almost EVERYTHING can have a message...
+    arg = ARG_FIND("MESSAGE");
+    if(arg) {
+        message = string_data(arg->value);
+    }
+
+    if(ARG_IS(0,"DATAGRAM") &&
+       ARG_IS(1,"RECEIVED")) {
+        sam_pubkey_t dest;
+        size_t size;
+        void *data;
+
+        arg = ARG_FIND("DESTINATION");
+        assert(arg != NULL);
+        _scr(arg->value, dest, sizeof dest);
+
+        arg = ARG_FIND("SIZE");
+        assert(arg != NULL);
+        size = strtol_checked(string_data(arg->value));
+
+        data = malloc(size + 1);  
+        /* +1 for NUL termination, so when we are
+           receiving a string it will just work and it
+           won't be necessary to send NUL.  When binary
+           data is sent, the extra NUL character will
+           just be ignored by the client program,
+           because it is not added to the size */
+        if (data == NULL) {
+	    SAMLOGS("Out of memory");
+	    abort();
+        }
+        if (sam_read2(session, data, size) != -1) {
+	    char* p = data + size;
+	    *p = '\0';  /* see above NUL note */
+	    sam_dgramback(session, dest, data, size); /* `data' must be freed */
+        } else
+	    free(data);
+	  
+    } else if (ARG_IS(0,"NAMING") &&
+               ARG_IS(1, "REPLY")) {
+        if(NULL == (arg = ARG_FIND("RESULT"))) {
+            SAMLOGS("Naming reply with no result");
+            return 0;
+        }
+
+        if (string_is(arg->value,"OK")) {
+            sam_pubkey_t pubkey;
+            arg = ARG_FIND("VALUE");
+            assert(arg != NULL);
+            _scr(arg->value, pubkey, sizeof pubkey);
+            arg = ARG_FIND("NAME");
+            assert(arg != NULL);
+
+            sam_namingback(session, string_data(arg->value), pubkey, SAM_OK, message);
+        } else if(string_is(arg->value,"INVALID_KEY")) {
+            arg_t* namearg = ARG_FIND("NAME");
+            assert(namearg != NULL);
+            sam_namingback(session, string_data(namearg->value), NULL,
+                           SAM_INVALID_KEY, message);
+        } else if(string_is(arg->value,"KEY_NOT_FOUND")) {
+            arg_t* namearg = ARG_FIND("NAME");
+            assert(namearg != NULL);
+            sam_namingback(session, string_data(namearg->value), NULL,
+                           SAM_KEY_NOT_FOUND, message);
+        } else {
+            arg_t* namearg = ARG_FIND("NAME");
+            assert(namearg != NULL);
+            sam_namingback(session, string_data(namearg->value), NULL,
+                           SAM_UNKNOWN, message);
+        }
+        
+    } else if (ARG_IS(0,"STREAM")) {
+        sam_sid_t stream_id;
+        arg = ARG_FIND("ID");
+        assert(arg != 0);
+        stream_id = strtol_checked(string_data(arg->value));
+
+        if(ARG_IS(1,"CLOSED")) {
+            arg = ARG_FIND("RESULT");
+            assert(arg != NULL);
+            if (string_is(arg->value,"OK")) {
+                sam_closeback(session, stream_id, SAM_OK, message);
+            } else if (string_is(arg->value,"CANT_REACH_PEER")) {
+                sam_closeback(session, stream_id, SAM_CANT_REACH_PEER, message);
+            } else if (string_is(arg->value,"I2P_ERROR")) {
+                sam_closeback(session, stream_id, SAM_I2P_ERROR, message);
+            } else if (string_is(arg->value,"PEER_NOT_FOUND")) {
+                sam_closeback(session, stream_id, SAM_PEER_NOT_FOUND, message);
+            } else if (string_is(arg->value,"TIMEOUT")) {
+                sam_closeback(session, stream_id, SAM_TIMEOUT, message);
+            } else {
+                sam_closeback(session, stream_id, SAM_UNKNOWN, message);
+            }
+
+	} else if(ARG_IS(1,"CONNECTED")) {
+		sam_pubkey_t dest;
+
+                arg = ARG_FIND("DESTINATION");
+                assert(arg != NULL);
+                _scr(arg->value, dest, sizeof dest);
+
+		sam_connectback(session, stream_id, dest);
+
+	} else if(ARG_IS(1,"RECEIVED")) {
 		size_t size;
 		void *data;
 
-		p = strrchr(s, '=');  /* SIZE= */
-		assert(p != NULL);
-		p++;
-		size = strtol(p, NULL, 10);
-		assert(size != 0);
-		p -= 6;
-		*p = '\0';
-		p = strrchr(s, '=');  /* ID= */
-		assert(p != NULL);
-		p++;
-		stream_id = strtol(p, NULL, 10);
-		assert(stream_id != 0);
-		data = malloc(size + 1);  /* +1 for NUL termination, so when we are
-									receiving a string it will just work and it
-									won't be necessary to send NUL.  When binary
-									data is sent, the extra NUL character will
-									just be ignored by the client program,
-									because it is not added to the size */
+                arg = ARG_FIND("SIZE");
+                assert(arg != NULL);
+                size = strtol_checked(string_data(arg->value));
+
+		data = malloc(size + 1);  
+                /* +1 for NUL termination, so when we are
+                   receiving a string it will just work and it
+                   won't be necessary to send NUL.  When binary
+                   data is sent, the extra NUL character will
+                   just be ignored by the client program,
+                   because it is not added to the size */
 		if (data == NULL) {
 			SAMLOGS("Out of memory");
 			abort();
 		}
 		if (sam_read2(session, data, size) != -1) {
-			p = data + size;
+			char* p = data + size;
 			*p = '\0';  /* see above NUL note */
 			sam_databack(session, stream_id, data, size);
 			/* ^^^ `data' must be freed ^^^*/
 		} else
 			free(data);
 
-		return;
-
-	} else if (strncmp(s, SAM_STREAM_STATUS_REPLY,
-			strlen(SAM_STREAM_STATUS_REPLY)) == 0) {
-		char *p;
-		sam_sid_t stream_id;
-
-		p = strchr(s, '=');  /* can't use strrchar because of option MESSAGE= */
-		assert(p != NULL);  /* RESULT= */
-		p++;
-		p = strchr(p, '=');  /* ID= */
-		assert(p != NULL);
-		p++;
-		stream_id = strtol(p, NULL, 10);
-		assert(stream_id != 0);
-		if (strncmp(s, SAM_STREAM_STATUS_REPLY_OK,
-				strlen(SAM_STREAM_STATUS_REPLY_OK)) == 0)
-			sam_statusback(session, stream_id, SAM_OK);
-		else if (strncmp(s, SAM_STREAM_STATUS_REPLY_CRP,
-				strlen(SAM_STREAM_STATUS_REPLY_CRP)) == 0)
-			sam_statusback(session, stream_id, SAM_CANT_REACH_PEER);
-		else if (strncmp(s, SAM_STREAM_STATUS_REPLY_I2E,
-				strlen(SAM_STREAM_STATUS_REPLY_I2E)) == 0)
-			sam_statusback(session, stream_id, SAM_I2P_ERROR);
-		else if (strncmp(s, SAM_STREAM_STATUS_REPLY_IK,
-				strlen(SAM_STREAM_STATUS_REPLY_IK)) == 0)
-			sam_statusback(session, stream_id, SAM_INVALID_KEY);
-		else if (strncmp(s, SAM_STREAM_STATUS_REPLY_TO,
-				strlen(SAM_STREAM_STATUS_REPLY_TO)) == 0)
-			sam_statusback(session, stream_id, SAM_TIMEOUT);
-		else
-			sam_statusback(session, stream_id, SAM_UNKNOWN);
-
-		return;
-
-	} else
-		SAMLOG("Unknown SAM command received: %s", s);
-
-	return;
+	} else if(ARG_IS(1,"STATUS")) {
+            arg = ARG_FIND("RESULT");
+            assert(arg != NULL);
+            if (string_is(arg->value,"OK")) {
+                sam_statusback(session, stream_id, SAM_OK, message);
+            } else if (string_is(arg->value,"CANT_REACH_PEER")) {
+                sam_statusback(session, stream_id, 
+                               SAM_CANT_REACH_PEER, message);
+            } else if (string_is(arg->value,"I2P_ERROR")) {
+                sam_statusback(session, stream_id, SAM_I2P_ERROR, message);
+            } else if (string_is(arg->value,"INVALID_KEY")) {
+                sam_statusback(session, stream_id, SAM_INVALID_KEY, message);
+            } else if (string_is(arg->value,"TIMEOUT")) {
+                sam_statusback(session, stream_id, SAM_TIMEOUT, message);
+            } else {
+                sam_statusback(session, stream_id, SAM_UNKNOWN, message);
+            }
+	}
+    } else
+        return 0;
+    return -1;
 }
 
+#undef ARG_IS
+#undef ARG_FIND
+
+
 /*
  * Sends data to a destination in a raw packet
  *

apps/sam/c/src/tinystring.c

@@ -0,0 +1,128 @@
+#include "tinystring.h"
+
+#include <assert.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <malloc.h>
+#define _GNU_SOURCE
+#include <string.h>
+
+#ifndef min
+#define min(a,b) ((a) > (b) ? (b) : (a))
+#endif
+
+extern char *strndup(const char *s, size_t n);
+
+
+struct string_s {
+    const char* data;
+    long int size;
+    bool _no_del; //SIGH...
+};
+
+string_t string_ncreate(const char* cstr,long int length) {
+    string_t self = malloc(sizeof(struct string_s));
+    self->size = length;
+    if(cstr) self->data = strndup(cstr,length);
+    else self->data = NULL;
+    self->_no_del = 0;
+    return self;
+}
+
+string_t string_create(const char* cstr) {
+    if(!cstr)
+        return string_ncreate(NULL, 0);
+    return string_ncreate(cstr, strlen(cstr));
+}
+
+string_t string_nwrap(const char* cstr, long int length) {
+    static struct string_s self;
+    self.size = length;
+    self.data = cstr;
+    self._no_del = 1;
+    return &self;
+}
+
+string_t string_wrap(const char* cstr) {
+    if(!cstr)
+        return string_nwrap(NULL, 0);
+    return string_nwrap(cstr, strlen(cstr));
+}
+
+string_t string_fmt(const char* fmt, ...) {
+    va_list args;
+    FILE* tmp = tmpfile();
+    string_t self = malloc(sizeof(struct string_s));
+    char* data;
+    va_start(args, fmt);
+    vfprintf(tmp, fmt, args);
+    va_end(args);
+
+    self->size = ftell(tmp);
+
+    rewind(tmp);
+    data = malloc(self->size);
+    fread(data, self->size, sizeof(char), tmp);
+
+    fclose(tmp);
+    self->data = data;
+    return self;
+}
+
+string_t string_cat(string_t head,string_t tail) {
+    //There are two ways to skin a cat...
+    string_t self = malloc(sizeof(struct string_s));
+    char* data;
+    self->size = head->size+tail->size;
+    data = malloc(self->size);
+    memcpy(data, head->data, head->size);
+    memcpy(data+head->size,tail->data,tail->size);
+    self->data = data;
+    return self;
+}
+
+/* Source Dest */
+void string_copy(string_t src,string_t dest) {
+    dest->data = realloc((char*)dest->data,src->size);
+    memcpy((char*)dest->data,src->data,dest->size);
+}
+
+void string_copy_raw(string_t src, void* dest,size_t size) {
+    size = min(src->size,size);
+    memcpy(dest,src->data,size);
+}
+
+const char* string_data(string_t self) {
+    return self->data;
+}
+
+long int string_size(string_t self) {
+    return self->size;
+}
+
+void string_free(string_t self) {
+    if(!self->_no_del)
+        free((char*)self->data);
+
+    free(self);
+}
+
+#ifndef min
+#define min(a,b) ((a) < (b) ? (a) : (b))
+#endif
+
+bool string_equal(string_t this,string_t that) {
+    return !memcmp(this->data,that->data,min(this->size,that->size));
+}
+
+bool string_equali(string_t this,string_t that) {
+    return !strncasecmp(this->data,that->data,min(this->size,that->size));
+}
+
+int string_cmp(string_t this,string_t that) {
+    return memcmp(this->data,that->data,min(this->size,that->size));
+}
+
+int string_cmpi(string_t this,string_t that) {
+    return strncasecmp(this->data,that->data,min(this->size,that->size));
+}

apps/sam/c/status

@@ -0,0 +1,4 @@
+#!/usr/bin/env perl
+
+printf "%-8s ",uc(shift @ARGV);
+print join(' ', @ARGV),"\n";

apps/sam/csharp/sam-sharp.build

@@ -3,7 +3,7 @@
 
 	<target name="bin" description="Builds assemblies from source">
 		<mkdir dir="bin" />
-		<csc target="dll" output="bin/sam-sharp.dll">
+		<csc target="library" output="bin/sam-sharp.dll">
 			<sources>
 				<include name="src/**/*.cs" />
 			</sources>

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

@@ -24,8 +24,8 @@ public class Connection {
     private Log _log;
     private ConnectionManager _connectionManager;
     private Destination _remotePeer;
-    private byte _sendStreamId[];
-    private byte _receiveStreamId[];
+    private long _sendStreamId;
+    private long _receiveStreamId;
     private long _lastSendTime;
     private long _lastSendId;
     private boolean _resetReceived;
@@ -65,14 +65,15 @@ public class Connection {
     private Object _connectLock;
     /** how many messages have been resent and not yet ACKed? */
     private int _activeResends;
+    private ConEvent _connectionEvent;
     
     private long _lifetimeBytesSent;
     private long _lifetimeBytesReceived;
     private long _lifetimeDupMessageSent;
     private long _lifetimeDupMessageReceived;
     
-    public static final long MAX_RESEND_DELAY = 20*1000;
-    public static final long MIN_RESEND_DELAY = 10*1000;
+    public static final long MAX_RESEND_DELAY = 8*1000;
+    public static final long MIN_RESEND_DELAY = 3*1000;
 
     /** wait up to 5 minutes after disconnection so we can ack/close packets */
     public static int DISCONNECT_TIMEOUT = 5*60*1000;
@@ -116,9 +117,12 @@ public class Connection {
         _connectLock = new Object();
         _activeResends = 0;
         _resetSentOn = -1;
+        _connectionEvent = new ConEvent();
         _context.statManager().createRateStat("stream.con.windowSizeAtCongestion", "How large was our send window when we send a dup?", "Stream", new long[] { 60*1000, 10*60*1000, 60*60*1000 });
         _context.statManager().createRateStat("stream.chokeSizeBegin", "How many messages were outstanding when we started to choke?", "Stream", new long[] { 60*1000, 10*60*1000, 60*60*1000 });
         _context.statManager().createRateStat("stream.chokeSizeEnd", "How many messages were outstanding when we stopped being choked?", "Stream", new long[] { 60*1000, 10*60*1000, 60*60*1000 });
+        if (_log.shouldLog(Log.DEBUG))
+            _log.debug("New connection created with options: " + _options);
     }
     
     public long getNextOutboundPacketNum() { 
@@ -152,7 +156,8 @@ public class Connection {
                 if (!_connected) 
                     return false;
                 started = true;
-                if ( (_outboundPackets.size() >= _options.getWindowSize()) || (_activeResends > 0) ) {
+                if ( (_outboundPackets.size() >= _options.getWindowSize()) || (_activeResends > 0) ||
+                     (_lastSendId - _highestAckedThrough > _options.getWindowSize()) ) {
                     if (writeExpire > 0) {
                         if (timeLeft <= 0) {
                             _log.error("Outbound window is full of " + _outboundPackets.size() 
@@ -200,7 +205,7 @@ public class Connection {
         _resetSent = true;
         if (_resetSentOn <= 0)
             _resetSentOn = _context.clock().now();
-        if ( (_remotePeer == null) || (_sendStreamId == null) ) return;
+        if ( (_remotePeer == null) || (_sendStreamId <= 0) ) return;
         PacketLocal reply = new PacketLocal(_context, _remotePeer);
         reply.setFlag(Packet.FLAG_RESET);
         reply.setFlag(Packet.FLAG_SIGNATURE_INCLUDED);
@@ -251,14 +256,18 @@ public class Connection {
                 remaining = 0;
             if (packet.isFlagSet(Packet.FLAG_CLOSE) || (remaining < 2)) {
                 packet.setOptionalDelay(0);
+                packet.setFlag(Packet.FLAG_DELAY_REQUESTED);
             } else {
-                int delay = _options.getRTT() / 2;
+                int delay = _options.getRTO() / 2;
                 packet.setOptionalDelay(delay);
-                _log.debug("Requesting ack delay of " + delay + "ms for packet " + packet);
+                if (delay > 0)
+                    packet.setFlag(Packet.FLAG_DELAY_REQUESTED);
+                if (_log.shouldLog(Log.DEBUG))
+                    _log.debug("Requesting ack delay of " + delay + "ms for packet " + packet);
             }
             packet.setFlag(Packet.FLAG_DELAY_REQUESTED);
             
-            long timeout = _options.getRTT() + MIN_RESEND_DELAY;
+            long timeout = _options.getRTO();
             if (timeout > MAX_RESEND_DELAY)
                 timeout = MAX_RESEND_DELAY;
             if (_log.shouldLog(Log.DEBUG))
@@ -267,10 +276,13 @@ public class Connection {
             SimpleTimer.getInstance().addEvent(new ResendPacketEvent(packet), timeout);
         }
 
+        _context.statManager().getStatLog().addData(Packet.toId(_sendStreamId), "stream.rtt", _options.getRTT(), _options.getWindowSize());
+        
         _lastSendTime = _context.clock().now();
         _outboundQueue.enqueue(packet);        
         resetActivityTimer();
         
+        /*
         if (ackOnly) {
             // ACK only, don't schedule this packet for retries
             // however, if we are running low on sessionTags we want to send
@@ -281,6 +293,7 @@ public class Connection {
                 _connectionManager.ping(_remotePeer, _options.getRTT()*2, false, packet.getKeyUsed(), packet.getTagsSent(), new PingNotifier());
             }
         }
+         */
     }
     
     private class PingNotifier implements ConnectionManager.PingNotifier {
@@ -298,16 +311,20 @@ public class Connection {
     }
     
     List ackPackets(long ackThrough, long nacks[]) {
-        if (nacks == null) {
-            _highestAckedThrough = ackThrough;
+        if (ackThrough < _highestAckedThrough) {
+            // dupack which won't tell us anything
         } else {
-            long lowest = -1;
-            for (int i = 0; i < nacks.length; i++) {
-                if ( (lowest < 0) || (nacks[i] < lowest) )
-                    lowest = nacks[i];
+           if (nacks == null) {
+                _highestAckedThrough = ackThrough;
+            } else {
+                long lowest = -1;
+                for (int i = 0; i < nacks.length; i++) {
+                    if ( (lowest < 0) || (nacks[i] < lowest) )
+                        lowest = nacks[i];
+                }
+                if (lowest - 1 > _highestAckedThrough)
+                    _highestAckedThrough = lowest - 1;
             }
-            if (lowest - 1 > _highestAckedThrough)
-                _highestAckedThrough = lowest - 1;
         }
         
         List acked = null;
@@ -454,7 +471,9 @@ public class Connection {
             _receiver.destroy();
         if (_activityTimer != null)
             SimpleTimer.getInstance().removeEvent(_activityTimer);
-        _activityTimer = null;
+        //_activityTimer = null;
+        if (_inputStream != null)
+            _inputStream.streamErrorOccurred(new IOException("disconnected!"));
         
         if (_disconnectScheduledOn < 0) {
             _disconnectScheduledOn = _context.clock().now();
@@ -505,17 +524,30 @@ public class Connection {
         synchronized (_connectLock) { _connectLock.notifyAll(); }
     }
     
+    private boolean _remotePeerSet = false;
     /** who are we talking with */
     public Destination getRemotePeer() { return _remotePeer; }
-    public void setRemotePeer(Destination peer) { _remotePeer = peer; }
+    public void setRemotePeer(Destination peer) { 
+        if (_remotePeerSet) throw new RuntimeException("Remote peer already set [" + _remotePeer + ", " + peer + "]");
+        _remotePeerSet = true;
+        _remotePeer = peer; 
+    }
     
+    private boolean _sendStreamIdSet = false;
     /** what stream do we send data to the peer on? */
-    public byte[] getSendStreamId() { return _sendStreamId; }
-    public void setSendStreamId(byte[] id) { _sendStreamId = id; }
+    public long getSendStreamId() { return _sendStreamId; }
+    public void setSendStreamId(long id) { 
+        if (_sendStreamIdSet) throw new RuntimeException("Send stream ID already set [" + _sendStreamId + ", " + id + "]");
+        _sendStreamIdSet = true;
+        _sendStreamId = id; 
+    }
     
+    private boolean _receiveStreamIdSet = false;
     /** stream the peer sends data to us on. (may be null) */
-    public byte[] getReceiveStreamId() { return _receiveStreamId; }
-    public void setReceiveStreamId(byte[] id) { 
+    public long getReceiveStreamId() { return _receiveStreamId; }
+    public void setReceiveStreamId(long id) { 
+        if (_receiveStreamIdSet) throw new RuntimeException("Receive stream ID already set [" + _receiveStreamId + ", " + id + "]");
+        _receiveStreamIdSet = true;
         _receiveStreamId = id; 
         synchronized (_connectLock) { _connectLock.notifyAll(); }
     }
@@ -642,7 +674,7 @@ public class Connection {
     void waitForConnect() {
         long expiration = _context.clock().now() + _options.getConnectTimeout();
         while (true) {
-            if (_connected && (_receiveStreamId != null) && (_sendStreamId != null) ) {
+            if (_connected && (_receiveStreamId > 0) && (_sendStreamId > 0) ) {
                 // w00t
                 if (_log.shouldLog(Log.DEBUG))
                     _log.debug("waitForConnect(): Connected and we have stream IDs");
@@ -686,11 +718,19 @@ public class Connection {
     }
     
     private void resetActivityTimer() {
-        if (_options.getInactivityTimeout() <= 0) return;
-        if (_activityTimer == null) return;
+        if (_options.getInactivityTimeout() <= 0) {
+            if (_log.shouldLog(Log.DEBUG))
+                _log.debug("Resetting the inactivity timer, but its gone!", new Exception("where did it go?"));
+            return;
+        }
+        if (_activityTimer == null) {
+            if (_log.shouldLog(Log.DEBUG))
+                _log.debug("Resetting the inactivity timer, but its gone!", new Exception("where did it go?"));
+            return;
+        }
         long howLong = _activityTimer.getTimeLeft();
         if (_log.shouldLog(Log.DEBUG))
-            _log.debug("Resetting the inactivity timer to " + howLong);
+            _log.debug("Resetting the inactivity timer to " + howLong, new Exception("Reset by"));
         // this will get rescheduled, and rescheduled, and rescheduled...
         SimpleTimer.getInstance().addEvent(_activityTimer, howLong);
     }
@@ -698,15 +738,34 @@ public class Connection {
     private class ActivityTimer implements SimpleTimer.TimedEvent {
         public void timeReached() {
             // uh, nothing more to do...
-            if (!_connected) return;
+            if (!_connected) {
+                if (_log.shouldLog(Log.DEBUG)) _log.debug("Inactivity timeout reached, but we are already closed");
+                return;
+            }
             // we got rescheduled already
-            if (getTimeLeft() > 0) return;
+            long left = getTimeLeft();
+            if (left > 0) {
+                if (_log.shouldLog(Log.DEBUG)) _log.debug("Inactivity timeout reached, but there is time left (" + left + ")");
+                SimpleTimer.getInstance().addEvent(ActivityTimer.this, left);
+                return;
+            }
             // these are either going to time out or cause further rescheduling
-            if (getUnackedPacketsSent() > 0) return;
+            if (getUnackedPacketsSent() > 0) {
+                if (_log.shouldLog(Log.DEBUG)) _log.debug("Inactivity timeout reached, but there are unacked packets");
+                return;
+            }
             // wtf, this shouldn't have been scheduled
-            if (_options.getInactivityTimeout() <= 0) return;
+            if (_options.getInactivityTimeout() <= 0) {
+                if (_log.shouldLog(Log.DEBUG)) _log.debug("Inactivity timeout reached, but there is no timer...");
+                return;
+            }
             // if one of us can't talk...
-            if ( (_closeSentOn > 0) || (_closeReceivedOn > 0) ) return;
+            if ( (_closeSentOn > 0) || (_closeReceivedOn > 0) ) {
+                if (_log.shouldLog(Log.DEBUG)) _log.debug("Inactivity timeout reached, but we are closing");
+                return;
+            }
+            
+            if (_log.shouldLog(Log.DEBUG)) _log.debug("Inactivity timeout reached, with action=" + _options.getInactivityAction());
             
             // bugger it, might as well do the hard work now
             switch (_options.getInactivityAction()) {
@@ -732,7 +791,9 @@ public class Connection {
                         _log.debug(buf.toString());
                     }
                     
-                    disconnect(true);
+                    _inputStream.streamErrorOccurred(new IOException("Inactivity timeout"));
+                    _outputStream.streamErrorOccurred(new IOException("Inactivity timeout"));
+                    disconnect(false);
                     break;
             }
         }
@@ -753,18 +814,19 @@ public class Connection {
     public String toString() { 
         StringBuffer buf = new StringBuffer(128);
         buf.append("[Connection ");
-        if (_receiveStreamId != null)
-            buf.append(Base64.encode(_receiveStreamId));
+        if (_receiveStreamId > 0)
+            buf.append(Packet.toId(_receiveStreamId));
         else
             buf.append("unknown");
         buf.append("<-->");
-        if (_sendStreamId != null)
-            buf.append(Base64.encode(_sendStreamId));
+        if (_sendStreamId > 0)
+            buf.append(Packet.toId(_sendStreamId));
         else
             buf.append("unknown");
         buf.append(" wsize: ").append(_options.getWindowSize());
         buf.append(" cwin: ").append(_congestionWindowEnd - _highestAckedThrough);
         buf.append(" rtt: ").append(_options.getRTT());
+        buf.append(" rto: ").append(_options.getRTO());
         // not synchronized to avoid some kooky races
         buf.append(" unacked outbound: ").append(_outboundPackets.size()).append(" ");
         /*
@@ -802,9 +864,29 @@ public class Connection {
             buf.append(" close received");
         buf.append(" acked packets ").append(getAckedPackets());
         
+        buf.append(" maxWin ").append(getOptions().getMaxWindowSize());
+        
         buf.append("]");
         return buf.toString();
     }
+
+    public SimpleTimer.TimedEvent getConnectionEvent() { return _connectionEvent; }
+    
+    /**
+     * fired to reschedule event notification
+     */
+    class ConEvent implements SimpleTimer.TimedEvent {
+        private Exception _addedBy;
+        public ConEvent() { 
+            //_addedBy = new Exception("added by");
+        }
+        public void timeReached() {
+            //if (_log.shouldLog(Log.DEBUG))
+            //    _log.debug("firing event on " + _connection, _addedBy);
+            eventOccurred(); 
+        }
+        public String toString() { return "event on " + Connection.this.toString(); }
+    }
     
     /**
      * Coordinate the resends of a given packet
@@ -848,11 +930,14 @@ public class Connection {
                 }
                 // revamp various fields, in case we need to ack more, etc
                 _inputStream.updateAcks(_packet);
-                _packet.setOptionalDelay(getOptions().getChoke());
+                int choke = getOptions().getChoke();
+                _packet.setOptionalDelay(choke);
+                if (choke > 0)
+                    _packet.setFlag(Packet.FLAG_DELAY_REQUESTED);
                 _packet.setOptionalMaxSize(getOptions().getMaxMessageSize());
                 _packet.setResendDelay(getOptions().getResendDelay());
-                _packet.setReceiveStreamId(_receiveStreamId);
-                _packet.setSendStreamId(_sendStreamId);
+                //_packet.setReceiveStreamId(_receiveStreamId);
+                //_packet.setSendStreamId(_sendStreamId);
                 
                 int newWindowSize = getOptions().getWindowSize();
 
@@ -864,14 +949,15 @@ public class Connection {
                         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());
-
+                        
                         // setRTT has its own ceiling
                         getOptions().setRTT(getOptions().getRTT() + 10*1000);
                         getOptions().setWindowSize(newWindowSize);
+
+                        if (_log.shouldLog(Log.WARN))
+                            _log.warn("Congestion resending packet " + _packet.getSequenceNum() + ": new windowSize " + newWindowSize 
+                                      + "/" + getOptions().getWindowSize() + ") for " + Connection.this.toString());
+
                         windowAdjusted();
                     }
                 }
@@ -920,10 +1006,10 @@ public class Connection {
                     disconnect(false);
                 } else {
                     //long timeout = _options.getResendDelay() << numSends;
-                    long rtt = _options.getRTT();
-                    if (rtt < MIN_RESEND_DELAY)
-                        rtt = MIN_RESEND_DELAY;
-                    long timeout = rtt << (numSends-1);
+                    long rto = _options.getRTO();
+                    if (rto < MIN_RESEND_DELAY)
+                        rto = MIN_RESEND_DELAY;
+                    long timeout = rto << (numSends-1);
                     if ( (timeout > MAX_RESEND_DELAY) || (timeout <= 0) )
                         timeout = MAX_RESEND_DELAY;
                     if (_log.shouldLog(Log.DEBUG))

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

@@ -2,6 +2,7 @@ package net.i2p.client.streaming;
 
 import net.i2p.I2PAppContext;
 import net.i2p.data.ByteArray;
+import net.i2p.data.DataHelper;
 import net.i2p.util.Log;
 
 /**
@@ -142,15 +143,18 @@ class ConnectionDataReceiver implements MessageOutputStream.DataReceiver {
         data.setValid(size);
         data.setOffset(0);
         packet.setPayload(data);
-		if ( (ackOnly && !forceIncrement) && (!isFirst) )
-			packet.setSequenceNum(0);
+        if ( (ackOnly && !forceIncrement) && (!isFirst) )
+            packet.setSequenceNum(0);
         else
             packet.setSequenceNum(con.getNextOutboundPacketNum());
         packet.setSendStreamId(con.getSendStreamId());
         packet.setReceiveStreamId(con.getReceiveStreamId());
         
         con.getInputStream().updateAcks(packet);
-        packet.setOptionalDelay(con.getOptions().getChoke());
+        int choke = con.getOptions().getChoke();
+        packet.setOptionalDelay(choke);
+        if (choke > 0)
+            packet.setFlag(Packet.FLAG_DELAY_REQUESTED);
         packet.setResendDelay(con.getOptions().getResendDelay());
         
         if (con.getOptions().getProfile() == ConnectionOptions.PROFILE_INTERACTIVE)
@@ -166,6 +170,9 @@ class ConnectionDataReceiver implements MessageOutputStream.DataReceiver {
             packet.setOptionalFrom(con.getSession().getMyDestination());
             packet.setOptionalMaxSize(con.getOptions().getMaxMessageSize());
         }
+        if (DataHelper.eq(con.getSendStreamId(), Packet.STREAM_ID_UNKNOWN)) {
+            packet.setFlag(Packet.FLAG_NO_ACK);
+        }
         
         // don't set the closed flag if this is a plain ACK and there are outstanding
         // packets sent, otherwise the other side could receive the CLOSE prematurely,

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

@@ -127,7 +127,7 @@ class ConnectionHandler {
         reply.setFlag(Packet.FLAG_SIGNATURE_INCLUDED);
         reply.setAckThrough(packet.getSequenceNum());
         reply.setSendStreamId(packet.getReceiveStreamId());
-        reply.setReceiveStreamId(null);
+        reply.setReceiveStreamId(0);
         reply.setOptionalFrom(_manager.getSession().getMyDestination());
         if (_log.shouldLog(Log.DEBUG))
             _log.debug("Sending RST: " + reply + " because of " + packet);

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

@@ -31,9 +31,9 @@ public class ConnectionManager {
     private PacketQueue _outboundQueue;
     private SchedulerChooser _schedulerChooser;
     private ConnectionPacketHandler _conPacketHandler;
-    /** Inbound stream ID (ByteArray) to Connection map */
+    /** Inbound stream ID (Long) to Connection map */
     private Map _connectionByInboundId;
-    /** Ping ID (ByteArray) to PingRequest */
+    /** Ping ID (Long) to PingRequest */
     private Map _pendingPings;
     private boolean _allowIncoming;
     private int _maxConcurrentStreams;
@@ -68,18 +68,19 @@ public class ConnectionManager {
         _context.statManager().createRateStat("stream.con.lifetimeRTT", "What is the final RTT when a stream closes?", "Stream", new long[] { 60*60*1000, 24*60*60*1000 });
         _context.statManager().createRateStat("stream.con.lifetimeCongestionSeenAt", "When was the last congestion seen at when a stream closes?", "Stream", new long[] { 60*60*1000, 24*60*60*1000 });
         _context.statManager().createRateStat("stream.con.lifetimeSendWindowSize", "What is the final send window size when a stream closes?", "Stream", new long[] { 60*60*1000, 24*60*60*1000 });
+        _context.statManager().createRateStat("stream.receiveActive", "How many streams are active when a new one is received (period being not yet dropped)", "Stream", new long[] { 60*60*1000, 24*60*60*1000 });
     }
     
-    Connection getConnectionByInboundId(byte[] id) {
+    Connection getConnectionByInboundId(long id) {
         synchronized (_connectionLock) {
-            return (Connection)_connectionByInboundId.get(new ByteArray(id));
+            return (Connection)_connectionByInboundId.get(new Long(id));
         }
     }
     /** 
      * not guaranteed to be unique, but in case we receive more than one packet
      * on an inbound connection that we havent ack'ed yet...
      */
-    Connection getConnectionByOutboundId(byte[] id) {
+    Connection getConnectionByOutboundId(long id) {
         synchronized (_connectionLock) {
             for (Iterator iter = _connectionByInboundId.values().iterator(); iter.hasNext(); ) {
                 Connection con = (Connection)iter.next();
@@ -106,27 +107,34 @@ public class ConnectionManager {
      */
     public Connection receiveConnection(Packet synPacket) {
         Connection con = new Connection(_context, this, _schedulerChooser, _outboundQueue, _conPacketHandler, new ConnectionOptions(_defaultOptions));
-        byte receiveId[] = new byte[4];
-        _context.random().nextBytes(receiveId);
+        long receiveId = _context.random().nextLong(Packet.MAX_STREAM_ID-1)+1;
         boolean reject = false;
+        int active = 0;
+        int total = 0;
         synchronized (_connectionLock) {
+            total = _connectionByInboundId.size();
+            for (Iterator iter = _connectionByInboundId.values().iterator(); iter.hasNext(); ) {
+                if ( ((Connection)iter.next()).getIsConnected() )
+                    active++;
+            }
             if (locked_tooManyStreams()) {
                 reject = true;
             } else { 
                 while (true) {
-                    ByteArray ba = new ByteArray(receiveId);
-                    Connection oldCon = (Connection)_connectionByInboundId.put(ba, con);
+                    Connection oldCon = (Connection)_connectionByInboundId.put(new Long(receiveId), con);
                     if (oldCon == null) {
                         break;
                     } else { 
-                        _connectionByInboundId.put(ba, oldCon);
+                        _connectionByInboundId.put(new Long(receiveId), oldCon);
                         // receiveId already taken, try another
-                        _context.random().nextBytes(receiveId);
+                        receiveId = _context.random().nextLong(Packet.MAX_STREAM_ID-1)+1;
                     }
                 }
             }
         }
         
+        _context.statManager().addRateData("stream.receiveActive", active, total);
+        
         if (reject) {
             if (_log.shouldLog(Log.WARN))
                 _log.warn("Refusing connection since we have exceeded our max of " 
@@ -136,7 +144,7 @@ public class ConnectionManager {
             reply.setFlag(Packet.FLAG_SIGNATURE_INCLUDED);
             reply.setAckThrough(synPacket.getSequenceNum());
             reply.setSendStreamId(synPacket.getReceiveStreamId());
-            reply.setReceiveStreamId(null);
+            reply.setReceiveStreamId(0);
             reply.setOptionalFrom(_session.getMyDestination());
             // this just sends the packet - no retries or whatnot
             _outboundQueue.enqueue(reply);
@@ -148,7 +156,7 @@ public class ConnectionManager {
             con.getPacketHandler().receivePacket(synPacket, con);
         } catch (I2PException ie) {
             synchronized (_connectionLock) {
-                _connectionByInboundId.remove(new ByteArray(receiveId));
+                _connectionByInboundId.remove(new Long(receiveId));
             }
             return null;
         }
@@ -167,8 +175,7 @@ public class ConnectionManager {
      */
     public Connection connect(Destination peer, ConnectionOptions opts) {
         Connection con = null;
-        byte receiveId[] = new byte[4];
-        _context.random().nextBytes(receiveId);
+        long receiveId = _context.random().nextLong(Packet.MAX_STREAM_ID-1)+1;
         long expiration = _context.clock().now() + opts.getConnectTimeout();
         if (opts.getConnectTimeout() <= 0)
             expiration = _context.clock().now() + DEFAULT_STREAM_DELAY_MAX;
@@ -201,11 +208,10 @@ public class ConnectionManager {
                     con = new Connection(_context, this, _schedulerChooser, _outboundQueue, _conPacketHandler, opts);
                     con.setRemotePeer(peer);
             
-                    ByteArray ba = new ByteArray(receiveId);
-                    while (_connectionByInboundId.containsKey(ba)) {
-                        _context.random().nextBytes(receiveId);
+                    while (_connectionByInboundId.containsKey(new Long(receiveId))) {
+                        receiveId = _context.random().nextLong(Packet.MAX_STREAM_ID-1)+1;
                     }
-                    _connectionByInboundId.put(ba, con);
+                    _connectionByInboundId.put(new Long(receiveId), con);
                     break; // stop looping as a psuedo-wait
                 }
             }
@@ -227,6 +233,8 @@ public class ConnectionManager {
     }
 
     private boolean locked_tooManyStreams() {
+        if (_maxConcurrentStreams <= 0) return false;
+        if (_connectionByInboundId.size() < _maxConcurrentStreams) return false;
         int active = 0;
         for (Iterator iter = _connectionByInboundId.values().iterator(); iter.hasNext(); ) {
             Connection con = (Connection)iter.next();
@@ -238,8 +246,6 @@ public class ConnectionManager {
             _log.info("More than 100 connections!  " + active
                       + " total: " + _connectionByInboundId.size());
 
-        if (_maxConcurrentStreams <= 0) return false;
-        if (_connectionByInboundId.size() < _maxConcurrentStreams) return false;
         return (active >= _maxConcurrentStreams);
     }
     
@@ -272,7 +278,7 @@ public class ConnectionManager {
     public void removeConnection(Connection con) {
         boolean removed = false;
         synchronized (_connectionLock) {
-            Object o = _connectionByInboundId.remove(new ByteArray(con.getReceiveStreamId()));
+            Object o = _connectionByInboundId.remove(new Long(con.getReceiveStreamId()));
             removed = (o == con);
             if (_log.shouldLog(Log.DEBUG))
                 _log.debug("Connection removed? " + removed + " remaining: " 
@@ -308,11 +314,9 @@ public class ConnectionManager {
         return ping(peer, timeoutMs, blocking, null, null, null);
     }
     public boolean ping(Destination peer, long timeoutMs, boolean blocking, SessionKey keyToUse, Set tagsToSend, PingNotifier notifier) {
-        byte id[] = new byte[4];
-        _context.random().nextBytes(id);
-        ByteArray ba = new ByteArray(id);
+        Long id = new Long(_context.random().nextLong(Packet.MAX_STREAM_ID-1)+1);
         PacketLocal packet = new PacketLocal(_context, peer);
-        packet.setSendStreamId(id);
+        packet.setSendStreamId(id.longValue());
         packet.setFlag(Packet.FLAG_ECHO);
         packet.setFlag(Packet.FLAG_SIGNATURE_INCLUDED);
         packet.setOptionalFrom(_session.getMyDestination());
@@ -324,7 +328,7 @@ public class ConnectionManager {
         PingRequest req = new PingRequest(peer, packet, notifier);
         
         synchronized (_pendingPings) {
-            _pendingPings.put(ba, req);
+            _pendingPings.put(id, req);
         }
         
         _outboundQueue.enqueue(packet);
@@ -337,10 +341,10 @@ public class ConnectionManager {
             }
             
             synchronized (_pendingPings) {
-                _pendingPings.remove(ba);
+                _pendingPings.remove(id);
             }
         } else {
-            SimpleTimer.getInstance().addEvent(new PingFailed(ba, notifier), timeoutMs);
+            SimpleTimer.getInstance().addEvent(new PingFailed(id, notifier), timeoutMs);
         }
         
         boolean ok = req.pongReceived();
@@ -352,17 +356,17 @@ public class ConnectionManager {
     }
     
     private class PingFailed implements SimpleTimer.TimedEvent {
-        private ByteArray _ba;
+        private Long _id;
         private PingNotifier _notifier;
-        public PingFailed(ByteArray ba, PingNotifier notifier) { 
-            _ba = ba; 
+        public PingFailed(Long id, PingNotifier notifier) { 
+            _id = id;
             _notifier = notifier;
         }
         
         public void timeReached() {
             boolean removed = false;
             synchronized (_pendingPings) {
-                Object o = _pendingPings.remove(_ba);
+                Object o = _pendingPings.remove(_id);
                 if (o != null)
                     removed = true;
             }
@@ -399,11 +403,10 @@ public class ConnectionManager {
         public boolean pongReceived() { return _ponged; }
     }
     
-    void receivePong(byte pingId[]) {
-        ByteArray ba = new ByteArray(pingId);
+    void receivePong(long pingId) {
         PingRequest req = null;
         synchronized (_pendingPings) {
-            req = (PingRequest)_pendingPings.remove(ba);
+            req = (PingRequest)_pendingPings.remove(new Long(pingId));
         }
         if (req != null) 
             req.pong();

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

@@ -13,6 +13,9 @@ public class ConnectionOptions extends I2PSocketOptionsImpl {
     private int _receiveWindow;
     private int _profile;
     private int _rtt;
+    private int _rttDev;
+    private int _rto;
+    private int _trend[];
     private int _resendDelay;
     private int _sendAckDelay;
     private int _maxMessageSize;
@@ -50,6 +53,10 @@ public class ConnectionOptions extends I2PSocketOptionsImpl {
     public static final String PROP_CONGESTION_AVOIDANCE_GROWTH_RATE_FACTOR = "i2p.streaming.congestionAvoidanceGrowthRateFactor";
     public static final String PROP_SLOW_START_GROWTH_RATE_FACTOR = "i2p.streaming.slowStartGrowthRateFactor";
     
+    private static final int TREND_COUNT = 3;
+    static final int INITIAL_WINDOW_SIZE = 4;
+    static final int DEFAULT_MAX_SENDS = 8;
+    
     public ConnectionOptions() {
         super();
     }
@@ -65,6 +72,7 @@ public class ConnectionOptions extends I2PSocketOptionsImpl {
     public ConnectionOptions(ConnectionOptions opts) {
         super(opts);
         if (opts != null) {
+            setMaxWindowSize(opts.getMaxWindowSize());
             setConnectDelay(opts.getConnectDelay());
             setProfile(opts.getProfile());
             setRTT(opts.getRTT());
@@ -77,7 +85,6 @@ public class ConnectionOptions extends I2PSocketOptionsImpl {
             setInactivityTimeout(opts.getInactivityTimeout());
             setInactivityAction(opts.getInactivityAction());
             setInboundBufferSize(opts.getInboundBufferSize());
-            setMaxWindowSize(opts.getMaxWindowSize());
             setCongestionAvoidanceGrowthRateFactor(opts.getCongestionAvoidanceGrowthRateFactor());
             setSlowStartGrowthRateFactor(opts.getSlowStartGrowthRateFactor());
         }
@@ -85,6 +92,9 @@ public class ConnectionOptions extends I2PSocketOptionsImpl {
     
     protected void init(Properties opts) {
         super.init(opts);
+        _trend = new int[TREND_COUNT];
+        
+        setMaxWindowSize(getInt(opts, PROP_MAX_WINDOW_SIZE, Connection.MAX_WINDOW_SIZE));
         setConnectDelay(getInt(opts, PROP_CONNECT_DELAY, -1));
         setProfile(getInt(opts, PROP_PROFILE, PROFILE_BULK));
         setMaxMessageSize(getInt(opts, PROP_MAX_MESSAGE_SIZE, 4*1024));
@@ -92,22 +102,23 @@ public class ConnectionOptions extends I2PSocketOptionsImpl {
         setReceiveWindow(getInt(opts, PROP_INITIAL_RECEIVE_WINDOW, 1));
         setResendDelay(getInt(opts, PROP_INITIAL_RESEND_DELAY, 1000));
         setSendAckDelay(getInt(opts, PROP_INITIAL_ACK_DELAY, 500));
-        setWindowSize(getInt(opts, PROP_INITIAL_WINDOW_SIZE, 1));
-        setMaxResends(getInt(opts, PROP_MAX_RESENDS, 5));
+        setWindowSize(getInt(opts, PROP_INITIAL_WINDOW_SIZE, INITIAL_WINDOW_SIZE));
+        setMaxResends(getInt(opts, PROP_MAX_RESENDS, DEFAULT_MAX_SENDS));
         setWriteTimeout(getInt(opts, PROP_WRITE_TIMEOUT, -1));
-        setInactivityTimeout(getInt(opts, PROP_INACTIVITY_TIMEOUT, 5*60*1000));
+        setInactivityTimeout(getInt(opts, PROP_INACTIVITY_TIMEOUT, 2*60*1000));
         setInactivityAction(getInt(opts, PROP_INACTIVITY_ACTION, INACTIVITY_ACTION_DISCONNECT));
         setInboundBufferSize(getMaxMessageSize() * (Connection.MAX_WINDOW_SIZE + 2));
-        setCongestionAvoidanceGrowthRateFactor(getInt(opts, PROP_CONGESTION_AVOIDANCE_GROWTH_RATE_FACTOR, 2));
-        setSlowStartGrowthRateFactor(getInt(opts, PROP_SLOW_START_GROWTH_RATE_FACTOR, 2));
+        setCongestionAvoidanceGrowthRateFactor(getInt(opts, PROP_CONGESTION_AVOIDANCE_GROWTH_RATE_FACTOR, 1));
+        setSlowStartGrowthRateFactor(getInt(opts, PROP_SLOW_START_GROWTH_RATE_FACTOR, 1));
         
         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_MAX_WINDOW_SIZE))
+            setMaxWindowSize(getInt(opts, PROP_MAX_WINDOW_SIZE, Connection.MAX_WINDOW_SIZE));
         if (opts.containsKey(PROP_CONNECT_DELAY))
             setConnectDelay(getInt(opts, PROP_CONNECT_DELAY, -1));
         if (opts.containsKey(PROP_PROFILE))
@@ -119,17 +130,17 @@ public class ConnectionOptions extends I2PSocketOptionsImpl {
         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));
+            setResendDelay(getInt(opts, PROP_INITIAL_RESEND_DELAY, 1000));
         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));
+            setWindowSize(getInt(opts, PROP_INITIAL_WINDOW_SIZE, INITIAL_WINDOW_SIZE));
         if (opts.containsKey(PROP_MAX_RESENDS))
-            setMaxResends(getInt(opts, PROP_MAX_RESENDS, 5));
+            setMaxResends(getInt(opts, PROP_MAX_RESENDS, DEFAULT_MAX_SENDS));
         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));
+            setInactivityTimeout(getInt(opts, PROP_INACTIVITY_TIMEOUT, 2*60*1000));
         if (opts.containsKey(PROP_INACTIVITY_ACTION))
             setInactivityAction(getInt(opts, PROP_INACTIVITY_ACTION, INACTIVITY_ACTION_DISCONNECT));
         setInboundBufferSize(getMaxMessageSize() * (Connection.MAX_WINDOW_SIZE + 2));
@@ -140,8 +151,6 @@ public class ConnectionOptions extends I2PSocketOptionsImpl {
         
         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));
     }
     
     /** 
@@ -186,16 +195,55 @@ public class ConnectionOptions extends I2PSocketOptionsImpl {
      */
     public int getRTT() { return _rtt; }
     public void setRTT(int ms) { 
+        if (_rto == 0) {
+            _rttDev = ms;
+            _rto = (int)Connection.MAX_RESEND_DELAY;
+        }
+        synchronized (_trend) {
+            _trend[0] = _trend[1];
+            _trend[1] = _trend[2];
+            if (ms > _rtt)
+                _trend[2] = 1;
+            else if (ms < _rtt)
+                _trend[2] = -1;
+            else
+                _trend[2] = 0;
+        }
+        
         _rtt = ms; 
         if (_rtt > 60*1000)
             _rtt = 60*1000;
     }
+    public int getRTO() { return _rto; }
+    
+    /**
+     * If we have 3 consecutive rtt increases, we are trending upwards (1), or if we have
+     * 3 consecutive rtt decreases, we are trending downwards (-1), else we're stable.
+     *
+     */
+    public int getRTTTrend() {
+        synchronized (_trend) {
+            for (int i = 0; i < TREND_COUNT - 1; i++) {
+                if (_trend[i] != _trend[i+1])
+                    return 0;
+            }
+            return _trend[0];
+        }
+    }
     
     /** rtt = rtt*RTT_DAMPENING + (1-RTT_DAMPENING)*currentPacketRTT */
     private static final double RTT_DAMPENING = 0.9;
     
     public void updateRTT(int measuredValue) {
-        setRTT((int)(RTT_DAMPENING*_rtt + (1-RTT_DAMPENING)*measuredValue));
+        _rttDev = _rttDev + (int)(0.25d*(Math.abs(measuredValue-_rtt)-_rttDev));
+        int smoothed = (int)(RTT_DAMPENING*_rtt + (1-RTT_DAMPENING)*measuredValue);        
+        _rto = smoothed + (_rttDev<<2);
+        if (_rto < Connection.MIN_RESEND_DELAY) 
+            _rto = (int)Connection.MIN_RESEND_DELAY;
+        else if (_rto > Connection.MAX_RESEND_DELAY)
+            _rto = (int)Connection.MAX_RESEND_DELAY;
+
+        setRTT(smoothed);
     }
     
     /** How long after sending a packet will we wait before resending? */

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

@@ -26,6 +26,7 @@ public class ConnectionPacketHandler {
         _context.statManager().createRateStat("stream.con.packetsAckedPerMessageReceived", "Size of a duplicate message received on a connection", "Stream", new long[] { 60*1000, 10*60*1000, 60*60*1000 });
         _context.statManager().createRateStat("stream.sendsBeforeAck", "How many times a message was sent before it was ACKed?", "Stream", new long[] { 10*60*1000, 60*60*1000 });
         _context.statManager().createRateStat("stream.resetReceived", "How many messages had we sent successfully before receiving a RESET?", "Stream", new long[] { 60*60*1000, 24*60*60*1000 });
+        _context.statManager().createRateStat("stream.trend", "What direction the RTT is trending in (with period = windowsize)", "Stream", new long[] { 60*1000, 60*60*1000 });
     }
     
     /** distribute a packet to the connection specified */
@@ -33,7 +34,7 @@ public class ConnectionPacketHandler {
         boolean ok = verifyPacket(packet, con);
         if (!ok) {
             if ( (!packet.isFlagSet(Packet.FLAG_RESET)) && (_log.shouldLog(Log.ERROR)) )
-                _log.error("Packet does NOT verify: " + packet);
+                _log.error("Packet does NOT verify: " + packet + " on " + con);
             packet.releasePayload();
             return;
         }
@@ -61,7 +62,7 @@ public class ConnectionPacketHandler {
                 con.getOutputStream().setBufferSize(packet.getOptionalMaxSize());
             }
         }
-
+        
         con.packetReceived();
         
         boolean choke = false;
@@ -91,7 +92,20 @@ public class ConnectionPacketHandler {
 
         _context.statManager().addRateData("stream.con.receiveMessageSize", packet.getPayloadSize(), 0);
         
-        boolean isNew = con.getInputStream().messageReceived(packet.getSequenceNum(), packet.getPayload());
+        boolean isNew = false;
+        boolean allowAck = true;
+        
+        if ( (!packet.isFlagSet(Packet.FLAG_SYNCHRONIZE)) && 
+             ( (packet.getSendStreamId() <= 0) ||  
+               (packet.getReceiveStreamId() <= 0) ) )
+            allowAck = false;
+
+        if (allowAck) {
+            isNew = con.getInputStream().messageReceived(packet.getSequenceNum(), packet.getPayload());
+        } else {
+            con.getInputStream().notifyActivity();
+            isNew = false;
+        }
         
         if ( (packet.getSequenceNum() == 0) && (packet.getPayloadSize() > 0) ) {
             if (_log.shouldLog(Log.DEBUG))
@@ -146,9 +160,7 @@ public class ConnectionPacketHandler {
             }
         }
 
-        if (packet.isFlagSet(Packet.FLAG_SYNCHRONIZE) && 
-            ((packet.getSendStreamId() == null) ||
-              DataHelper.eq(packet.getSendStreamId(), Packet.STREAM_ID_UNKNOWN) ) ) {
+        if (packet.isFlagSet(Packet.FLAG_SYNCHRONIZE) && (packet.getSendStreamId() <= 0) ) {
             // don't honor the ACK 0 in SYN packets received when the other side
             // has obviously not seen our messages
         } else {
@@ -156,10 +168,16 @@ public class ConnectionPacketHandler {
         }
         con.eventOccurred();
         if (fastAck) {
-            if (con.getLastSendTime() + 2000 < _context.clock().now()) {
-                if (_log.shouldLog(Log.DEBUG))
-                    _log.debug("Fast ack for dup " + packet);
-                con.ackImmediately();
+            if (!isNew) {
+                // if we're congested (fastAck) but this is also a new packet, 
+                // we've already scheduled an ack above, so there is no need to schedule 
+                // a fast ack (we can wait a few ms)
+            } else {
+                if (con.getLastSendTime() + 2000 < _context.clock().now()) {
+                    if (_log.shouldLog(Log.DEBUG))
+                        _log.debug("Fast ack for dup " + packet);
+                    con.ackImmediately();
+                }
             }
         }
         
@@ -167,14 +185,32 @@ public class ConnectionPacketHandler {
             // non-ack message payloads are queued in the MessageInputStream
             packet.releasePayload();
         }
+        
+        //if (choke)
+        //    con.fastRetransmit();
     }
     
     private boolean ack(Connection con, long ackThrough, long nacks[], Packet packet, boolean isNew, boolean choke) {
-        if ( (nacks != null) && (nacks.length > 0) )
-            con.getOptions().setRTT(con.getOptions().getRTT() + nacks.length*1000);
+        if (ackThrough < 0) return false;
+        //if ( (nacks != null) && (nacks.length > 0) )
+        //    con.getOptions().setRTT(con.getOptions().getRTT() + nacks.length*1000);
 
         int numResends = 0;
-        List acked = con.ackPackets(ackThrough, nacks);
+        List acked = null;
+        // if we don't know the streamIds for both sides of the connection, there's no way we
+        // could actually be acking data (this fixes the buggered up ack of packet 0 problem).
+        // this is called after packet verification, which places the stream IDs as necessary if
+        // the SYN verifies (so if we're acking w/out stream IDs, no SYN has been received yet)
+        if ( (packet != null) && (packet.getSendStreamId() > 0) && (packet.getReceiveStreamId() > 0) &&
+             (con != null) && (con.getSendStreamId() > 0) && (con.getReceiveStreamId() > 0) &&
+             (!DataHelper.eq(packet.getSendStreamId(), Packet.STREAM_ID_UNKNOWN)) &&
+             (!DataHelper.eq(packet.getReceiveStreamId(), Packet.STREAM_ID_UNKNOWN)) &&
+             (!DataHelper.eq(con.getSendStreamId(), Packet.STREAM_ID_UNKNOWN)) &&
+             (!DataHelper.eq(con.getReceiveStreamId(), Packet.STREAM_ID_UNKNOWN)) )
+            acked = con.ackPackets(ackThrough, nacks);
+        else
+            return false;
+        
         if ( (acked != null) && (acked.size() > 0) ) {
             if (_log.shouldLog(Log.DEBUG))
                 _log.debug(acked.size() + " of our packets acked with " + packet);
@@ -224,15 +260,17 @@ public class ConnectionPacketHandler {
             oldSize >>>= 1;
             if (oldSize <= 0)
                 oldSize = 1;
-            if (_log.shouldLog(Log.DEBUG))
-                _log.debug("Congestion occurred - new windowSize " + oldSize + " congestionSeenAt: "
-                           + con.getLastCongestionSeenAt() + " (#resends: " + numResends 
-                           + ") for " + con);
 
             // setRTT has its own ceiling
             con.getOptions().setRTT(con.getOptions().getRTT() + 10*1000);
             con.getOptions().setWindowSize(oldSize);
-            
+
+            if (_log.shouldLog(Log.DEBUG))
+                _log.debug("Congestion occurred - new windowSize " + oldSize + " / " + con.getOptions().getWindowSize() + " congestionSeenAt: "
+                           + con.getLastCongestionSeenAt() + " (#resends: " + numResends 
+                           + ") for " + con);
+
+
             congested = true;
         } 
         
@@ -242,8 +280,13 @@ public class ConnectionPacketHandler {
             int oldWindow = con.getOptions().getWindowSize();
             int newWindowSize = oldWindow;
 
+            int trend = con.getOptions().getRTTTrend();
+
+            _context.statManager().addRateData("stream.trend", trend, newWindowSize);
+            
             if ( (!congested) && (acked > 0) && (numResends <= 0) ) {
-                if (newWindowSize > con.getLastCongestionSeenAt() / 2) {
+                if ( (newWindowSize > con.getLastCongestionSeenAt() / 2) ||
+                     (trend > 0) ) { // tcp vegas: avoidance if rtt is increasing, even if we arent at ssthresh/2 yet
                     // congestion avoidance
 
                     // we can't use newWindowSize += 1/newWindowSize, since we're
@@ -253,7 +296,7 @@ public class ConnectionPacketHandler {
                         newWindowSize += 1;
                 } else {
                     // slow start, but modified to take into account the fact
-					// that windows in the streaming lib are messages, not bytes,
+                    // that windows in the streaming lib are messages, not bytes,
                     // so we only grow 1 every N times (where N = the slow start factor)
                     int shouldIncrement = _context.random().nextInt(con.getOptions().getSlowStartGrowthRateFactor());
                     if (shouldIncrement <= 0)
@@ -263,19 +306,26 @@ public class ConnectionPacketHandler {
             
             if (newWindowSize <= 0)
                 newWindowSize = 1;
-                    
-            if (_log.shouldLog(Log.DEBUG))
-                _log.debug("New window size " + newWindowSize + "/" + oldWindow + " congestionSeenAt: "
-                           + con.getLastCongestionSeenAt() + " (#resends: " + numResends 
-                           + ") for " + con);
+
             con.getOptions().setWindowSize(newWindowSize);
             con.setCongestionWindowEnd(newWindowSize + lowest);
+                                
+            if (_log.shouldLog(Log.DEBUG))
+                _log.debug("New window size " + newWindowSize + "/" + oldWindow + "/" + con.getOptions().getWindowSize() + " congestionSeenAt: "
+                           + con.getLastCongestionSeenAt() + " (#resends: " + numResends 
+                           + ") for " + con);
         }
         
         con.windowAdjusted();
         return congested;
     }
     
+    /**
+     * If we don't know the send stream id yet (we're just creating a connection), allow
+     * the first three packets to come in.  The first of those should be the SYN, of course...
+     */
+    private static final int MAX_INITIAL_PACKETS = ConnectionOptions.INITIAL_WINDOW_SIZE;
+    
     /**
      * Make sure this packet is ok and that we can continue processing its data.
      * 
@@ -289,26 +339,26 @@ public class ConnectionPacketHandler {
         } else {
             verifySignature(packet, con);
             
-            if (con.getSendStreamId() == null) {
+            if (con.getSendStreamId() <= 0) {
                 if (packet.isFlagSet(Packet.FLAG_SYNCHRONIZE)) {
                     con.setSendStreamId(packet.getReceiveStreamId());
                     con.setRemotePeer(packet.getOptionalFrom());
                     return true;
                 } else {
                     // neither RST nor SYN and we dont have the stream id yet?
-                    if (packet.getSequenceNum() <= 2) {
+                    if (packet.getSequenceNum() < MAX_INITIAL_PACKETS) {
                         return true;
                     } else {
-                        if (_log.shouldLog(Log.WARN))
-                            _log.warn("Packet without RST or SYN where we dont know stream ID: " 
+                        if (_log.shouldLog(Log.ERROR))
+                            _log.error("Packet without RST or SYN where we dont know stream ID: " 
                                       + packet);
                         return false;
                     }
                 }
             } else {
                 if (!DataHelper.eq(con.getSendStreamId(), packet.getReceiveStreamId())) {
-                    if (_log.shouldLog(Log.WARN))
-                        _log.warn("Packet received with the wrong reply stream id: " 
+                    if (_log.shouldLog(Log.ERROR))
+                        _log.error("Packet received with the wrong reply stream id: " 
                                   + con + " / " + packet);
                     return false;
                 } else {
@@ -325,8 +375,8 @@ public class ConnectionPacketHandler {
         if (DataHelper.eq(con.getReceiveStreamId(), packet.getSendStreamId())) {
             boolean ok = packet.verifySignature(_context, packet.getOptionalFrom(), null);
             if (!ok) {
-                if (_log.shouldLog(Log.WARN))
-                    _log.warn("Received unsigned / forged RST on " + con);
+                if (_log.shouldLog(Log.ERROR))
+                    _log.error("Received unsigned / forged RST on " + con);
                 return;
             } else {
                 if (_log.shouldLog(Log.DEBUG))

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

@@ -44,6 +44,7 @@ public class MessageHandler implements I2PSessionListener {
                 _log.warn("Error receiving the message", ise);
             return;
         }
+        if (data == null) return;
         Packet packet = new Packet();
         try {
             packet.readPacket(data, 0, data.length);
@@ -91,8 +92,8 @@ public class MessageHandler implements I2PSessionListener {
      *
      */
     public void errorOccurred(I2PSession session, String message, Throwable error) {
-        if (_log.shouldLog(Log.ERROR))
-            _log.error("error occurred: " + message + "- " + error.getMessage()); 
+        if (_log.shouldLog(Log.WARN))
+            _log.warn("error occurred: " + message + "- " + error.getMessage()); 
         if (_log.shouldLog(Log.WARN))
             _log.warn("cause", error);
         //_manager.disconnectAllHard();

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

@@ -193,6 +193,8 @@ public class MessageInputStream extends InputStream {
         }
     }
     
+    public void notifyActivity() { synchronized (_dataLock) { _dataLock.notifyAll(); } }
+    
     /**
      * A new message has arrived - toss it on the appropriate queue (moving 
      * previously pending messages to the ready queue if it fills the gap, etc).
@@ -202,7 +204,7 @@ public class MessageInputStream extends InputStream {
     public boolean messageReceived(long messageId, ByteArray payload) {
         synchronized (_dataLock) {
             if (_log.shouldLog(Log.DEBUG))
-                _log.debug("received " + messageId + " with " + payload.getValid());
+                _log.debug("received " + messageId + " with " + (payload != null ? payload.getValid()+"" : "no payload"));
             if (messageId <= _highestReadyBlockId) {
                 if (_log.shouldLog(Log.DEBUG))
                     _log.debug("ignoring dup message " + messageId);
@@ -435,7 +437,9 @@ public class MessageInputStream extends InputStream {
      *
      */
     void streamErrorOccurred(IOException ioe) {
-        _streamError = ioe;
+        if (_streamError == null)
+            _streamError = ioe;
+        _locallyClosed = true;
         synchronized (_dataLock) {
             _dataLock.notifyAll();
         }

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

@@ -38,6 +38,10 @@ public class MessageOutputStream extends OutputStream {
      * size
      */
     private volatile int _nextBufferSize;
+    // rate calc helpers
+    private long _sendPeriodBeginTime;
+    private long _sendPeriodBytes;
+    private int _sendBps;
     
     public MessageOutputStream(I2PAppContext ctx, DataReceiver receiver) {
         this(ctx, receiver, Packet.MAX_PAYLOAD_SIZE);
@@ -55,6 +59,10 @@ public class MessageOutputStream extends OutputStream {
         _writeTimeout = -1;
         _passiveFlushDelay = 500;
         _nextBufferSize = -1;
+        _sendPeriodBeginTime = ctx.clock().now();
+        _sendPeriodBytes = 0;
+        _sendBps = 0;
+        _context.statManager().createRateStat("stream.sendBps", "How fast we pump data through the stream", "Stream", new long[] { 60*1000, 5*60*1000, 60*60*1000 });
         _flusher = new Flusher();
         if (_log.shouldLog(Log.DEBUG))
             _log.debug("MessageOutputStream created");
@@ -137,6 +145,21 @@ public class MessageOutputStream extends OutputStream {
         if ( (elapsed > 10*1000) && (_log.shouldLog(Log.DEBUG)) )
             _log.debug("wtf, took " + elapsed + "ms to write to the stream?", new Exception("foo"));
         throwAnyError();
+        updateBps(len);
+    }
+    
+    private void updateBps(int len) {
+        long now = _context.clock().now();
+        int periods = (int)Math.floor((now - _sendPeriodBeginTime) / 1000d);
+        if (periods > 0) {
+            // first term decays on slow transmission
+            _sendBps = (int)(((float)0.9f*((float)_sendBps/(float)periods)) + ((float)0.1f*((float)_sendPeriodBytes/(float)periods)));
+            _sendPeriodBytes = len;
+            _sendPeriodBeginTime = now;
+            _context.statManager().addRateData("stream.sendBps", _sendBps, 0);
+        } else {
+            _sendPeriodBytes += len;
+        }
     }
     
     public void write(int b) throws IOException {
@@ -289,11 +312,16 @@ public class MessageOutputStream extends OutputStream {
     /** nonblocking close */
     public void closeInternal() {
         _closed = true;
-        _streamError = new IOException("Closed internally");
+        if (_streamError == null)
+            _streamError = new IOException("Closed internally");
+        clearData(true);
+    }
+    
+    private void clearData(boolean shouldFlush) {
         ByteArray ba = null;
         synchronized (_dataLock) {
             // flush any data, but don't wait for it
-            if (_dataReceiver != null)
+            if ( (_dataReceiver != null) && (_valid > 0) && shouldFlush)
                 _dataReceiver.writeData(_buf, 0, _valid);
             _written += _valid;
             _valid = 0;
@@ -322,7 +350,9 @@ public class MessageOutputStream extends OutputStream {
     }
     
     void streamErrorOccurred(IOException ioe) {
-        _streamError = ioe;
+        if (_streamError == null)
+            _streamError = ioe;
+        clearData(false);
     }
     
     /** 

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

@@ -10,6 +10,7 @@ import net.i2p.data.Destination;
 import net.i2p.data.Signature;
 import net.i2p.data.SigningPrivateKey;
 import net.i2p.util.ByteCache;
+import net.i2p.util.Log;
 
 /**
  * Contain a single packet transferred as part of a streaming connection.  
@@ -51,8 +52,8 @@ import net.i2p.util.ByteCache;
  *
  */
 public class Packet {
-    private byte _sendStreamId[];
-    private byte _receiveStreamId[];
+    private long _sendStreamId;
+    private long _receiveStreamId;
     private long _sequenceNum;
     private long _ackThrough;
     private long _nacks[];
@@ -64,7 +65,6 @@ public class Packet {
     private Destination _optionFrom;
     private int _optionDelay;
     private int _optionMaxSize;
-    private ByteCache _cache;
     
     /** 
      * The receiveStreamId will be set to this when the packet doesn't know 
@@ -72,7 +72,9 @@ public class Packet {
      * synchronize packet)
      *
      */
-    public static final byte STREAM_ID_UNKNOWN[] = new byte[] { 0x00, 0x00, 0x00, 0x00 };
+    public static final long STREAM_ID_UNKNOWN = 0l;
+    
+    public static final long MAX_STREAM_ID = 0xffffffffl;
     
     /**
      * This packet is creating a new socket connection (if the receiveStreamId
@@ -135,43 +137,36 @@ public class Packet {
      * ping reply (if receiveStreamId is set).
      */
     public static final int FLAG_ECHO = (1 << 9);
+    
+    /** 
+     * If set, this packet doesn't really want to ack anything
+     */
+    public static final int FLAG_NO_ACK = (1 << 10);
 
     public static final int DEFAULT_MAX_SIZE = 32*1024;
     private static final int MAX_DELAY_REQUEST = 65535;
 
-    public Packet() {
-        _cache = ByteCache.getInstance(128, MAX_PAYLOAD_SIZE);
-    }
+    public Packet() { }
     
-    /** what stream is this packet a part of? */
-    public byte[] getSendStreamId() { 
-        if ( (_sendStreamId == null) || (DataHelper.eq(_sendStreamId, STREAM_ID_UNKNOWN)) )
-            return null;
-        else
-            return _sendStreamId; 
-    }
-    public void setSendStreamId(byte[] id) { 
+    private boolean _sendStreamIdSet = false;
+    /** what stream do we send data to the peer on? */
+    public long getSendStreamId() { return _sendStreamId; }
+    public void setSendStreamId(long id) { 
+        if (_sendStreamIdSet) throw new RuntimeException("Send stream ID already set [" + _sendStreamId + ", " + id + "]");
+        _sendStreamIdSet = true;
         _sendStreamId = id; 
-        if ( (id != null) && (DataHelper.eq(id, STREAM_ID_UNKNOWN)) )
-            _sendStreamId = null;
     }
     
+    private boolean _receiveStreamIdSet = false;
     /** 
-     * Stream that replies should be sent on.  if the 
-     * connection is still being built, this should be 
-     * null.
-     *
+     * stream the replies should be sent on.  this should be 0 if the
+     * connection is still being built.
      */
-    public byte[] getReceiveStreamId() { 
-        if ( (_receiveStreamId == null) || (DataHelper.eq(_receiveStreamId, STREAM_ID_UNKNOWN)) )
-            return null;
-        else
-            return _receiveStreamId; 
-    }
-    public void setReceiveStreamId(byte[] id) { 
+    public long getReceiveStreamId() { return _receiveStreamId; }
+    public void setReceiveStreamId(long id) { 
+        if (_receiveStreamIdSet) throw new RuntimeException("Receive stream ID already set [" + _receiveStreamId + ", " + id + "]");
+        _receiveStreamIdSet = true;
         _receiveStreamId = id; 
-        if ( (id != null) && (DataHelper.eq(id, STREAM_ID_UNKNOWN)) )
-            _receiveStreamId = null;
     }
     
     /** 0-indexed sequence number for this Packet in the sendStream */
@@ -181,11 +176,21 @@ public class Packet {
     /** 
      * The highest packet sequence number that received
      * on the receiveStreamId.  This field is ignored on the initial
-     * connection packet (where receiveStreamId is the unknown id).
+     * connection packet (where receiveStreamId is the unknown id) or
+     * if FLAG_NO_ACK is set.
      *
      */
-    public long getAckThrough() { return _ackThrough; }
-    public void setAckThrough(long id) { _ackThrough = id; }
+    public long getAckThrough() { 
+        if (isFlagSet(FLAG_NO_ACK))
+            return -1;
+        else
+            return _ackThrough; 
+    }
+    public void setAckThrough(long id) { 
+        if (id < 0)
+            setFlag(FLAG_NO_ACK);
+        _ackThrough = id; 
+    }
     
     /**
      * List of packet sequence numbers below the getAckThrough() value
@@ -209,8 +214,6 @@ public class Packet {
     /** get the actual payload of the message.  may be null */
     public ByteArray getPayload() { return _payload; }
     public void setPayload(ByteArray payload) { 
-        //if ( (_payload != null) && (_payload != payload) )
-        //    _cache.release(_payload);
         _payload = payload; 
         if ( (payload != null) && (payload.getValid() > MAX_PAYLOAD_SIZE) )
             throw new IllegalArgumentException("Too large payload: " + payload.getValid());
@@ -219,15 +222,11 @@ public class Packet {
         return (_payload == null ? 0 : _payload.getValid());
     }
     public void releasePayload() {
-        //if (_payload != null)
-        //    _cache.release(_payload);
-        _payload = null;
+        //_payload = null;
     }
     public ByteArray acquirePayload() {
         ByteArray old = _payload;
-        _payload = new ByteArray(new byte[Packet.MAX_PAYLOAD_SIZE]); //_cache.acquire();
-        //if (old != null)
-        //    _cache.release(old);
+        _payload = new ByteArray(new byte[Packet.MAX_PAYLOAD_SIZE]);
         return _payload;
     }
 
@@ -240,6 +239,7 @@ public class Packet {
         else
             _flags &= ~flag;
     }
+    public void setFlags(int flags) { _flags = flags; } 
 
     /** the signature on the packet (only included if the flag for it is set) */
     public Signature getOptionalSignature() { return _optionSignature; }
@@ -263,7 +263,6 @@ public class Packet {
      */
     public int getOptionalDelay() { return _optionDelay; }
     public void setOptionalDelay(int delayMs) {
-        setFlag(FLAG_DELAY_REQUESTED, delayMs > 0); 
         if (delayMs > MAX_DELAY_REQUEST)
             _optionDelay = MAX_DELAY_REQUEST;
         else if (delayMs < 0)
@@ -297,15 +296,9 @@ public class Packet {
      */
     private int writePacket(byte buffer[], int offset, boolean includeSig) throws IllegalStateException {
         int cur = offset;
-        if ( (_sendStreamId != null) && (_sendStreamId.length == 4) )
-            System.arraycopy(_sendStreamId, 0, buffer, cur, _sendStreamId.length);
-        else
-            System.arraycopy(STREAM_ID_UNKNOWN, 0, buffer, cur, STREAM_ID_UNKNOWN.length);
+        DataHelper.toLong(buffer, cur, 4, (_sendStreamId >= 0 ? _sendStreamId : STREAM_ID_UNKNOWN));
         cur += 4;
-        if ( (_receiveStreamId != null) && (_receiveStreamId.length == 4) )
-            System.arraycopy(_receiveStreamId, 0, buffer, cur, _receiveStreamId.length);
-        else
-            System.arraycopy(STREAM_ID_UNKNOWN, 0, buffer, cur, STREAM_ID_UNKNOWN.length);
+        DataHelper.toLong(buffer, cur, 4, (_receiveStreamId >= 0 ? _receiveStreamId : STREAM_ID_UNKNOWN));
         cur += 4;
         DataHelper.toLong(buffer, cur, 4, _sequenceNum > 0 ? _sequenceNum : 0);
         cur += 4;
@@ -383,7 +376,7 @@ public class Packet {
         size += 4; // sequenceNum
         size += 4; // ackThrough
         if (_nacks != null) {
-			size++; // nacks length
+            size++; // nacks length
             size += 4 * _nacks.length;
         } else {
             size++; // nacks length
@@ -425,32 +418,31 @@ public class Packet {
         if (length < 22) // min header size
             throw new IllegalArgumentException("Too small: len=" + buffer.length);
         int cur = offset;
-        _sendStreamId = new byte[4];
-        System.arraycopy(buffer, cur, _sendStreamId, 0, 4);
+        setSendStreamId(DataHelper.fromLong(buffer, cur, 4));
         cur += 4;
-        _receiveStreamId = new byte[4];
-        System.arraycopy(buffer, cur, _receiveStreamId, 0, 4);
+        setReceiveStreamId(DataHelper.fromLong(buffer, cur, 4));
         cur += 4;
-        _sequenceNum = DataHelper.fromLong(buffer, cur, 4);
+        setSequenceNum(DataHelper.fromLong(buffer, cur, 4));
         cur += 4;
-        _ackThrough = DataHelper.fromLong(buffer, cur, 4);
+        setAckThrough(DataHelper.fromLong(buffer, cur, 4));
         cur += 4;
         int numNacks = (int)DataHelper.fromLong(buffer, cur, 1);
         cur++;
         if (length < 22 + numNacks*4)
             throw new IllegalArgumentException("Too small with " + numNacks + " nacks: " + length);
         if (numNacks > 0) {
-            _nacks = new long[numNacks];
+            long nacks[] = new long[numNacks];
             for (int i = 0; i < numNacks; i++) {
-                _nacks[i] = DataHelper.fromLong(buffer, cur, 4);
+                nacks[i] = DataHelper.fromLong(buffer, cur, 4);
                 cur += 4;
             }
+            setNacks(nacks);
         } else {
-            _nacks = null;
+            setNacks(null);
         }
-        _resendDelay = (int)DataHelper.fromLong(buffer, cur, 1);
+        setResendDelay((int)DataHelper.fromLong(buffer, cur, 1));
         cur++;
-        _flags = (int)DataHelper.fromLong(buffer, cur, 2);
+        setFlags((int)DataHelper.fromLong(buffer, cur, 2));
         cur += 2;
         
         int optionSize = (int)DataHelper.fromLong(buffer, cur, 2);
@@ -466,33 +458,36 @@ public class Packet {
             throw new IllegalArgumentException("length: " + length + " offset: " + offset + " begin: " + payloadBegin);
         
         // skip ahead to the payload
-        _payload = new ByteArray(new byte[payloadSize]); //_cache.acquire(); 
-        System.arraycopy(buffer, payloadBegin, _payload.getData(), 0, payloadSize);
-        _payload.setValid(payloadSize);
-        _payload.setOffset(0);
+        //_payload = new ByteArray(new byte[payloadSize]);
+        _payload = new ByteArray(buffer, payloadBegin, payloadSize);
+        //System.arraycopy(buffer, payloadBegin, _payload.getData(), 0, payloadSize);
+        //_payload.setValid(payloadSize);
+        //_payload.setOffset(0);
         
         // ok now lets go back and deal with the options
         if (isFlagSet(FLAG_DELAY_REQUESTED)) {
-            _optionDelay = (int)DataHelper.fromLong(buffer, cur, 2);
+            setOptionalDelay((int)DataHelper.fromLong(buffer, cur, 2));
             cur += 2;
         }
         if (isFlagSet(FLAG_FROM_INCLUDED)) {
-            _optionFrom = new Destination();
+            Destination optionFrom = new Destination();
             try {
-                cur += _optionFrom.readBytes(buffer, cur);
+                cur += optionFrom.readBytes(buffer, cur);
+                setOptionalFrom(optionFrom);
             } catch (DataFormatException dfe) {
                 throw new IllegalArgumentException("Bad from field: " + dfe.getMessage());
             }
         }
         if (isFlagSet(FLAG_MAX_PACKET_SIZE_INCLUDED)) {
-            _optionMaxSize = (int)DataHelper.fromLong(buffer, cur, 2);
+            setOptionalMaxSize((int)DataHelper.fromLong(buffer, cur, 2));
             cur += 2;
         }
         if (isFlagSet(FLAG_SIGNATURE_INCLUDED)) {
-            _optionSignature = new Signature();
+            Signature optionSignature = new Signature();
             byte buf[] = new byte[Signature.SIGNATURE_BYTES];
             System.arraycopy(buffer, cur, buf, 0, Signature.SIGNATURE_BYTES);
-            _optionSignature.setData(buf);
+            optionSignature.setData(buf);
+            setOptionalSignature(optionSignature);
             cur += Signature.SIGNATURE_BYTES;
         }
     }
@@ -518,7 +513,12 @@ public class Packet {
         }
         boolean ok = ctx.dsa().verifySignature(_optionSignature, buffer, 0, size, from.getSigningPublicKey());
         if (!ok) {
-            ctx.logManager().getLog(Packet.class).error("Signature failed on " + toString(), new Exception("moo"));
+            Log l = ctx.logManager().getLog(Packet.class);
+            l.error("Signature failed on " + toString(), new Exception("moo"));
+            if (false) {
+                l.error(Base64.encode(buffer, 0, size));
+                l.error("Signature: " + Base64.encode(_optionSignature.getData()));
+            }
         }
         return ok;
     }
@@ -533,6 +533,12 @@ public class Packet {
         setFlag(FLAG_SIGNATURE_INCLUDED);
         int size = writePacket(buffer, offset, false);
         _optionSignature = ctx.dsa().sign(buffer, offset, size, key);
+        if (false) {
+            Log l = ctx.logManager().getLog(Packet.class);
+            l.error("Signing: " + toString());
+            l.error(Base64.encode(buffer, 0, size));
+            l.error("Signature: " + Base64.encode(_optionSignature.getData()));
+        }
         // jump into the signed data and inject the signature where we 
         // previously placed a bunch of zeroes
         int signatureOffset = offset 
@@ -566,7 +572,7 @@ public class Packet {
         else
             buf.append('\t');
         buf.append(toFlagString());
-        buf.append(" ACK ").append(_ackThrough);
+        buf.append(" ACK ").append(getAckThrough());
         if (_nacks != null) {
             buf.append(" NACK");
             for (int i = 0; i < _nacks.length; i++) {
@@ -578,11 +584,8 @@ public class Packet {
         return buf;
     }
     
-    private static final String toId(byte id[]) {
-        if (id == null)
-            return Base64.encode(STREAM_ID_UNKNOWN);
-        else
-            return Base64.encode(id);
+    static final String toId(long id) {
+        return Base64.encode(DataHelper.toLong(4, id));
     }
     
     private final String toFlagString() {

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

@@ -22,19 +22,26 @@ public class PacketHandler {
     private I2PAppContext _context;
     private Log _log;
     private int _lastDelay;
+    private int _dropped;
     
     public PacketHandler(I2PAppContext ctx, ConnectionManager mgr) {
         _manager = mgr;
         _context = ctx;
+        _dropped = 0;
         _log = ctx.logManager().getLog(PacketHandler.class);
         _lastDelay = _context.random().nextInt(30*1000);
     }
     
-    private boolean choke(Packet packet) {
-        if (false) {
-            // artificial choke: 2% random drop and a 0-30s
+    private boolean choke(Packet packet) { 
+        if (true) return true;
+        //if ( (_dropped == 0) && true ) { //&& (_manager.getSent() <= 0) ) {
+        //    _dropped++;
+        //    return false;
+        //}
+        if (true) {
+            // artificial choke: 2% random drop and a 0-5s
             // random tiered delay from 0-30s
-            if (_context.random().nextInt(100) >= 95) {
+            if (_context.random().nextInt(100) >= 98) {
                 displayPacket(packet, "DROP", null);
                 return false;
             } else {
@@ -42,7 +49,7 @@ public class PacketHandler {
                 /*
                 int delay = _context.random().nextInt(5*1000);
                 */
-                int delay = _context.random().nextInt(6*1000);
+                int delay = _context.random().nextInt(1*1000);
                 int delayFactor = _context.random().nextInt(100);
                 if (delayFactor > 80) {
                     if (delayFactor > 98)
@@ -90,14 +97,12 @@ public class PacketHandler {
         //if (_log.shouldLog(Log.DEBUG))
         //    _log.debug("packet received: " + packet);
         
-        byte sendId[] = packet.getSendStreamId();
-        if (!isNonZero(sendId))
-            sendId = null;
+        long sendId = packet.getSendStreamId();
         
-        Connection con = (sendId != null ? _manager.getConnectionByInboundId(sendId) : null); 
+        Connection con = (sendId > 0 ? _manager.getConnectionByInboundId(sendId) : null); 
         if (con != null) {
             receiveKnownCon(con, packet);
-            displayPacket(packet, "RECV", "wsize " + con.getOptions().getWindowSize());
+            displayPacket(packet, "RECV", "wsize " + con.getOptions().getWindowSize() + " rto " + con.getOptions().getRTO());
         } else {
             receiveUnknownCon(packet, sendId);
             displayPacket(packet, "UNKN", null);
@@ -119,6 +124,19 @@ public class PacketHandler {
     }
     
     private void receiveKnownCon(Connection con, Packet packet) {
+        if (packet.isFlagSet(Packet.FLAG_ECHO)) {
+            if (packet.getSendStreamId() > 0) {
+                receivePing(packet);
+            } else if (packet.getReceiveStreamId() > 0) {
+                receivePong(packet);
+            } else {
+                if (_log.shouldLog(Log.WARN))
+                    _log.warn("Echo packet received with no stream IDs: " + packet);
+            }
+            packet.releasePayload();
+            return;
+        } 
+        
         // 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
@@ -142,17 +160,17 @@ public class PacketHandler {
                         _log.warn("Received forged reset for " + con, ie);
                 }
             } else {
-                if ( (con.getSendStreamId() == null) || 
+                if ( (con.getSendStreamId() <= 0) || 
                      (DataHelper.eq(con.getSendStreamId(), packet.getReceiveStreamId())) ) {
-                    byte oldId[] =con.getSendStreamId();
+                    long oldId =con.getSendStreamId();
                     if (packet.isFlagSet(Packet.FLAG_SYNCHRONIZE)) // con fully established, w00t
                         con.setSendStreamId(packet.getReceiveStreamId());
                     
                     try {
                         con.getPacketHandler().receivePacket(packet, con);
                     } catch (I2PException ie) {
-                        if (_log.shouldLog(Log.WARN))
-                            _log.warn("Received forged packet for " + con + ": " + packet, ie);
+                        if (_log.shouldLog(Log.ERROR))
+                            _log.error("Received forged packet for " + con + "/" + oldId + ": " + packet, ie);
                         con.setSendStreamId(oldId);
                     }
                 } else if (packet.isFlagSet(Packet.FLAG_SYNCHRONIZE)) {
@@ -163,8 +181,19 @@ public class PacketHandler {
                 } else {
                     if (!con.getResetSent()) {
                         // someone is sending us a packet on the wrong stream 
-                        if (_log.shouldLog(Log.WARN))
-                            _log.warn("Received a packet on the wrong stream: " + packet + " connection: " + con);
+                        if (_log.shouldLog(Log.ERROR)) {
+                            Set cons = _manager.listConnections();
+                            StringBuffer buf = new StringBuffer(512);
+                            buf.append("Received a packet on the wrong stream: ");
+                            buf.append(packet);
+                            buf.append(" connection: ");
+                            buf.append(con);
+                            for (Iterator iter = cons.iterator(); iter.hasNext();) {
+                                Connection cur = (Connection)iter.next();
+                                buf.append(" ").append(cur);
+                            }
+                            _log.error(buf.toString(), new Exception("Wrong stream"));
+                        }
                     }
                     packet.releasePayload();
                 }
@@ -183,11 +212,11 @@ public class PacketHandler {
         _manager.getPacketQueue().enqueue(reply);
     }
     
-    private void receiveUnknownCon(Packet packet, byte sendId[]) {
+    private void receiveUnknownCon(Packet packet, long sendId) {
         if (packet.isFlagSet(Packet.FLAG_ECHO)) {
-            if (packet.getSendStreamId() != null) {
+            if (packet.getSendStreamId() > 0) {
                 receivePing(packet);
-            } else if (packet.getReceiveStreamId() != null) {
+            } else if (packet.getReceiveStreamId() > 0) {
                 receivePong(packet);
             } else {
                 if (_log.shouldLog(Log.WARN))
@@ -197,7 +226,7 @@ public class PacketHandler {
         } else {
             if (_log.shouldLog(Log.DEBUG))
                 _log.debug("Packet received on an unknown stream (and not an ECHO): " + packet);
-            if (sendId == null) {
+            if (sendId <= 0) {
                 Connection con = _manager.getConnectionByOutboundId(packet.getReceiveStreamId());
                 if (con != null) {
                     if (con.getAckedPackets() <= 0) {
@@ -226,7 +255,7 @@ public class PacketHandler {
                     }
                     _log.warn("Packet belongs to no other cons: " + packet + " connections: " 
                               + buf.toString() + " sendId: " 
-                              + (sendId != null ? Base64.encode(sendId) : " unknown"));
+                              + (sendId > 0 ? Packet.toId(sendId) : " unknown"));
                 }
                 packet.releasePayload();
             }
@@ -258,25 +287,7 @@ public class PacketHandler {
         _manager.receivePong(packet.getReceiveStreamId());
     }
     
-    private static final boolean isValidMatch(byte conStreamId[], byte packetStreamId[]) {
-        if ( (conStreamId == null) || (packetStreamId == null) || 
-             (conStreamId.length != packetStreamId.length) ) 
-            return false;
-        
-        boolean nonZeroFound = false;
-        for (int i = 0; i < conStreamId.length; i++) {
-            if (conStreamId[i] != packetStreamId[i]) return false;
-            if (conStreamId[i] != 0x0) nonZeroFound = true;
-        }
-        return nonZeroFound;
-    }
-    
-    private static final boolean isNonZero(byte[] b) {
-        boolean nonZeroFound = false;
-        for (int i = 0; b != null && i < b.length; i++) {
-            if (b[i] != 0x0)
-                nonZeroFound = true;
-        }
-        return nonZeroFound;
+    private static final boolean isValidMatch(long conStreamId, long packetStreamId) {
+        return ( (conStreamId == packetStreamId) && (conStreamId != 0) );
     }
 }

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

@@ -5,7 +5,6 @@ import java.util.Set;
 import net.i2p.I2PAppContext;
 import net.i2p.data.Destination;
 import net.i2p.data.SessionKey;
-import net.i2p.util.ByteCache;
 import net.i2p.util.Log;
 import net.i2p.util.SimpleTimer;
 
@@ -27,7 +26,6 @@ public class PacketLocal extends Packet implements MessageOutputStream.WriteStat
     private long _ackOn;
     private long _cancelledOn;
     private SimpleTimer.TimedEvent _resendEvent;
-    private ByteCache _cache = ByteCache.getInstance(128, MAX_PAYLOAD_SIZE);
     
     public PacketLocal(I2PAppContext ctx, Destination to) {
         this(ctx, to, null);
@@ -71,8 +69,11 @@ public class PacketLocal extends Packet implements MessageOutputStream.WriteStat
     public void prepare() {
         if (_connection != null)
             _connection.getInputStream().updateAcks(this);
-        if (_numSends > 0) // so we can debug to differentiate resends
+        if (_numSends > 0) {
+            // so we can debug to differentiate resends
             setOptionalDelay(_numSends * 1000);
+            setFlag(FLAG_DELAY_REQUESTED);
+        }
     }
     
     public long getCreatedOn() { return _createdOn; }

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

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

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

@@ -41,7 +41,7 @@ class SchedulerClosed extends SchedulerImpl {
                      (!con.getResetReceived()) &&
                      (timeSinceClose < Connection.DISCONNECT_TIMEOUT);
         boolean conTimeout = (con.getOptions().getConnectTimeout() < con.getLifetime()) && 
-                             con.getSendStreamId() == null &&
+                             con.getSendStreamId() <= 0 &&
                              con.getLifetime() < Connection.DISCONNECT_TIMEOUT;
         return (ok || conTimeout);
     }

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

@@ -36,7 +36,7 @@ class SchedulerDead extends SchedulerImpl {
         boolean nothingLeftToDo = (con.getDisconnectScheduledOn() > 0) && 
                                   (timeSinceClose >= Connection.DISCONNECT_TIMEOUT);
         boolean timedOut = (con.getOptions().getConnectTimeout() < con.getLifetime()) && 
-                           con.getSendStreamId() == null &&
+                           con.getSendStreamId() <= 0 &&
                            con.getLifetime() >= Connection.DISCONNECT_TIMEOUT;
         return nothingLeftToDo || timedOut;
     }

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

@@ -17,21 +17,6 @@ abstract class SchedulerImpl implements TaskScheduler {
     }
     
     protected void reschedule(long msToWait, Connection con) {
-        SimpleTimer.getInstance().addEvent(new ConEvent(con), msToWait);
-    }
-    
-    private class ConEvent implements SimpleTimer.TimedEvent {
-        private Connection _connection;
-        private Exception _addedBy;
-        public ConEvent(Connection con) { 
-            _connection = con; 
-            //_addedBy = new Exception("added by");
-        }
-        public void timeReached() {
-            //if (_log.shouldLog(Log.DEBUG))
-            //    _log.debug("firing event on " + _connection, _addedBy);
-            _connection.eventOccurred(); 
-        }
-        public String toString() { return "event on " + _connection; }
+        SimpleTimer.getInstance().addEvent(con.getConnectionEvent(), msToWait);
     }
 }

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

@@ -31,7 +31,7 @@ class SchedulerPreconnect extends SchedulerImpl {
     
     public boolean accept(Connection con) {
         return (con != null) && 
-               (con.getSendStreamId() == null) &&
+               (con.getSendStreamId() <= 0) &&
                (con.getLastSendId() < 0);
     }
     

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

@@ -19,7 +19,7 @@ class SchedulerReceived extends SchedulerImpl {
     public boolean accept(Connection con) {
         return (con != null) && 
                (con.getLastSendId() < 0) &&
-               (con.getSendStreamId() != null);
+               (con.getSendStreamId() > 0);
     }
     
     public void eventOccurred(Connection con) {

apps/susidns/readme.txt

@@ -0,0 +1,4 @@
+The src/ dir contains susidns 0.13 retrieved from http://susi.i2p/ on 2005/09/15
+The contents are released under GPL.  Please see http://susi.i2p/ for more info
+The paths in the src/build.xml were updated to reference jars in the i2p
+source tree.

apps/susidns/src/WEB-INF/web-template.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE web-app
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
+    "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">
+<web-app>
+  <display-name>susidns</display-name>
+    <!-- precompiled servlets -->
+    <session-config>
+        <session-timeout>
+            30
+        </session-timeout>
+    </session-config>
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+        <welcome-file>index.jsp</welcome-file>
+    </welcome-file-list>
+</web-app>

apps/susidns/src/build.xml

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="susidns" default="all" basedir=".">
+	<property name="jetty" value="../../jetty/" />
+	<property name="project" value="susidns" />
+	<property name="src" value="java/src" />
+	<property name="bin" value="./WEB-INF/classes" />
+	<property name="lib" value="${jetty}/jettylib" />
+	<property name="tmp" value="./tmp" />
+	<property name="jsp" value="./jsp" />
+	<path id="cp">
+		<pathelement path="${classpath}" />
+		<pathelement location="${bin}" />
+		<pathelement location="${lib}/javax.servlet.jar"/>
+		<pathelement location="${lib}/org.mortbay.jetty.jar"/>
+        <pathelement location="WEB-INF/lib/jstl.jar" />
+        <pathelement location="WEB-INF/lib/standard.jar" />
+        <pathelement location="${lib}/jasper-compiler.jar" />
+        <pathelement location="${lib}/jasper-runtime.jar" />
+        <pathelement location="${lib}/javax.servlet.jar" />
+        <pathelement location="${lib}/commons-logging.jar" />
+        <pathelement location="${lib}/commons-el.jar" />
+        <pathelement location="${lib}/ant.jar" />
+        <pathelement location="../../../core/java/build/i2p.jar" />
+ 	</path>
+ 	<target name="compile">
+		<mkdir dir="${bin}" />
+		<javac debug="true" deprecation="on" source="1.3" target="1.3"
+ 			classpathref="cp" destdir="${bin}" srcdir="${src}" includes="**/*.java" />
+	</target>
+    <target name="precompilejsp">
+        <delete file="WEB-INF/web-fragment.xml" />
+        <delete file="WEB-INF/web-out.xml" />
+    	<mkdir dir="${tmp}" />
+        <java classname="org.apache.jasper.JspC" fork="true" classpathref="cp">
+            <arg value="-d" />
+            <arg value="WEB-INF/classes" />
+            <arg value="-v" />
+            <arg value="-p" />
+            <arg value="i2p.susi.dns.jsp" />
+            <arg value="-webinc" />
+            <arg value="WEB-INF/web-fragment.xml" />
+            <arg value="-webapp" />
+            <arg value="./jsp" />
+        </java>
+        <javac debug="true" deprecation="on" source="1.3" target="1.3" 
+               destdir="${bin}" srcdir="./WEB-INF/classes" includes="**/*.java" classpathref="cp">
+         </javac>
+        <copy file="WEB-INF/web-template.xml" tofile="WEB-INF/web-out.xml" />
+        <loadfile property="jspc.web.fragment" srcfile="WEB-INF/web-fragment.xml" />
+        <replace file="WEB-INF//web-out.xml">
+            <replacefilter token="&lt;!-- precompiled servlets --&gt;" value="${jspc.web.fragment}" />
+        </replace>
+    </target>
+    <target name="all" depends="compile,precompilejsp,war"/> 
+    <target name="war"> 
+        <war destfile="${project}.war" webxml="WEB-INF/web-out.xml">
+        	<fileset dir=".">
+        		<include name="WEB-INF/**/*.class"/>
+        		<include name="WEB-INF/lib/*.jar"/>
+        		<include name="${src}/**/*.java"/>
+        		<include name="jsp/*.jsp"/>
+        		<include name="images/*.png"/>
+        		<include name="css.css"/>
+        		<include name="index.html"/>
+        		<include name="build.xml"/>
+        		<include name="WEB-INF/web-template.xml"/>
+        		<include name="WEB-INF/web-out.xml"/>
+        		<include name="WEB-INF/classes/${project}.properties"/>
+        	</fileset>
+        </war>
+    </target>
+    <target name="clean">
+      <delete file="susidns.war" />
+      <delete>
+        <fileset dir="." includes="**/*.class" />
+        <fileset dir="." includes="tmp" />
+      </delete>
+    </target>
+    <target name="distclean" depends="clean" />
+</project>

apps/susidns/src/css.css

@@ -0,0 +1,94 @@
+p {
+	font-family:Verdana,Tahoma,Arial,Helvetica;
+	color:black;
+	line-height:12pt;
+	margin-left:5mm;
+	margin-right:5mm;
+	font-size:10pt;
+}
+
+span.addrhlpr {
+	font-size:7pt;
+}
+	
+h3 {
+	font-family:Verdana,Tahoma,Arial,Helvetica;
+	color:black;
+	font-size:12pt;
+	letter-spacing:2pt;
+	line-height:18pt;
+	font-weight:bold;
+}
+
+body {
+	background-color: white;
+	color:black;
+}
+
+a {
+	color:#327BBF;
+	text-decoration:none;
+}
+
+a:hover {
+	text-decoration:underline;
+}
+
+th {
+	font-family:Verdana,Tahoma,Arial,Helvetica;
+	color:black;
+	line-height:12pt;
+	margin-left:5mm;
+	margin-right:5mm;
+	font-size:10pt;
+}
+
+td {
+	font-family:Verdana,Tahoma,Arial,Helvetica;
+	color:black;
+	line-height:12pt;
+	margin-left:5mm;
+	margin-right:5mm;
+	font-size:10pt;
+	vertical-align:center;
+}
+
+li {
+	font-family:Verdana,Tahoma,Arial,Helvetica;
+	color:black;
+	line-height:12pt;
+	margin-left:5mm;
+	margin-right:5mm;
+	font-size:10pt;
+}
+
+tr.list1 {
+	background-color:#E0E0E0;
+}
+
+tr.list0 {
+	background-color:white;
+}
+
+p.messages {
+	background-color:#92CAFF;
+	color:#327BBF;
+	color:black;
+	border-style:dotted;
+	padding-top: 5mm;
+	padding-right: 5mm;
+	padding-bottom: 5mm;
+	padding-left: 5mm;
+}
+
+#help {
+	border-style:dotted;
+	padding-top: 5mm;
+	padding-right: 5mm;
+	padding-bottom: 5mm;
+	padding-left: 5mm;
+}
+
+p.footer {
+	font-size:7pt;
+}

apps/susidns/src/index.html

@@ -0,0 +1,11 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="refresh" content="0;url=index.jsp" />
+<title>susidns</title>
+</head>
+<body>
+<a href="index.jsp">Enter</a>
+</body>
+</html>
+