* 2004-12-08 0.4.2.3 released

* Revised the buffering when reading from the SAM client and writing
      to the stream.  Also added a thread (sigh) so we don't block the
      SAM client from giving us more messages for abnormally long periods
      of time.
    * Display the router version in the logs on startup (oft requested)
    * Fix a race during the closing of a messageOutputStream

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

@@ -33,12 +33,12 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
     private static final Log _log = new Log(I2PTunnelClientBase.class);
     protected Logging l;
 
-    private static final long DEFAULT_CONNECT_TIMEOUT = 60 * 1000;
+    static final long DEFAULT_CONNECT_TIMEOUT = 60 * 1000;
 
     private static volatile long __clientId = 0;
     protected long _clientId;
     protected Object sockLock = new Object(); // Guards sockMgr and mySockets
-    private I2PSocketManager sockMgr;
+    protected I2PSocketManager sockMgr;
     protected List mySockets = new ArrayList();
 
     protected Destination dest = null;

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

@@ -147,15 +147,20 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
 
     private static final int DEFAULT_READ_TIMEOUT = 60*1000;
     
+    
     /** 
      * create the default options (using the default timeout, etc)
      *
      */
     protected I2PSocketOptions getDefaultOptions() {
-        I2PSocketOptions opts = super.getDefaultOptions();
         Properties defaultOpts = getTunnel().getClientOptions();
         if (!defaultOpts.contains(I2PSocketOptions.PROP_READ_TIMEOUT))
-            opts.setReadTimeout(DEFAULT_READ_TIMEOUT);
+            defaultOpts.setProperty(I2PSocketOptions.PROP_READ_TIMEOUT, ""+DEFAULT_READ_TIMEOUT);
+        if (!defaultOpts.contains("i2p.streaming.inactivityTimeout"))
+            defaultOpts.setProperty("i2p.streaming.inactivityTimeout", ""+DEFAULT_READ_TIMEOUT);
+        I2PSocketOptions opts = sockMgr.buildOptions(defaultOpts);
+        if (!defaultOpts.containsKey(I2PSocketOptions.PROP_CONNECT_TIMEOUT))
+            opts.setConnectTimeout(DEFAULT_CONNECT_TIMEOUT);
         return opts;
     }
     
@@ -164,14 +169,18 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
      *
      */
     protected I2PSocketOptions getDefaultOptions(Properties overrides) {
-        I2PSocketOptions opts = super.getDefaultOptions(overrides);
         Properties defaultOpts = getTunnel().getClientOptions();
         defaultOpts.putAll(overrides);
-        if (!defaultOpts.containsKey(I2PSocketOptions.PROP_READ_TIMEOUT))
-            opts.setConnectTimeout(DEFAULT_READ_TIMEOUT);
+        if (!defaultOpts.contains(I2PSocketOptions.PROP_READ_TIMEOUT))
+            defaultOpts.setProperty(I2PSocketOptions.PROP_READ_TIMEOUT, ""+DEFAULT_READ_TIMEOUT);
+        if (!defaultOpts.contains("i2p.streaming.inactivityTimeout"))
+            defaultOpts.setProperty("i2p.streaming.inactivityTimeout", ""+DEFAULT_READ_TIMEOUT);
+        I2PSocketOptions opts = sockMgr.buildOptions(defaultOpts);
+        if (!defaultOpts.containsKey(I2PSocketOptions.PROP_CONNECT_TIMEOUT))
+            opts.setConnectTimeout(DEFAULT_CONNECT_TIMEOUT);
         return opts;
     }
-    
+
     private static long __requestId = 0;
     protected void clientConnectionRun(Socket s) {
         OutputStream out = null;
@@ -348,7 +357,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
                 }
                 
                 if (line.length() == 0) {
-                    newRequest.append("User-Agent: MYOB/6.66 (AN/ON)");
+                    newRequest.append("User-Agent: MYOB/6.66 (AN/ON)\r\n");
                     newRequest.append("Connection: close\r\n\r\n");
                     break;
                 } else {

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

@@ -242,8 +242,8 @@ public class I2PTunnelRunner extends I2PThread implements I2PSocket.SocketErrorL
                               + ex.getMessage() + "\")");
             } catch (IOException ex) {
                 if (!finished) {
-                    if (_log.shouldLog(Log.ERROR))
-                        _log.error(direction + ": Error forwarding", ex);
+                    if (_log.shouldLog(Log.WARN))
+                        _log.warn(direction + ": Error forwarding", ex);
                 }
                 //else
                 //    _log.warn("You may ignore this", ex);

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

@@ -100,7 +100,8 @@ public class I2PSocketManagerFactory {
             //p.setProperty("tunnels.depthInbound", "0");
         }
 
-        opts.setProperty(I2PClient.PROP_TCP_HOST, i2cpHost);
+        if (i2cpHost != null)
+            opts.setProperty(I2PClient.PROP_TCP_HOST, i2cpHost);
         opts.setProperty(I2PClient.PROP_TCP_PORT, "" + i2cpPort);
         
         try {

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

@@ -0,0 +1,218 @@
+package net.i2p.client.streaming;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileInputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+
+import java.util.Map;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
+import net.i2p.I2PAppContext;
+import net.i2p.client.I2PClientFactory;
+import net.i2p.data.DataHelper;
+import net.i2p.data.Destination;
+import net.i2p.util.Log;
+import net.i2p.util.I2PThread;
+
+/**
+ * Sit around on a destination, receiving lots of data and sending lots of
+ * data to whomever talks to us.
+ *
+ * Usage: TestSwarm myKeyFile [peerDestFile ]*
+ *
+ */
+public class TestSwarm {
+    private I2PAppContext _context;
+    private Log _log;
+    private String _destFile;
+    private String _peerDestFiles[];
+    private String _conOptions;
+    private I2PSocketManager _manager;
+    private boolean _dead;
+    
+    public static void main(String args[]) {
+        if (args.length < 1) {
+            System.err.println("Usage: TestSwarm myDestFile [peerDestFile ]*");
+            return;
+        }
+        I2PAppContext ctx = new I2PAppContext();
+        String files[] = new String[args.length - 1];
+        System.arraycopy(args, 1, files, 0, files.length);
+        TestSwarm swarm = new TestSwarm(ctx, args[0], files);
+        swarm.startup();
+    }
+    
+    public TestSwarm(I2PAppContext ctx, String destFile, String peerDestFiles[]) {
+        _context = ctx;
+        _log = ctx.logManager().getLog(TestSwarm.class);
+        _dead = false;
+        _destFile = destFile;
+        _peerDestFiles = peerDestFiles;
+        _conOptions = "";
+    }
+    
+    public void startup() {
+        _log.debug("Starting up");
+        File keys = new File(_destFile);
+        if (!keys.exists()) {
+            try {
+                I2PClientFactory.createClient().createDestination(new FileOutputStream(keys));
+            } catch (Exception e) {
+                _log.error("Error creating a new destination on " + keys, e);
+                return;
+            }
+        }
+        try {
+            _manager = I2PSocketManagerFactory.createManager(new FileInputStream(_destFile), "localhost", 10001, null);
+        } catch (Exception e) {
+            _log.error("Error creatign the manager", e);
+            return;
+        }
+
+        I2PThread listener = new I2PThread(new Listener(), "Listener");
+        listener.start();
+        
+        connectWithPeers();
+    }
+    
+    
+    private void connectWithPeers() {
+        if (_peerDestFiles != null) {
+            for (int i = 0; i < _peerDestFiles.length; i++) {
+                try {
+                    FileInputStream fin = new FileInputStream(_peerDestFiles[i]);
+                    Destination dest = new Destination();
+                    dest.readBytes(fin);
+                    
+                    I2PThread flooder = new I2PThread(new Flooder(dest), "Flooder+" + dest.calculateHash().toBase64().substring(0,4));
+                    flooder.start();
+                } catch (Exception e) {
+                    _log.error("Unable to read the peer from " + _peerDestFiles[i], e);
+                }
+            }
+        }
+    }
+    
+    private class Listener implements Runnable {
+        public void run() {
+            try {
+                I2PServerSocket ss = _manager.getServerSocket();
+                I2PSocket s = null;
+                while ( (s = ss.accept()) != null) {
+                    I2PThread flooder = new I2PThread(new Flooder(s), "Flooder-" + s.getPeerDestination().calculateHash().toBase64().substring(0,4));
+                    flooder.start();
+                }
+            } catch (Exception e) {
+                _log.error("Error listening", e);
+            }
+        }
+    }
+    
+    private static volatile long __conId = 0;
+    private class Flooder implements Runnable {
+        private Destination _remoteDestination;
+        private I2PSocket _socket;
+        private boolean _closed;
+        private long _started;
+        private long _totalSent;
+        private long _totalReceived;
+        private long _lastReceived;
+        private long _lastReceivedOn;
+        private long _connectionId;
+        
+        public Flooder(Destination dest) {
+            _socket = null;
+            _remoteDestination = dest;
+            _connectionId = ++__conId;
+            _closed = false;
+            _lastReceived = -1;
+            _lastReceivedOn = _context.clock().now();
+            _context.statManager().createRateStat("swarm." + _connectionId + ".totalReceived", "Data size received", "swarm", new long[] { 30*1000, 60*1000, 5*60*1000 });
+            _context.statManager().createRateStat("swarm." + _connectionId + ".totalSent", "Data size sent", "swarm", new long[] { 30*1000, 60*1000, 5*60*1000 });
+            _context.statManager().createRateStat("swarm." + _connectionId + ".started", "When we start", "swarm", new long[] { 5*60*1000 });
+            _context.statManager().createRateStat("swarm." + _connectionId + ".lifetime", "How long we talk to a peer", "swarm", new long[] { 5*60*1000 });
+        }
+        
+        public Flooder(I2PSocket socket) {
+            _socket = socket;
+            _remoteDestination = socket.getPeerDestination();
+            _connectionId = ++__conId;
+            _closed = false;
+            _lastReceived = -1;
+            _lastReceivedOn = _context.clock().now();
+            _context.statManager().createRateStat("swarm." + _connectionId + ".totalReceived", "Data size received", "swarm", new long[] { 30*1000, 60*1000, 5*60*1000 });
+            _context.statManager().createRateStat("swarm." + _connectionId + ".totalSent", "Data size sent", "swarm", new long[] { 30*1000, 60*1000, 5*60*1000 });
+            _context.statManager().createRateStat("swarm." + _connectionId + ".started", "When we start", "swarm", new long[] { 5*60*1000 });
+            _context.statManager().createRateStat("swarm." + _connectionId + ".lifetime", "How long we talk to a peer", "swarm", new long[] { 5*60*1000 });
+        }
+        
+        public long getConnectionId() { return _connectionId; }
+        public Destination getDestination() { return _remoteDestination; }
+        
+        public void run() {
+            _started = _context.clock().now();
+            _context.statManager().addRateData("swarm." + _connectionId + ".started", 1, 0);
+            byte data[] = new byte[32*1024];
+            long value = 0;
+            long lastSend = _context.clock().now();
+            if (_socket == null) {
+                try {
+                    _socket = _manager.connect(_remoteDestination);
+                } catch (Exception e) {
+                    _log.error("Error connecting to " + _remoteDestination.calculateHash().toBase64().substring(0,4));
+                    return;
+                }
+            }
+            
+            I2PThread floodListener = new I2PThread(new FloodListener(), "FloodListener" + _connectionId);
+            floodListener.start();
+            
+            try {
+                OutputStream out = _socket.getOutputStream();
+                while (!_closed) {
+                    out.write(data);
+                    // out.flush();
+                    _totalSent += data.length;
+                    _context.statManager().addRateData("swarm." + _connectionId + ".totalSent", _totalSent, 0);
+                    //try { Thread.sleep(100); } catch (InterruptedException ie) {}
+                    long now = _context.clock().now();
+                    _log.debug("Sending " + _connectionId + " after " + (now-lastSend));
+                    lastSend = now;
+                    try { Thread.sleep(20); } catch (InterruptedException ie) {}
+                }
+            } catch (Exception e) {
+                _log.error("Error sending", e);
+            }
+        }
+        
+        private class FloodListener implements Runnable {
+            public void run() {
+                long lastRead = System.currentTimeMillis();
+                long now = lastRead;
+                try {
+                    InputStream in = _socket.getInputStream();
+                    byte buf[] = new byte[32*1024];
+                    int read = 0;
+                    while ( (read = in.read(buf)) != -1) {
+                        now = System.currentTimeMillis();
+                        _totalReceived += read;
+                        _context.statManager().addRateData("swarm." + getConnectionId() + ".totalReceived", _totalReceived, 0);
+                        _log.debug("Receiving " + _connectionId + " with " + read + " after " + (now-lastRead));
+                        lastRead = now;
+                    }
+                } catch (Exception e) {
+                    _log.error("Error listening to the flood", e);
+                }
+            }
+        }
+    }
+}

apps/routerconsole/jsp/config.jsp

@@ -66,9 +66,9 @@
  I2P will attempt to guess your IP address by having whomever it talks to tell it what 
  address they think you are.  If and only if you have no working TCP connections and you
  have not overridden the IP address, your router will believe them.  If that doesn't sound
- ok to you, thats fine - go to the <a href="/configadvanced.jsp">advanced config</a> page
+ ok to you, thats fine - go to the <a href="configadvanced.jsp">advanced config</a> page
  and add "i2np.tcp.hostname=yourHostname", then go to the 
- <a href="/configservice.jsp">service</a> page and do a graceful restart.  We used to make
+ <a href="configservice.jsp">service</a> page and do a graceful restart.  We used to make
  people enter a hostname/IP address on this page, but too many people got it wrong ;)</p>
  
  <p>The other advanced network option has to do with reseeding - you should never need to 

apps/routerconsole/jsp/help.jsp

@@ -33,7 +33,7 @@ by their binary code license.  This product includes software developed by the A
 (http://www.apache.org/). </p>
 
 <p>Another application you can see on this webpage is <a href="http://www.i2p.net/i2ptunnel">I2PTunnel</a>
-(your <a href="/i2ptunnel/" target="_blank">web interface</a>) - a GPL'ed application written by mihi that
+(your <a href="i2ptunnel/" target="_blank">web interface</a>) - a GPL'ed application written by mihi that
 lets you tunnel normal TCP/IP traffic over I2P (such as the eepproxy and the irc proxy).</p>
 
 <p>The router by default also includes human's public domain <a href="http://www.i2p.net/sam">SAM</a> bridge,

apps/routerconsole/jsp/summary.jsp

@@ -23,7 +23,7 @@
      if (helper.getActivePeers() <= 0) {
         %><b><a href="config.jsp">check your NAT/firewall</a></b><br /><%
      }
-    if (helper.getActiveProfiles() <= 4) { // 4 is the min fallback
+    if (helper.getActiveProfiles() <= 10) { // 10 is the min fallback
         if ("true".equals(System.getProperty("net.i2p.router.web.ReseedHandler.reseedInProgress", "false"))) {
             out.print(" <i>reseeding</i>");
         } else {

apps/sam/c/README

@@ -1 +1 @@
-See the `docs' directory for documentation and license.
+See the `docs' directory for the documentation and license.

apps/sam/c/doc/donate.txt

@@ -1,7 +0,0 @@
-If you would like to make a donation to the author of this library, you can use
-the following methods:
-
-	* E-Gold account number 1043280
-	* Paypal email mpc@innographx.com
-
-If you want to use some other method, just ask.

apps/sam/c/doc/install.txt

@@ -0,0 +1,32 @@
+=====================
+How to Install LibSAM
+=====================
+
+1) Be sure you have GNU Make installed.
+
+2) Find the Makefile for your operating system in the LibSAM root.  For example,
+if you are on FreeBSD, you'd use Makefile.freebsd.
+
+3) Run gmake with the -f option to build LibSAM.  For example, on FreeBSD, you'd
+run "gmake -f Makefile.freebsd".  On Linux, GNU Make is just called 'make', so
+you'd run "make -f Makefile.linux".
+
+4) If that worked, you can now try to compile some of the example programs.
+They are compiled in the same way as LibSAM, but the Makefile names are
+different.
+
+I2P-Ping should compile on any Unix system using the default Makefile.  It won't
+work on Win32, however, because Win32 doesn't have the getopt() function.
+
+The Warhammer example should run on any OS.  Use the Makefile.posix for Unix
+sytems or the Makefile.mingw for Win32.
+
+*** If you have trouble ***
+
+If you have trouble compiling LibSAM, try to edit the Makefiles to fix the
+problem.  The "Makefile.common" is shared by all systems, and you shouldn't have
+to touch it.  Just copy the Makefile of the OS most similar to your own and
+start hacking on it.  Send me a patch if you get it working.
+
+I realise this build system is horrible, and in the future I will probably
+replace it entirely.

apps/sam/c/doc/todo.txt

@@ -1,10 +1,10 @@
 I need to do these things:
 
-* SAM raw support
+* SAM raw support (partially complete)
 * Write an instruction manual
 * Make dest a dynamic string
 * Change SAM parser to use a hashmap
-* Switch to GNU Autoconf (?)
+* Improve build system
 
 Anyone can help with these things:
 

apps/sam/c/doc/whatsnew.txt

@@ -1,6 +1,8 @@
 /* vi:set ts=4: */
 
 v1.30
+	* Added session to sam_namingback()
+	* Removed stdint.h dependency
 	* Improved WIRETAP to do more logging
 	* Added "pinger.sh" shell script example for using i2p-ping
 	* Added SAM_BAD_STYLE error

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

@@ -60,7 +60,8 @@ static void databack(sam_sess_t *session, sam_sid_t stream_id, void *data,
 	size_t size);
 static void diedback(sam_sess_t *session);
 static void logback(char *s);
-static void namingback(char *name, sam_pubkey_t pubkey, samerr_t result);
+static void namingback(sam_sess_t *session, char *name, sam_pubkey_t pubkey,
+	samerr_t result);
 static void statusback(sam_sess_t *session, sam_sid_t stream_id,
 	samerr_t result);
 
@@ -78,7 +79,7 @@ int main(int argc, char *argv[])
 	int count = INT_MAX;  /* number of times to ping */
 	int pongcount = -1;
 	char *samhost = "localhost";
-	uint16_t samport = 7656;
+	unsigned short samport = 7656;
 
 	while ((ch = getopt(argc, argv, "ac:h:mp:qv")) != -1) {
 		switch (ch) {
@@ -103,7 +104,7 @@ int main(int argc, char *argv[])
 				quiet = true;
 				break;
 			case 'v':  /* version */
-				puts("$Id: i2p-ping.c,v 1.4 2004/09/22 20:05:40 jrandom Exp $");
+				puts("$Id: i2p-ping.c,v 1.6 2004/12/02 17:54:23 mpc Exp $");
 				puts("Copyright (c) 2004, Matthew P. Cashdollar <mpc@innographx.com>");
 				break;
 			case '?':
@@ -140,7 +141,7 @@ int main(int argc, char *argv[])
 
 	pongcount = 0;
 	for (int j = 0; j < argc; j++) {
-		if (strlen(argv[j]) == 516) {
+		if (strlen(argv[j]) == SAM_PUBKEY_LEN - 1) {
 			memcpy(dest, argv[j], SAM_PUBKEY_LEN);
 			gotdest = true;
 		} else
@@ -242,7 +243,8 @@ static void logback(char *s)
  * This is really hackish, but we know that we are only doing one lookup, so
  * what the hell
  */
-static void namingback(char *name, sam_pubkey_t pubkey, samerr_t result)
+static void namingback(sam_sess_t *session, char *name, sam_pubkey_t pubkey,
+	samerr_t result)
 {
 	if (result != SAM_OK) {
 		fprintf(stderr, "Naming lookup failed: %s\n", sam_strerror(result));

apps/sam/c/examples/warhammer/warhammer-dgram.c

@@ -47,7 +47,8 @@ static void dgramback(sam_sess_t *session, sam_pubkey_t dest, void *data,
 	size_t size);
 static void diedback(sam_sess_t *session);
 static void logback(char *s);
-static void namingback(char *name, sam_pubkey_t pubkey, samerr_t result);
+static void namingback(sam_sess_t *session, char *name, sam_pubkey_t pubkey,
+	samerr_t result);
 
 /*
  * Just some ugly global variables.  Don't do this in your program.
@@ -88,12 +89,12 @@ int main(int argc, char *argv[])
 	}
 
 	/*
-	 * Check whether they've supplied a name or a base 64 destination
+	 * Check whether they've supplied a hostname or a base 64 destination
 	 *
 	 * Note that this is a hack.  Jrandom says that once certificates are added,
 	 * the length could be different depending on the certificate's size.
 	 */
-	if (strlen(argv[1]) == 516) {
+	if (strlen(argv[1]) == SAM_PUBKEY_LEN - 1) {
 		memcpy(dest, argv[1], SAM_PUBKEY_LEN);
 		gotdest = true;
 	} else {
@@ -155,7 +156,6 @@ static void dgramback(sam_sess_t *session, sam_pubkey_t dest, void *data,
 static void diedback(sam_sess_t *session)
 {
 	fprintf(stderr, "Lost SAM connection!\n");
-	/* high quality code would do a sam_session_free() here */
 	exit(1);
 }
 
@@ -172,11 +172,11 @@ static void logback(char *s)
  * This is really hackish, but we know that we are only doing one lookup, so
  * what the hell
  */
-static void namingback(char *name, sam_pubkey_t pubkey, samerr_t result)
+static void namingback(sam_sess_t *session, char *name, sam_pubkey_t pubkey,
+	samerr_t result)
 {
 	if (result != SAM_OK) {
 		fprintf(stderr, "Naming lookup failed: %s\n", sam_strerror(result));
-		/* high quality code would do a sam_session_free() here */
 		exit(1);
 	}
 	memcpy(dest, pubkey, SAM_PUBKEY_LEN);

apps/sam/c/inc/platform.h

@@ -28,36 +28,19 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef PLATFORM_H
-#define PLATFORM_H
+#ifndef LIBSAM_PLATFORM_H
+#define LIBSAM_PLATFORM_H
 
 /*
  * Operating system
  */
 #define FREEBSD	0  // FreeBSD
-#define MINGW	1  // Windows native (Mingw)
+#define CYGWIN	1  // Cygwin
 #define LINUX	2  // Linux
-#define CYGWIN	3  // Cygwin
-
-#if OS == MINGW
-	#define INET_ADDRSTRLEN 16
-	#define NO_GETHOSTBYNAME2
-	#define NO_INET_ATON  /* implies NO_INET_PTON */
-	#define NO_INET_NTOP
-	#define NO_SSIZE_T
-	#define NO_STRL
-	#define NO_Z_FORMAT
-	#define WINSOCK
-#endif
-
-#if OS == LINUX
-	#define NO_GETHOSTBYNAME2
-	#define NO_STRL
-	#define NO_Z_FORMAT
-#endif
+#define MINGW	3  // Windows native (Mingw)
+#define MSVC	4  // Windows native (Visual C++ 2003)
 
 #if OS == CYGWIN
-	#define FAST32_IS_LONG
 	#define INET_ADDRSTRLEN 16
 	#define NO_GETHOSTBYNAME2
 	#define NO_INET_NTOP
@@ -68,13 +51,29 @@
 	#define NO_Z_FORMAT
 #endif
 
-/*
- * Standard C99 includes - if your compiler doesn't have these, it's time to
- * upgrade
- */
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
+#if OS == LINUX
+	#define NO_GETHOSTBYNAME2
+	#define NO_STRL
+	#define NO_Z_FORMAT
+#endif
+
+#if OS == MINGW
+	#define INET_ADDRSTRLEN 16
+	#define NO_GETHOSTBYNAME2
+	#define NO_INET_ATON  // implies NO_INET_PTON
+	#define NO_INET_NTOP
+	#define NO_SSIZE_T
+	#define NO_STRL
+	#define NO_Z_FORMAT
+	#define WINSOCK
+#endif
+
+#if OS == MSVC  // FIXME: doesn't work
+	#define NO_STDBOOL_H
+	#define NO_SSIZE_T
+	#define NO_STRL
+	#define WINSOCK
+#endif
 
 /*
  * System includes
@@ -116,6 +115,13 @@
 	typedef signed long ssize_t;
 #endif
 
+/*
+ * I'm too lazy to type "unsigned"
+ */
+typedef unsigned char byte;
+typedef unsigned int uint;
+typedef unsigned short ushort;
+
 /*
  * Prints out the file name, line number, and function name before log message
  */
@@ -136,4 +142,4 @@
 	#include <ctype.h>
 #endif
 
-#endif  /* PLATFORM_H */
+#endif  /* LIBSAM_PLATFORM_H */

apps/sam/c/inc/sam.h

@@ -28,15 +28,20 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SAM_H
-#define SAM_H
+#ifndef LIBSAM_SAM_H
+#define LIBSAM_SAM_H
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
+#ifdef NO_STDBOOL_H
+	typedef int bool;
+	#define true 0
+	#define false 1
+#else
+	#include <stdbool.h>
+#endif
+#include <stddef.h>  // size_t
 
 
 /*
@@ -67,18 +72,6 @@ extern "C" {
  * Some LibSAM variable types
  */
 
-typedef signed char schar_t;
-typedef unsigned char uchar_t;
-typedef unsigned int uint_t;
-typedef unsigned long ulong_t;
-typedef unsigned short ushort_t;
-
-#ifdef WINSOCK
-	typedef SOCKET socket_t;
-#else
-	typedef int socket_t;
-#endif
-
 typedef enum {SAM_STREAM, SAM_DGRAM, SAM_RAW} sam_conn_t;  /* SAM connection */
 
 typedef char sam_pubkey_t[SAM_PUBKEY_LEN];  /* base 64 public key */
@@ -88,10 +81,10 @@ typedef struct {
 	size_t size;
 } sam_sendq_t;  /* sending queue to encourage large stream packet sizes */
 
-typedef int_fast32_t sam_sid_t;  /* stream id number */
+typedef long sam_sid_t;  /* stream id number */
 
 typedef struct {
-	socket_t sock;  /* the socket used for communications with SAM */
+	int sock;  /* the socket used for communications with SAM */
 	bool connected;  /* whether the socket is connected */
 	sam_sid_t prev_id;  /* the last stream id number we used */
 } sam_sess_t;  /* a SAM session */
@@ -119,8 +112,8 @@ void		sam_session_free(sam_sess_t **session);
 /* SAM controls - connection */
 bool		sam_close(sam_sess_t *session);
 samerr_t	sam_connect(sam_sess_t *session, const char *samhost,
-				uint16_t samport, const char *destname, sam_conn_t style,
-				uint_t tunneldepth);
+				unsigned short samport, const char *destname, sam_conn_t style,
+				unsigned int tunneldepth);
 /* SAM controls - utilities */
 void		sam_naming_lookup(sam_sess_t *session, const char *name);
 bool		sam_read_buffer(sam_sess_t *session);
@@ -128,7 +121,8 @@ 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)(char *name, sam_pubkey_t pubkey, samerr_t result);
+void		(*sam_namingback)(sam_sess_t *session, char *name,
+				sam_pubkey_t pubkey, samerr_t result);
 
 /* Stream commands */
 void		sam_stream_close(sam_sess_t *session, sam_sid_t stream_id);
@@ -168,4 +162,4 @@ void		(*sam_rawback)(sam_sess_t *session, void *data, size_t size);
 #ifdef __cplusplus
 }
 #endif
-#endif  /* SAM_H */
+#endif  /* LIBSAM_SAM_H */

apps/sam/c/inc/snprintf.h

@@ -33,8 +33,8 @@
  * snprintf.c)
  */
 
-#ifndef SNPRINTF_H
-#define SNPRINTF_H
+#ifndef LIBSAM_SNPRINTF_H
+#define LIBSAM_SNPRINTF_H
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -46,4 +46,4 @@ int vsnprintf (char *str, size_t count, const char *fmt, va_list arg);
 #ifdef __cplusplus
 }
 #endif
-#endif  /* SNPRINTF_H */
+#endif  /* LIBSAM_SNPRINTF_H */

apps/sam/c/inc/strl.h

@@ -32,8 +32,8 @@
  * Note: The strl.c file retains its original license (at the top of strl.c)
  */
 
-#ifndef STRL_H
-#define STRL_H
+#ifndef LIBSAM_STRL_H
+#define LIBSAM_STRL_H
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -44,4 +44,4 @@ extern size_t strlcpy(char *dst, const char *src, size_t siz);
 #ifdef __cplusplus
 }
 #endif
-#endif  /* STRL_H */
+#endif  /* LIBSAM_STRL_H */

apps/sam/c/src/sam.c

@@ -28,8 +28,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "platform.h"
 #include "sam.h"
+#include "platform.h"
 
 static bool			sam_hello(sam_sess_t *session);
 static void			sam_log(const char *format, ...);
@@ -40,9 +40,9 @@ static bool			sam_readable(sam_sess_t *session);
 static sam_sendq_t	*sam_sendq_create();
 static samerr_t		sam_session_create(sam_sess_t *session,
 						const char *destname, sam_conn_t style,
-						uint_t tunneldepth);
+						uint tunneldepth);
 static bool			sam_socket_connect(sam_sess_t *session, const char *host,
-						uint16_t port);
+						ushort port);
 static bool			sam_socket_resolve(const char *hostname, char *ipaddr);
 #ifdef WINSOCK
 static samerr_t		sam_winsock_cleanup();
@@ -79,7 +79,8 @@ void (*sam_diedback)(sam_sess_t *session) = NULL;
 void (*sam_logback)(char *str) = NULL;
 
 /* naming lookup reply - `pubkey' will be NULL if `result' isn't SAM_OK */
-void (*sam_namingback)(char *name, sam_pubkey_t pubkey, samerr_t result) = NULL;
+void (*sam_namingback)(sam_sess_t *session, char *name, sam_pubkey_t pubkey,
+	samerr_t result) = NULL;
 
 /* our connection to a peer has completed */
 void (*sam_statusback)(sam_sess_t *session, sam_sid_t stream_id,
@@ -146,8 +147,8 @@ bool sam_close(sam_sess_t *session)
  *
  * Returns: SAM error code.  If SAM_OK, `session' will be ready for use.
  */
-samerr_t sam_connect(sam_sess_t *session, const char *samhost, uint16_t samport,
-	const char *destname, sam_conn_t style, uint_t tunneldepth)
+samerr_t sam_connect(sam_sess_t *session, const char *samhost, ushort samport,
+	const char *destname, sam_conn_t style, uint tunneldepth)
 {
 	assert(session != NULL);
 	samerr_t rc;
@@ -386,7 +387,7 @@ static void sam_parse(sam_sess_t *session, char *s)
 			q++;
 			strlcpy(name, p, sizeof name);
 			strlcpy(pubkey, q, sizeof pubkey);
-			sam_namingback(name, pubkey, SAM_OK);
+			sam_namingback(session, name, pubkey, SAM_OK);
 
 		} else if (strncmp(s, SAM_NAMING_REPLY_IK,
 				strlen(SAM_NAMING_REPLY_IK)) == 0) {
@@ -394,7 +395,7 @@ static void sam_parse(sam_sess_t *session, char *s)
 			if (q != NULL)
 				*q = '\0';
 			strlcpy(name, p, sizeof name);
-			sam_namingback(name, NULL, SAM_INVALID_KEY);
+			sam_namingback(session, name, NULL, SAM_INVALID_KEY);
 
 		} else if (strncmp(s, SAM_NAMING_REPLY_KNF,
 				strlen(SAM_NAMING_REPLY_KNF)) == 0) {
@@ -402,14 +403,14 @@ static void sam_parse(sam_sess_t *session, char *s)
 			if (q != NULL)
 				*q = '\0';
 			strlcpy(name, p, sizeof name);
-			sam_namingback(name, NULL, SAM_KEY_NOT_FOUND);
+			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(name, NULL, SAM_UNKNOWN);
+			sam_namingback(session, name, NULL, SAM_UNKNOWN);
 		}
 
 		return;
@@ -723,10 +724,10 @@ static ssize_t sam_read2(sam_sess_t *session, void *buf, size_t n)
 	p = buf;
 	printf("*RR* ");
 	for (size_t x = 0; x < n; x++) {
-		if (isprint(((uchar_t*)p)[x]))
-			printf("%c,", ((uchar_t*)p)[x]);
+		if (isprint(((byte*)p)[x]))
+			printf("%c,", ((byte*)p)[x]);
 		else
-			printf("%03d,", ((uint8_t*)p)[x]);
+			printf("%03d,", ((byte*)p)[x]);
 	}
 	printf("\n");
 	printf("*RR* (read2() read %d bytes)\n", n);
@@ -877,7 +878,7 @@ void sam_sendq_flush(sam_sess_t *session, sam_sid_t stream_id,
  * Returns: SAM error code
  */
 static samerr_t sam_session_create(sam_sess_t *session, const char *destname,
-	sam_conn_t style, uint_t tunneldepth)
+	sam_conn_t style, uint tunneldepth)
 {
 	assert(session != NULL);
 #define SAM_SESSTATUS_REPLY_OK "SESSION STATUS RESULT=OK"
@@ -963,7 +964,7 @@ void sam_session_free(sam_sess_t **session)
  *
  * Returns: true on sucess, false on error, with errno set
  */
-bool sam_socket_connect(sam_sess_t *session, const char *host, uint16_t port)
+bool sam_socket_connect(sam_sess_t *session, const char *host, ushort port)
 {
 	assert(session != NULL);
 	struct sockaddr_in hostaddr;
@@ -1080,11 +1081,7 @@ void sam_stream_close(sam_sess_t *session, sam_sid_t stream_id)
 	assert(session != NULL);
 	char cmd[SAM_CMD_LEN];
 
-#ifdef FAST32_IS_LONG
 	snprintf(cmd, sizeof cmd, "STREAM CLOSE ID=%ld\n", stream_id);
-#else
-	snprintf(cmd, sizeof cmd, "STREAM CLOSE ID=%d\n", stream_id);
-#endif
 	sam_write(session, cmd, strlen(cmd));
 
 	return;
@@ -1103,13 +1100,8 @@ sam_sid_t sam_stream_connect(sam_sess_t *session, const sam_pubkey_t dest)
 	char cmd[SAM_PKCMD_LEN];
 
 	session->prev_id++;  /* increment the id for the connection */
-#ifdef FAST32_IS_LONG
 	snprintf(cmd, sizeof cmd, "STREAM CONNECT ID=%ld DESTINATION=%s\n",
 		session->prev_id, dest);
-#else
-	snprintf(cmd, sizeof cmd, "STREAM CONNECT ID=%d DESTINATION=%s\n",
-		session->prev_id, dest);
-#endif
 	sam_write(session, cmd, strlen(cmd));
 
 	return session->prev_id;
@@ -1141,15 +1133,9 @@ samerr_t sam_stream_send(sam_sess_t *session, sam_sid_t stream_id,
 		return SAM_TOO_BIG;
 	}
 #ifdef NO_Z_FORMAT
-	#ifdef FAST32_IS_LONG
-		snprintf(cmd, sizeof cmd, "STREAM SEND ID=%ld SIZE=%u\n",
-			stream_id, size);
-	#else
-		snprintf(cmd, sizeof cmd, "STREAM SEND ID=%d SIZE=%u\n",
-			stream_id, size);
-	#endif
+	snprintf(cmd, sizeof cmd, "STREAM SEND ID=%ld SIZE=%u\n", stream_id, size);
 #else
-	snprintf(cmd, sizeof cmd, "STREAM SEND ID=%d SIZE=%zu\n",
+	snprintf(cmd, sizeof cmd, "STREAM SEND ID=%ld SIZE=%zu\n",
 		stream_id, size);
 #endif
 	sam_write(session, cmd, strlen(cmd));
@@ -1399,7 +1385,7 @@ static ssize_t sam_write(sam_sess_t *session, const void *buf, size_t n)
 		return -1;
 	}
 #if SAM_WIRETAP
-	const uchar_t *cp = buf;
+	const byte *cp = buf;
 	printf("*WW* ");
 	for (size_t x = 0; x < n; x++) {
 		if (isprint(cp[x]))

apps/sam/java/build.xml

@@ -10,7 +10,7 @@
         <mkdir dir="./build" />
         <mkdir dir="./build/obj" />
         <javac 
-            srcdir="./src" 
+            srcdir="./src:./test" 
             debug="true" deprecation="on" source="1.3" target="1.3" 
             destdir="./build/obj" 
             classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" />

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

@@ -220,6 +220,15 @@ public class SAMBridge implements Runnable {
         }
         SAMBridge bridge = new SAMBridge(host, port, opts, keyfile);
         I2PThread t = new I2PThread(bridge, "SAMListener");
+        if (Boolean.valueOf(System.getProperty("sam.shutdownOnOOM", "false")).booleanValue()) {
+            t.addOOMEventListener(new I2PThread.OOMEventListener() {
+                public void outOfMemory(OutOfMemoryError err) {
+                    err.printStackTrace();
+                    System.err.println("OOMed, die die die");
+                    System.exit(-1);
+                }
+            });
+        }
         t.start();
     }
 

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

@@ -119,6 +119,8 @@ public abstract class SAMHandler implements Runnable {
      * @return True is the string was successfully written, false otherwise
      */
     protected final boolean writeString(String str) {
+        if (_log.shouldLog(Log.DEBUG))
+            _log.debug("Sending the client: [" + str + "]");
         try {
             writeBytes(str.getBytes("ISO-8859-1"));
         } catch (IOException e) {

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

@@ -17,6 +17,7 @@ import java.net.Socket;
 import java.util.Properties;
 import java.util.StringTokenizer;
 
+import net.i2p.data.DataHelper;
 import net.i2p.util.Log;
 
 /**
@@ -36,14 +37,11 @@ public class SAMHandlerFactory {
      * @return A SAM protocol handler, or null if the client closed before the handshake
      */
     public static SAMHandler createSAMHandler(Socket s, Properties i2cpProps) throws SAMException {
-        BufferedReader br;
         String line;
         StringTokenizer tok;
 
         try {
-            br = new BufferedReader(new InputStreamReader(s.getInputStream(),
-                                                          "ISO-8859-1"));
-            line = br.readLine();
+            line = DataHelper.readLine(s.getInputStream());
             if (line == null) {
                 _log.debug("Connection closed by client");
                 return null;

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

@@ -15,8 +15,10 @@ import java.io.InterruptedIOException;
 import java.io.OutputStream;
 import java.net.ConnectException;
 import java.net.NoRouteToHostException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Properties;
 import java.util.Set;
 
@@ -28,8 +30,11 @@ import net.i2p.client.streaming.I2PSocketManager;
 import net.i2p.client.streaming.I2PSocketManagerFactory;
 import net.i2p.client.streaming.I2PSocketOptions;
 import net.i2p.data.Base64;
+import net.i2p.data.ByteArray;
+import net.i2p.data.DataHelper;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
+import net.i2p.util.ByteCache;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
 
@@ -51,7 +56,10 @@ public class SAMStreamSession {
     private I2PSocketManager socketMgr = null;
 
     private Object handlersMapLock = new Object();
+    /** stream id (Long) to SAMStreamSessionSocketReader */
     private HashMap handlersMap = new HashMap();
+    /** stream id (Long) to StreamSender */
+    private HashMap sendersMap = new HashMap();
 
     private Object idLock = new Object();
     private int lastNegativeId = 0;
@@ -59,6 +67,14 @@ public class SAMStreamSession {
     // Can we create outgoing connections?
     private boolean canCreate = false;
 
+    /** 
+     * should we flush every time we get a STREAM SEND, or leave that up to
+     * the streaming lib to decide? 
+     */
+    private boolean forceFlush = false;
+    public static String PROP_FORCE_FLUSH = "sam.forceFlush";
+    public static String DEFAULT_FORCE_FLUSH = "false";
+    
     /**
      * Create a new SAM STREAM session.
      *
@@ -107,9 +123,6 @@ public class SAMStreamSession {
         } catch (NumberFormatException nfe) {
             throw new SAMException("Invalid I2CP port specified [" + port + "]");
         }
-        // streams MUST be mode=guaranteed (though i think the socket manager 
-        // enforces this anyway...
-        allprops.setProperty(I2PClient.PROP_RELIABILITY, I2PClient.PROP_RELIABILITY_GUARANTEED);
 
         _log.debug("Creating I2PSocketManager...");
         socketMgr = I2PSocketManagerFactory.createManager(destStream,
@@ -120,6 +133,8 @@ public class SAMStreamSession {
             throw new SAMException("Error creating I2PSocketManager");
         }
 
+        forceFlush = Boolean.valueOf(allprops.getProperty(PROP_FORCE_FLUSH, DEFAULT_FORCE_FLUSH)).booleanValue();
+        
         boolean canReceive = false;
         if (dir.equals("BOTH")) {
             canCreate = true;
@@ -197,18 +212,25 @@ public class SAMStreamSession {
      *
      * @param data Bytes to be sent
      *
-     * @return True if the data was sent, false otherwise
+     * @return True if the data was queued for sending, false otherwise
      */
-    public boolean sendBytes(int id, byte[] data) {
-        Destination d = new Destination();
-        SAMStreamSessionSocketHandler handler = getSocketHandler(id);
+    public boolean sendBytes(int id, InputStream in, int size) throws IOException { 
+        StreamSender sender = getSender(id);
         
-        if (handler == null) {
-            _log.error("Trying to send bytes through inexistent handler " +id);
+        if (sender == null) {
+            if (_log.shouldLog(Log.WARN))
+                _log.warn("Trying to send bytes through nonexistent handler " +id);
+            // even though it failed, we need to read those bytes! 
+            for (int i = 0; i < size; i++) {
+                int c = in.read();
+                if (c == -1)
+                    break;
+            }
             return false;
         }
 
-        return handler.sendBytes(data);
+        sender.sendBytes(in, size);
+        return true;
     }
 
     /**
@@ -248,13 +270,15 @@ public class SAMStreamSession {
      * @return An id associated to the socket handler
      */
     private int createSocketHandler(I2PSocket s, int id) {
-        SAMStreamSessionSocketHandler handler;
+        SAMStreamSessionSocketReader reader = null;
+        StreamSender sender = null;
         if (id == 0) {
             id = createUniqueId();
         }
 
         try {
-            handler = new SAMStreamSessionSocketHandler(s, id);
+            reader = new SAMStreamSessionSocketReader(s, id);
+            sender = new StreamSender(s, id);
         } catch (IOException e) {
             _log.error("IOException when creating SAM STREAM session socket handler", e);
             recv.stopStreamReceiving();
@@ -262,10 +286,13 @@ public class SAMStreamSession {
         }
 
         synchronized (handlersMapLock) {
-            handlersMap.put(new Integer(id), handler);
+            handlersMap.put(new Integer(id), reader);
+            sendersMap.put(new Integer(id), sender);
         }
 
-        I2PThread t = new I2PThread(handler, "SAMStreamSessionSocketHandler");
+        I2PThread t = new I2PThread(reader, "SAMReader" + id);
+        t.start();
+        t = new I2PThread(sender, "SAMSender" + id);
         t.start();
 
         return id;
@@ -283,9 +310,14 @@ public class SAMStreamSession {
      *
      * @param id Handler id
      */
-    private SAMStreamSessionSocketHandler getSocketHandler(int id) {
+    private SAMStreamSessionSocketReader getSocketReader(int id) {
         synchronized (handlersMapLock) {
-            return (SAMStreamSessionSocketHandler)handlersMap.get(new Integer(id));
+            return (SAMStreamSessionSocketReader)handlersMap.get(new Integer(id));
+        }
+    }
+    private StreamSender getSender(int id) {
+        synchronized (handlersMapLock) {
+            return (StreamSender)sendersMap.get(new Integer(id));
         }
     }
 
@@ -306,19 +338,19 @@ public class SAMStreamSession {
      * @param id Handler id to be removed
      */
     private void removeSocketHandler(int id) {
-        SAMStreamSessionSocketHandler removed;
+        SAMStreamSessionSocketReader reader = null;
+        StreamSender sender = null;
 
         synchronized (handlersMapLock) {
-            removed = (SAMStreamSessionSocketHandler)handlersMap.remove(new Integer(id));
+            reader = (SAMStreamSessionSocketReader)handlersMap.remove(new Integer(id));
+            sender = (StreamSender)sendersMap.remove(new Integer(id));
         }
 
-        if (removed == null) {
-            _log.error("BUG! Trying to remove inexistent SAM STREAM session socket handler " + id);
-            recv.stopStreamReceiving();
-        } else {
-            removed.stopRunning();
-            _log.debug("Removed SAM STREAM session socket handler " + id);
-        }
+        if (reader != null)
+            reader.stopRunning();
+        if (sender != null)
+            sender.stopRunning();
+        _log.debug("Removed SAM STREAM session socket handler " + id);
     }
 
     /**
@@ -337,9 +369,11 @@ public class SAMStreamSession {
             
             while (iter.hasNext()) {
                  id = (Integer)iter.next();
-                 ((SAMStreamSessionSocketHandler)handlersMap.get(id)).stopRunning();
+                 ((SAMStreamSessionSocketReader)handlersMap.get(id)).stopRunning();
+                 ((StreamSender)sendersMap.get(id)).stopRunning();
             }
             handlersMap.clear();
+            sendersMap.clear();
         }
     }
 
@@ -419,6 +453,8 @@ public class SAMStreamSession {
             } catch (I2PException e) {
                 _log.debug("Caught I2PException", e);
             }
+            
+            close();
 
             _log.debug("Shutting down SAM STREAM session server");
         }
@@ -431,10 +467,9 @@ public class SAMStreamSession {
      *
      * @author human
      */
-    public class SAMStreamSessionSocketHandler implements Runnable {
+    public class SAMStreamSessionSocketReader implements Runnable {
         
         private I2PSocket i2pSocket = null;
-        private OutputStream i2pSocketOS = null;
 
         private Object runningLock = new Object();
         private boolean stillRunning = true;
@@ -442,44 +477,20 @@ public class SAMStreamSession {
         private int id;
                 
         /**
-         * Create a new SAM STREAM session socket handler
+         * Create a new SAM STREAM session socket reader
          *
          * @param s Socket to be handled
          * @param id Unique id assigned to the handler
          */
-        public SAMStreamSessionSocketHandler(I2PSocket s, int id) throws IOException {
+        public SAMStreamSessionSocketReader(I2PSocket s, int id) throws IOException {
             _log.debug("Instantiating new SAM STREAM session socket handler");
 
             i2pSocket = s;
-            i2pSocketOS = s.getOutputStream();
             this.id = id;
         }
 
         /**
-         * Send bytes through the SAM STREAM session socket handler
-         *
-         * @param data Data to be sent
-         *
-         * @return True if data has been sent without errors, false otherwise
-         */
-        public boolean sendBytes(byte[] data) {
-            if (_log.shouldLog(Log.DEBUG)) {
-                _log.debug("Handler " + id + ": sending " + data.length
-                           + " bytes");
-            }
-            try {
-                i2pSocketOS.write(data);
-                //i2pSocketOS.flush();
-            } catch (IOException e) {
-                _log.error("Error sending data through I2P socket", e);
-                return false;
-            }
-
-            return true;
-        }
-
-        /**
-         * Stop a SAM STREAM session socket handler
+         * Stop a SAM STREAM session socket reader
          *
          */
         public void stopRunning() {
@@ -538,4 +549,99 @@ public class SAMStreamSession {
             _log.debug("Shutting down SAM STREAM session socket handler " +id);
         }
     }
+    
+    
+    /**
+     * Lets us push data through the stream without blocking, (even after exceeding
+     * the I2PSocket's buffer)
+     */
+    private class StreamSender implements Runnable {
+        private List _data;
+        private int _id;
+        private ByteCache _cache;
+        private OutputStream _out = null;
+        private boolean _stillRunning;
+        
+        public StreamSender(I2PSocket s, int id) throws IOException {
+            _data = new ArrayList(1);
+            _id = id;
+            _cache = ByteCache.getInstance(4, 32*1024);
+            _out = s.getOutputStream();
+            _stillRunning = true;
+        }
+
+        /**
+         * Send bytes through the SAM STREAM session socket sender
+         *
+         * @param data Data to be sent
+         *
+         * @throws IOException if the client didnt provide enough data
+         */
+        public void sendBytes(InputStream in, int size) throws IOException {
+            if (_log.shouldLog(Log.DEBUG))
+                _log.debug("Handler " + _id + ": sending " + size + " bytes");
+            
+            ByteArray ba = _cache.acquire();
+            int read = DataHelper.read(in, ba.getData(), 0, size);
+            if (read != size) 
+                throw new IOException("Insufficient data from the SAM client (" + read + "/" + size + ")");
+
+            ba.setValid(read);
+            synchronized (_data) {
+                _data.add(ba);
+                _data.notifyAll();
+            }
+        }
+
+        /**
+         * Stop a SAM STREAM session socket sender
+         *
+         */
+        public void stopRunning() {
+            _log.debug("stopRunning() invoked on socket sender " + _id);
+            _stillRunning = false;
+            synchronized (_data) {
+                _data.clear();
+                _data.notifyAll();
+            }
+        }
+
+        public void run() {
+            ByteArray data = null;
+            while (_stillRunning) {
+                data = null;
+                try {
+                    synchronized (_data) {
+                        if (_data.size() > 0)
+                            data = (ByteArray)_data.remove(0);
+                        else
+                            _data.wait(5000);
+                    }
+
+                    if (data != null) {
+                        try {
+                            _out.write(data.getData(), 0, data.getValid());
+                            if (forceFlush) {
+                                // i dont like doing this, but it clears the buffer issues
+                                _out.flush();
+                            }
+                        } catch (IOException ioe) {
+                            // ok, the stream failed, but the SAM client didn't
+                            if (_log.shouldLog(Log.WARN))
+                                _log.warn("Stream failed", ioe);
+
+                            removeSocketHandler(_id);
+                            stopRunning();
+
+                        } finally {
+                            _cache.release(data);
+                        }
+                    }
+                } catch (InterruptedException ie) {}
+            }
+            synchronized (_data) {
+                _data.clear();
+            }
+        }
+    }
 }

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

@@ -26,6 +26,7 @@ import net.i2p.I2PException;
 import net.i2p.client.I2PSessionException;
 import net.i2p.data.Base64;
 import net.i2p.data.DataFormatException;
+import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
 import net.i2p.util.Log;
 
@@ -44,6 +45,9 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
     private SAMDatagramSession datagramSession = null;
     private SAMStreamSession streamSession = null;
 
+    private long _id;
+    private static volatile long __id = 0;
+    
     /**
      * Create a new SAM version 1 handler.  This constructor expects
      * that the SAM HELLO message has been still answered (and
@@ -68,6 +72,7 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
      */
     public SAMv1Handler(Socket s, int verMajor, int verMinor, Properties i2cpProps) throws SAMException, IOException {
         super(s, verMajor, verMinor, i2cpProps);
+        _id = ++__id;
         _log.debug("SAM version 1 handler instantiated");
 
         if ((this.verMajor != 1) || (this.verMinor != 0)) {
@@ -76,13 +81,14 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
     }
 
     public void handle() {
-        String msg, domain, opcode;
+        String msg = null;
+        String domain = null;
+        String opcode = null;
         boolean canContinue = false;
-        ByteArrayOutputStream buf = new ByteArrayOutputStream(IN_BUFSIZE);
         StringTokenizer tok;
         Properties props;
 
-        this.thread.setName("SAMv1Handler");
+        this.thread.setName("SAMv1Handler " + _id);
         _log.debug("SAM handling started");
 
         try {
@@ -95,22 +101,15 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
                     break;
                 }
 
-                while ((b = in.read()) != -1) {
-                    if (b == '\n') {
-                        break;
-                    }
-                    buf.write(b);
-                }
-                if (b == -1) {
+                msg = DataHelper.readLine(in);
+                if (msg == null) {
                     _log.debug("Connection closed by client");
                     break;
                 }
 
-                msg = buf.toString("ISO-8859-1").trim();
                 if (_log.shouldLog(Log.DEBUG)) {
                     _log.debug("New message received: [" + msg + "]");
                 }
-                buf.reset();
 
                 tok = new StringTokenizer(msg, " ");
                 if (tok.countTokens() < 2) {
@@ -150,14 +149,11 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
                     break;
                 }
             }
-        } catch (UnsupportedEncodingException e) {
-            _log.error("Caught UnsupportedEncodingException ("
-                       + e.getMessage() + ")", e);
         } catch (IOException e) {
             _log.debug("Caught IOException ("
-                       + e.getMessage() + ")", e);
+                       + e.getMessage() + ") for message [" + msg + "]", e);
         } catch (Exception e) {
-            _log.error("Unexpected exception", e);
+            _log.error("Unexpected exception for message [" + msg + "]", e);
         } finally {
             _log.debug("Stopping handler");
             try {
@@ -550,13 +546,8 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
         }
 
         try {
-            DataInputStream in = new DataInputStream(getClientSocketInputStream());
-            byte[] data = new byte[size];
-
-            in.readFully(data);
-
-            if (!streamSession.sendBytes(id, data)) {
-                _log.error("STREAM SEND failed");
+            if (!streamSession.sendBytes(id, getClientSocketInputStream(), size)) { // data)) {
+                _log.error("STREAM SEND [" + size + "] failed");
                 boolean rv = writeString("STREAM CLOSED RESULT=CANT_REACH_PEER ID=" + id + " MESSAGE=\"Send of " + size + " bytes failed\"\n");
                 streamSession.closeConnection(id);
                 return rv;
@@ -564,11 +555,11 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
 
             return true;
         } catch (EOFException e) {
-            _log.debug("Too few bytes with RAW SEND message (expected: "
+            _log.debug("Too few bytes with STREAM SEND message (expected: "
                        + size);
             return false;
         } catch (IOException e) {
-            _log.debug("Caught IOException while parsing RAW SEND message",
+            _log.debug("Caught IOException while parsing STREAM SEND message",
                        e);
             return false;
         }
@@ -801,7 +792,7 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
     }
 
     public void stopStreamReceiving() {
-        _log.debug("stopStreamReceiving() invoked");
+        _log.debug("stopStreamReceiving() invoked", new Exception("stopped"));
 
         if (streamSession == null) {
             _log.error("BUG! Got stream receiving stop, but session is null!");

apps/sam/java/src/net/i2p/sam/client/SAMClientEventListenerImpl.java

@@ -0,0 +1,18 @@
+package net.i2p.sam.client;
+
+import java.util.Properties;
+
+/**
+ * Basic noop client event listener
+ */
+public class SAMClientEventListenerImpl implements SAMReader.SAMClientEventListener {
+    public void destReplyReceived(String publicKey, String privateKey) {}
+    public void helloReplyReceived(boolean ok) {}
+    public void namingReplyReceived(String name, String result, String value, String message) {}
+    public void sessionStatusReceived(String result, String destination, String message) {}
+    public void streamClosedReceived(String result, int id, String message) {}
+    public void streamConnectedReceived(String remoteDestination, int id) {}
+    public void streamDataReceived(int id, byte[] data, int offset, int length) {}
+    public void streamStatusReceived(String result, int id, String message) {}
+    public void unknownMessageReceived(String major, String minor, Properties params) {}
+}

apps/sam/java/src/net/i2p/sam/client/SAMEventHandler.java

@@ -0,0 +1,127 @@
+package net.i2p.sam.client;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import net.i2p.I2PAppContext;
+import net.i2p.util.Log;
+
+/**
+ * Simple helper implementation of a the SAMClientEventListener
+ *
+ */
+public class SAMEventHandler extends SAMClientEventListenerImpl {
+    private I2PAppContext _context;
+    private Log _log;
+    private Boolean _helloOk;
+    private Object _helloLock = new Object();
+    private Boolean _sessionCreateOk;
+    private Object _sessionCreateLock = new Object();
+    private Object _namingReplyLock = new Object();
+    private Map _namingReplies = new HashMap();
+
+    public SAMEventHandler(I2PAppContext ctx) {
+        _context = ctx;
+        _log = ctx.logManager().getLog(getClass());
+    }
+    
+    public void helloReplyReceived(boolean ok) {
+        synchronized (_helloLock) {
+            if (ok)
+                _helloOk = Boolean.TRUE;
+            else
+                _helloOk = Boolean.FALSE;
+            _helloLock.notifyAll();
+        }
+    }
+
+    public void sessionStatusReceived(String result, String destination, String msg) {
+        synchronized (_sessionCreateLock) {
+            if (SAMReader.SAMClientEventListener.SESSION_STATUS_OK.equals(result))
+                _sessionCreateOk = Boolean.TRUE;
+            else 
+                _sessionCreateOk = Boolean.FALSE;
+            _sessionCreateLock.notifyAll();
+        }
+    }
+
+    public void namingReplyReceived(String name, String result, String value, String msg) {
+        synchronized (_namingReplyLock) {
+            if (SAMReader.SAMClientEventListener.NAMING_REPLY_OK.equals(result)) 
+                _namingReplies.put(name, value);
+            else
+                _namingReplies.put(name, result);
+            _namingReplyLock.notifyAll();
+        }
+    }
+
+    public void unknownMessageReceived(String major, String minor, Properties params) {
+        _log.error("wrt, [" + major + "] [" + minor + "] [" + params + "]");
+    }
+
+    
+    //
+    // blocking lookup calls below
+    //
+
+    /**
+     * Wait for the connection to be established, returning true if everything 
+     * went ok
+     */
+    public boolean waitForHelloReply() {
+        while (true) {
+            try {
+                synchronized (_helloLock) {
+                    if (_helloOk == null)
+                        _helloLock.wait();
+                    else 
+                        return _helloOk.booleanValue();
+                }
+            } catch (InterruptedException ie) {}
+        }
+    }
+
+    /**
+     * Wait for the session to be created, returning true if everything went ok
+     *
+     */
+    public boolean waitForSessionCreateReply() {
+        while (true) {
+            try {
+                synchronized (_sessionCreateLock) {
+                    if (_sessionCreateOk == null)
+                        _sessionCreateLock.wait();
+                    else
+                        return _sessionCreateOk.booleanValue();
+                }
+            } catch (InterruptedException ie) {}
+        }
+    }
+    
+    /**
+     * Return the destination found matching the name, or null if the key was
+     * not able to be retrieved.
+     *
+     * @param name name to be looked for, or "ME"
+     */
+    public String waitForNamingReply(String name) {
+        while (true) {
+            try {
+                synchronized (_namingReplyLock) {
+                    String val = (String)_namingReplies.remove(name);
+                    if (val == null) {
+                        _namingReplyLock.wait();
+                    } else {
+                        if (SAMReader.SAMClientEventListener.NAMING_REPLY_INVALID_KEY.equals(val))
+                            return null;
+                        else if (SAMReader.SAMClientEventListener.NAMING_REPLY_KEY_NOT_FOUND.equals(val))
+                            return null;
+                        else
+                            return val;
+                    }
+                }
+            } catch (InterruptedException ie) {}
+        }
+    }
+}

apps/sam/java/src/net/i2p/sam/client/SAMReader.java

@@ -0,0 +1,253 @@
+package net.i2p.sam.client;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.IOException;
+
+import java.util.Properties;
+import java.util.StringTokenizer;
+
+import net.i2p.I2PAppContext;
+import net.i2p.data.DataHelper;
+import net.i2p.util.Log;
+import net.i2p.util.I2PThread;
+
+/**
+ * Read from a socket, producing events for any SAM message read
+ *
+ */
+public class SAMReader {
+    private Log _log;
+    private InputStream _inRaw;
+    private SAMClientEventListener _listener;
+    private boolean _live;
+    
+    public SAMReader(I2PAppContext context, InputStream samIn, SAMClientEventListener listener) {
+        _log = context.logManager().getLog(SAMReader.class);
+        _inRaw = samIn;
+        _listener = listener;
+    }
+    
+    public void startReading() {
+        _live = true;
+        I2PThread t = new I2PThread(new Runner(), "SAM reader");
+        t.start();
+    }
+    public void stopReading() { _live = false; }
+    
+    /**
+     * Async event notification interface for SAM clients
+     *
+     */
+    public interface SAMClientEventListener {
+        public static final String SESSION_STATUS_OK = "OK";
+        public static final String SESSION_STATUS_DUPLICATE_DEST = "DUPLICATE_DEST";
+        public static final String SESSION_STATUS_I2P_ERROR = "I2P_ERROR";
+        public static final String SESSION_STATUS_INVALID_KEY = "INVALID_KEY";
+        
+        public static final String STREAM_STATUS_OK = "OK";
+        public static final String STREAM_STATUS_CANT_REACH_PEER = "CANT_REACH_PEER";
+        public static final String STREAM_STATUS_I2P_ERROR = "I2P_ERROR";
+        public static final String STREAM_STATUS_INVALID_KEY = "INVALID_KEY";
+        public static final String STREAM_STATUS_TIMEOUT = "TIMEOUT";
+        
+        public static final String STREAM_CLOSED_OK = "OK";
+        public static final String STREAM_CLOSED_CANT_REACH_PEER = "CANT_REACH_PEER";
+        public static final String STREAM_CLOSED_I2P_ERROR = "I2P_ERROR";
+        public static final String STREAM_CLOSED_PEER_NOT_FOUND = "PEER_NOT_FOUND";
+        public static final String STREAM_CLOSED_TIMEOUT = "CLOSED";
+        
+        public static final String NAMING_REPLY_OK = "OK";
+        public static final String NAMING_REPLY_INVALID_KEY = "INVALID_KEY";
+        public static final String NAMING_REPLY_KEY_NOT_FOUND = "KEY_NOT_FOUND";
+        
+        public void helloReplyReceived(boolean ok);
+        public void sessionStatusReceived(String result, String destination, String message);
+        public void streamStatusReceived(String result, int id, String message);
+        public void streamConnectedReceived(String remoteDestination, int id);
+        public void streamClosedReceived(String result, int id, String message);
+        public void streamDataReceived(int id, byte data[], int offset, int length);
+        public void namingReplyReceived(String name, String result, String value, String message);
+        public void destReplyReceived(String publicKey, String privateKey);
+        
+        public void unknownMessageReceived(String major, String minor, Properties params);
+    }
+    
+    private class Runner implements Runnable {
+        public void run() {
+            Properties params = new Properties();
+            ByteArrayOutputStream baos = new ByteArrayOutputStream(80);
+            while (_live) {
+                
+                try {
+                    int c = -1;
+                    while ((c = _inRaw.read()) != -1) {
+                        if (c == '\n') {
+                            break;
+                        }
+                        baos.write(c);
+                    }
+                    if (c == -1) {
+                        _log.error("Error reading from the SAM bridge");
+                        return;
+                    }
+                } catch (IOException ioe) {
+                    _log.error("Error reading from SAM", ioe);
+                }
+                
+                String line = new String(baos.toByteArray());
+                baos.reset();
+                
+                if (line == null) {
+                    _log.info("No more data from the SAM bridge");
+                    break;
+                }
+                
+                _log.debug("Line read from the bridge: " + line);
+                
+                StringTokenizer tok = new StringTokenizer(line);
+                
+                if (tok.countTokens() < 2) {
+                    _log.error("Invalid SAM line: [" + line + "]");
+                    _live = false;
+                    return;
+                }
+                
+                String major = tok.nextToken();
+                String minor = tok.nextToken();
+                
+                params.clear();
+                while (tok.hasMoreTokens()) {
+                    String pair = tok.nextToken();
+                    int eq = pair.indexOf('=');
+                    if ( (eq > 0) && (eq < pair.length() - 1) ) {
+                        String name = pair.substring(0, eq);
+                        String val = pair.substring(eq+1);
+                        while ( (val.charAt(0) == '\"') && (val.length() > 0) )
+                            val = val.substring(1);
+                        while ( (val.length() > 0) && (val.charAt(val.length()-1) == '\"') )
+                            val = val.substring(0, val.length()-1);
+                        params.setProperty(name, val);
+                    }
+                }
+                
+                processEvent(major, minor, params);
+            }
+        }
+    }
+    
+    /**
+     * Big ugly method parsing everything.  If I cared, I'd factor this out into
+     * a dozen tiny methods.
+     *
+     */
+    private void processEvent(String major, String minor, Properties params) {
+        if ("HELLO".equals(major)) {
+            if ("REPLY".equals(minor)) {
+                String result = params.getProperty("RESULT");
+                if ("OK".equals(result))
+                    _listener.helloReplyReceived(true);
+                else
+                    _listener.helloReplyReceived(false);
+            } else {
+                _listener.unknownMessageReceived(major, minor, params);
+            }
+        } else if ("SESSION".equals(major)) {
+            if ("STATUS".equals(minor)) {
+                String result = params.getProperty("RESULT");
+                String dest = params.getProperty("DESTINATION");
+                String msg = params.getProperty("MESSAGE");
+                _listener.sessionStatusReceived(result, dest, msg);
+            } else {
+                _listener.unknownMessageReceived(major, minor, params);
+            }
+        } else if ("STREAM".equals(major)) {
+            if ("STATUS".equals(minor)) {
+                String result = params.getProperty("RESULT");
+                String id = params.getProperty("ID");
+                String msg = params.getProperty("MESSAGE");
+                if (id != null) {
+                    try {
+                        _listener.streamStatusReceived(result, Integer.parseInt(id), msg);
+                    } catch (NumberFormatException nfe) {
+                        _listener.unknownMessageReceived(major, minor, params);
+                    }
+                } else {
+                    _listener.unknownMessageReceived(major, minor, params);
+                }
+            } else if ("CONNECTED".equals(minor)) {
+                String dest = params.getProperty("DESTINATION");
+                String id = params.getProperty("ID");
+                if (id != null) {
+                    try {
+                        _listener.streamConnectedReceived(dest, Integer.parseInt(id));
+                    } catch (NumberFormatException nfe) {
+                        _listener.unknownMessageReceived(major, minor, params);
+                    }
+                } else {
+                    _listener.unknownMessageReceived(major, minor, params);
+                }
+            } else if ("CLOSED".equals(minor)) {
+                String result = params.getProperty("RESULT");
+                String id = params.getProperty("ID");
+                String msg = params.getProperty("MESSAGE");
+                if (id != null) {
+                    try {
+                        _listener.streamClosedReceived(result, Integer.parseInt(id), msg);
+                    } catch (NumberFormatException nfe) {
+                        _listener.unknownMessageReceived(major, minor, params);
+                    }
+                } else {
+                    _listener.unknownMessageReceived(major, minor, params);
+                }
+            } else if ("RECEIVED".equals(minor)) {
+                String id = params.getProperty("ID");
+                String size = params.getProperty("SIZE");
+                if (id != null) {
+                    try {
+                        int idVal = Integer.parseInt(id);
+                        int sizeVal = Integer.parseInt(size);
+                        
+                        byte data[] = new byte[sizeVal];
+                        int read = DataHelper.read(_inRaw, data);
+                        if (read != sizeVal) {
+                            _listener.unknownMessageReceived(major, minor, params);
+                        } else {
+                            _listener.streamDataReceived(idVal, data, 0, sizeVal);
+                        }
+                    } catch (NumberFormatException nfe) {
+                        _listener.unknownMessageReceived(major, minor, params);
+                    } catch (IOException ioe) {
+                        _live = false;
+                        _listener.unknownMessageReceived(major, minor, params);
+                    }
+                } else {
+                    _listener.unknownMessageReceived(major, minor, params);
+                }
+            } else {
+                _listener.unknownMessageReceived(major, minor, params);
+            }
+        } else if ("NAMING".equals(major)) {
+            if ("REPLY".equals(minor)) {
+                String name = params.getProperty("NAME");
+                String result = params.getProperty("RESULT");
+                String value = params.getProperty("VALUE");
+                String msg = params.getProperty("MESSAGE");
+                _listener.namingReplyReceived(name, result, value, msg);
+            } else {
+                _listener.unknownMessageReceived(major, minor, params);
+            }
+        } else if ("DEST".equals(major)) {
+            if ("REPLY".equals(minor)) {
+                String pub = params.getProperty("PUB");
+                String priv = params.getProperty("PRIV");
+                _listener.destReplyReceived(pub, priv);
+            } else {
+                _listener.unknownMessageReceived(major, minor, params);
+            }
+        } else {
+            _listener.unknownMessageReceived(major, minor, params);
+        }
+    }
+}

apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java

@@ -0,0 +1,262 @@
+package net.i2p.sam.client;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.FileOutputStream;
+import java.io.FileInputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+
+import java.util.Map;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
+import net.i2p.I2PAppContext;
+import net.i2p.data.DataHelper;
+import net.i2p.util.Log;
+import net.i2p.util.I2PThread;
+
+import net.i2p.sam.client.SAMEventHandler;
+import net.i2p.sam.client.SAMClientEventListenerImpl;
+import net.i2p.sam.client.SAMReader;
+
+/**
+ * Send a file to a peer
+ *
+ * Usage: SAMStreamSend samHost samPort peerDestFile dataFile
+ *
+ */
+public class SAMStreamSend {
+    private I2PAppContext _context;
+    private Log _log;
+    private String _samHost;
+    private String _samPort;
+    private String _destFile;
+    private String _dataFile;
+    private String _conOptions;
+    private Socket _samSocket;
+    private OutputStream _samOut;
+    private InputStream _samIn;
+    private SAMReader _reader;
+    private boolean _dead;
+    private SAMEventHandler _eventHandler;
+    /** Connection id (Integer) to peer (Flooder) */
+    private Map _remotePeers;
+    
+    public static void main(String args[]) {
+        if (args.length < 4) {
+            System.err.println("Usage: SAMStreamSend samHost samPort peerDestFile dataFile");
+            return;
+        }
+        I2PAppContext ctx = new I2PAppContext();
+        String files[] = new String[args.length - 3];
+        SAMStreamSend sender = new SAMStreamSend(ctx, args[0], args[1], args[2], args[3]);
+        sender.startup();
+    }
+    
+    public SAMStreamSend(I2PAppContext ctx, String samHost, String samPort, String destFile, String dataFile) {
+        _context = ctx;
+        _log = ctx.logManager().getLog(SAMStreamSend.class);
+        _dead = false;
+        _samHost = samHost;
+        _samPort = samPort;
+        _destFile = destFile;
+        _dataFile = dataFile;;
+        _conOptions = "";
+        _eventHandler = new SendEventHandler(_context);
+        _remotePeers = new HashMap();
+    }
+    
+    public void startup() {
+        _log.debug("Starting up");
+        boolean ok = connect();
+        _log.debug("Connected: " + ok);
+        if (ok) {
+            _reader = new SAMReader(_context, _samIn, _eventHandler);
+            _reader.startReading();
+            _log.debug("Reader created");
+            String ourDest = handshake();
+            _log.debug("Handshake complete.  we are " + ourDest);
+            if (ourDest != null) {
+                send();
+            }
+        }
+    }
+    
+    private class SendEventHandler extends SAMEventHandler {
+        public SendEventHandler(I2PAppContext ctx) { super(ctx); }
+        public void streamClosedReceived(String result, int id, String message) {
+            Sender sender = null;
+            synchronized (_remotePeers) {
+                sender = (Sender)_remotePeers.remove(new Integer(id));
+            }
+            if (sender != null) {
+                sender.closed();
+                _log.debug("Connection " + sender.getConnectionId() + " closed to " + sender.getDestination());
+            } else {
+                _log.error("wtf, not connected to " + id + " but we were just closed?");
+            }
+        }
+    }
+    
+    private boolean connect() {
+        try {
+            _samSocket = new Socket(_samHost, Integer.parseInt(_samPort));
+            _samOut = _samSocket.getOutputStream();
+            _samIn = _samSocket.getInputStream();
+            return true;
+        } catch (Exception e) {
+            _log.error("Unable to connect to SAM at " + _samHost + ":" + _samPort, e);
+            return false;
+        }
+    }
+    
+    private String handshake() {
+        synchronized (_samOut) {
+            try {
+                _samOut.write("HELLO VERSION MIN=1.0 MAX=1.0\n".getBytes());
+                _samOut.flush();
+                _log.debug("Hello sent");
+                boolean ok = _eventHandler.waitForHelloReply();
+                _log.debug("Hello reply found: " + ok);
+                if (!ok) 
+                    throw new IOException("wtf, hello failed?");
+                String req = "SESSION CREATE STYLE=STREAM DESTINATION=TRANSIENT " + _conOptions + "\n";
+                _samOut.write(req.getBytes());
+                _samOut.flush();
+                _log.debug("Session create sent");
+                ok = _eventHandler.waitForSessionCreateReply();
+                _log.debug("Session create reply found: " + ok);
+
+                req = "NAMING LOOKUP NAME=ME\n";
+                _samOut.write(req.getBytes());
+                _samOut.flush();
+                _log.debug("Naming lookup sent");
+                String destination = _eventHandler.waitForNamingReply("ME");
+                _log.debug("Naming lookup reply found: " + destination);
+                if (destination == null) {
+                    _log.error("No naming lookup reply found!");
+                    return null;
+                } else {
+                    _log.info("We are " + destination);
+                }
+                return destination;
+            } catch (Exception e) {
+                _log.error("Error handshaking", e);
+                return null;
+            }
+        }
+    }
+    
+    private void send() {
+        Sender sender = new Sender();
+        boolean ok = sender.openConnection();
+        if (ok) {
+            I2PThread t = new I2PThread(sender, "Sender");
+            t.start();
+        }
+    }
+    
+    private class Sender implements Runnable {
+        private int _connectionId; 
+        private String _remoteDestination;
+        private InputStream _in;
+        private boolean _closed;
+        private long _started;
+        private long _totalSent;
+        
+        public Sender() {
+            _closed = false;
+        }
+        
+        public boolean openConnection() {
+            try {
+                FileInputStream fin = new FileInputStream(_destFile);
+                byte dest[] = new byte[1024];
+                int read = DataHelper.read(fin, dest);
+
+                _remoteDestination = new String(dest, 0, read);
+                synchronized (_remotePeers) {
+                    _connectionId = _remotePeers.size() + 1;
+                    _remotePeers.put(new Integer(_connectionId), Sender.this);
+                }
+
+                _context.statManager().createRateStat("send." + _connectionId + ".totalSent", "Data size sent", "swarm", new long[] { 30*1000, 60*1000, 5*60*1000 });
+                _context.statManager().createRateStat("send." + _connectionId + ".started", "When we start", "swarm", new long[] { 5*60*1000 });
+                _context.statManager().createRateStat("send." + _connectionId + ".lifetime", "How long we talk to a peer", "swarm", new long[] { 5*60*1000 });
+                
+                byte msg[] = ("STREAM CONNECT ID=" + _connectionId + " DESTINATION=" + _remoteDestination + "\n").getBytes();
+                synchronized (_samOut) {
+                    _samOut.write(msg);
+                    _samOut.flush();
+                }
+
+                _in = new FileInputStream(_dataFile);
+                return true;
+            } catch (IOException ioe) {
+                _log.error("Unable to connect", ioe);
+                return false;
+            }
+        }
+        
+        public int getConnectionId() { return _connectionId; }
+        public String getDestination() { return _remoteDestination; }
+        
+        public void closed() {
+            if (_closed) return;
+            _closed = true;
+            long lifetime = _context.clock().now() - _started;
+            _context.statManager().addRateData("send." + _connectionId + ".lifetime", lifetime, lifetime);
+            try { _in.close(); } catch (IOException ioe) {}
+        }
+        
+        public void run() {
+            _started = _context.clock().now();
+            _context.statManager().addRateData("send." + _connectionId + ".started", 1, 0);
+            byte data[] = new byte[1024];
+            long value = 0;
+            long lastSend = _context.clock().now();
+            while (!_closed) {
+                try {
+                    int read = _in.read(data);
+                    long now = _context.clock().now();
+                    if (read == -1) {
+                        _log.debug("EOF from the data for " + _connectionId + " after " + (now-lastSend));
+                        break;
+                    } else if (read > 0) {
+                        _log.debug("Sending " + read + " on " + _connectionId + " after " + (now-lastSend));
+                        lastSend = now;
+                        
+                        byte msg[] = ("STREAM SEND ID=" + _connectionId + " SIZE=" + read + "\n").getBytes();
+                        synchronized (_samOut) {
+                            _samOut.write(msg);
+                            _samOut.write(data, 0, read);
+                            _samOut.flush();
+                        }
+                        
+                        _totalSent += read;
+                        _context.statManager().addRateData("send." + _connectionId + ".totalSent", _totalSent, 0);
+                    }
+                } catch (IOException ioe) {
+                    _log.error("Error sending", ioe);
+                }
+            }
+            
+            byte msg[] = ("STREAM CLOSE ID=" + _connectionId + "\n").getBytes();
+            try {
+                synchronized (_samOut) {
+                    _samOut.write(msg);
+                    _samOut.flush();
+                }
+            } catch (IOException ioe) {
+                _log.error("Error closing", ioe);
+            }
+            
+            closed();
+        }
+    }
+}

apps/sam/java/src/net/i2p/sam/client/SAMStreamSink.java

@@ -0,0 +1,247 @@
+package net.i2p.sam.client;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.FileOutputStream;
+import java.io.File;
+import java.io.OutputStream;
+import java.net.Socket;
+
+import java.util.Map;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
+import net.i2p.I2PAppContext;
+import net.i2p.data.DataHelper;
+import net.i2p.util.Log;
+import net.i2p.util.I2PThread;
+
+import net.i2p.sam.client.SAMEventHandler;
+import net.i2p.sam.client.SAMClientEventListenerImpl;
+import net.i2p.sam.client.SAMReader;
+
+/**
+ * Sit around on a SAM destination, receiving lots of data and 
+ * writing it to disk
+ *
+ * Usage: SAMStreamSink samHost samPort myKeyFile sinkDir
+ *
+ */
+public class SAMStreamSink {
+    private I2PAppContext _context;
+    private Log _log;
+    private String _samHost;
+    private String _samPort;
+    private String _destFile;
+    private String _sinkDir;
+    private String _conOptions;
+    private Socket _samSocket;
+    private OutputStream _samOut;
+    private InputStream _samIn;
+    private SAMReader _reader;
+    private boolean _dead;
+    private SAMEventHandler _eventHandler;
+    /** Connection id (Integer) to peer (Flooder) */
+    private Map _remotePeers;
+    
+    public static void main(String args[]) {
+        if (args.length < 4) {
+            System.err.println("Usage: SAMStreamSink samHost samPort myDestFile sinkDir");
+            return;
+        }
+        I2PAppContext ctx = new I2PAppContext();
+        SAMStreamSink sink = new SAMStreamSink(ctx, args[0], args[1], args[2], args[3]);
+        sink.startup();
+    }
+    
+    public SAMStreamSink(I2PAppContext ctx, String samHost, String samPort, String destFile, String sinkDir) {
+        _context = ctx;
+        _log = ctx.logManager().getLog(SAMStreamSink.class);
+        _dead = false;
+        _samHost = samHost;
+        _samPort = samPort;
+        _destFile = destFile;
+        _sinkDir = sinkDir;
+        _conOptions = "";
+        _eventHandler = new SinkEventHandler(_context);
+        _remotePeers = new HashMap();
+    }
+    
+    public void startup() {
+        _log.debug("Starting up");
+        boolean ok = connect();
+        _log.debug("Connected: " + ok);
+        if (ok) {
+            _reader = new SAMReader(_context, _samIn, _eventHandler);
+            _reader.startReading();
+            _log.debug("Reader created");
+            String ourDest = handshake();
+            _log.debug("Handshake complete.  we are " + ourDest);
+            if (ourDest != null) {
+                boolean written = writeDest(ourDest);
+                _log.debug("Dest written");
+            }
+        }
+    }
+    
+    private class SinkEventHandler extends SAMEventHandler {
+        public SinkEventHandler(I2PAppContext ctx) { super(ctx); }
+        public void streamClosedReceived(String result, int id, String message) {
+            Sink sink = null;
+            synchronized (_remotePeers) {
+                sink = (Sink)_remotePeers.remove(new Integer(id));
+            }
+            if (sink != null) {
+                sink.closed();
+                _log.debug("Connection " + sink.getConnectionId() + " closed to " + sink.getDestination());
+            } else {
+                _log.error("wtf, not connected to " + id + " but we were just closed?");
+            }
+        }
+        public void streamDataReceived(int id, byte data[], int offset, int length) {
+            Sink sink = null;
+            synchronized (_remotePeers) {
+                sink = (Sink)_remotePeers.get(new Integer(id));
+            }
+            if (sink != null) {
+                sink.received(data, offset, length);
+            } else {
+                _log.error("wtf, not connected to " + id + " but we received " + length + "?");
+            }
+        }
+        public void streamConnectedReceived(String dest, int id) {  
+            _log.debug("Connection " + id + " received from " + dest);
+
+            try {
+                Sink sink = new Sink(id, dest);
+                synchronized (_remotePeers) {
+                    _remotePeers.put(new Integer(id), sink);
+                }
+            } catch (IOException ioe) {
+                _log.error("Error creating a new sink", ioe);
+            }
+        }
+    }
+    
+    private boolean connect() {
+        try {
+            _samSocket = new Socket(_samHost, Integer.parseInt(_samPort));
+            _samOut = _samSocket.getOutputStream();
+            _samIn = _samSocket.getInputStream();
+            return true;
+        } catch (Exception e) {
+            _log.error("Unable to connect to SAM at " + _samHost + ":" + _samPort, e);
+            return false;
+        }
+    }
+    
+    private String handshake() {
+        synchronized (_samOut) {
+            try {
+                _samOut.write("HELLO VERSION MIN=1.0 MAX=1.0\n".getBytes());
+                _samOut.flush();
+                _log.debug("Hello sent");
+                boolean ok = _eventHandler.waitForHelloReply();
+                _log.debug("Hello reply found: " + ok);
+                if (!ok) 
+                    throw new IOException("wtf, hello failed?");
+                String req = "SESSION CREATE STYLE=STREAM DESTINATION=" + _destFile + " " + _conOptions + "\n";
+                _samOut.write(req.getBytes());
+                _samOut.flush();
+                _log.debug("Session create sent");
+                ok = _eventHandler.waitForSessionCreateReply();
+                _log.debug("Session create reply found: " + ok);
+
+                req = "NAMING LOOKUP NAME=ME\n";
+                _samOut.write(req.getBytes());
+                _samOut.flush();
+                _log.debug("Naming lookup sent");
+                String destination = _eventHandler.waitForNamingReply("ME");
+                _log.debug("Naming lookup reply found: " + destination);
+                if (destination == null) {
+                    _log.error("No naming lookup reply found!");
+                    return null;
+                } else {
+                    _log.info(_destFile + " is located at " + destination);
+                }
+                return destination;
+            } catch (Exception e) {
+                _log.error("Error handshaking", e);
+                return null;
+            }
+        }
+    }
+    
+    private boolean writeDest(String dest) {
+        try {
+            FileOutputStream fos = new FileOutputStream(_destFile);
+            fos.write(dest.getBytes());
+            fos.close();
+            return true;
+        } catch (Exception e) {
+            _log.error("Error writing to " + _destFile, e);
+            return false;
+        }
+    }
+    
+    private class Sink {
+        private int _connectionId; 
+        private String _remoteDestination;
+        private boolean _closed;
+        private long _started;
+        private long _totalReceived;
+        private long _lastReceivedOn;
+        private OutputStream _out;
+        
+        public Sink(int conId, String remDest) throws IOException {
+            _connectionId = conId;
+            _remoteDestination = remDest;
+            _closed = false;
+            _lastReceivedOn = _context.clock().now();
+            _context.statManager().createRateStat("sink." + conId + ".totalReceived", "Data size received", "swarm", new long[] { 30*1000, 60*1000, 5*60*1000 });
+            _context.statManager().createRateStat("sink." + conId + ".started", "When we start", "swarm", new long[] { 5*60*1000 });
+            _context.statManager().createRateStat("sink." + conId + ".lifetime", "How long we talk to a peer", "swarm", new long[] { 5*60*1000 });
+            
+            File sinkDir = new File(_sinkDir);
+            if (!sinkDir.exists())
+                sinkDir.mkdirs();
+            
+            File out = File.createTempFile("sink", ".dat", sinkDir);
+            _out = new FileOutputStream(out);
+        }
+        
+        public int getConnectionId() { return _connectionId; }
+        public String getDestination() { return _remoteDestination; }
+        
+        public void closed() {
+            if (_closed) return;
+            _closed = true;
+            long lifetime = _context.clock().now() - _started;
+            _context.statManager().addRateData("sink." + _connectionId + ".lifetime", lifetime, lifetime);
+            try { 
+                _out.close();
+            } catch (IOException ioe) {
+                _log.error("Error closing", ioe);
+            }
+        }
+        public void received(byte data[], int offset, int len) {
+            if (_closed) return;
+            _totalReceived += len;
+            try {
+                _out.write(data, offset, len);
+            } catch (IOException ioe) {
+                _log.error("Error writing received data");
+                closed();
+                return;
+            }
+            _log.debug("Received " + len + " on " + _connectionId + " after " + (_context.clock().now()-_lastReceivedOn)
+                       + "ms with " + _remoteDestination.substring(0,6));
+            
+            _lastReceivedOn = _context.clock().now();
+        }
+    }
+}

apps/sam/java/test/net/i2p/sam/TestStreamTransfer.java

@@ -150,7 +150,7 @@ public class TestStreamTransfer {
                     _log.error("Incorrect size read - expected " + payloadSize + " got " + read);
                     return;
                 }
-                _log.info("Received from the stream " + id + ": [" + new String(payload) + "]");
+                _log.info("\n== Received from the stream " + id + ": [" + new String(payload) + "]");
                 try { Thread.sleep(5*1000); } catch (InterruptedException ie) {}
                 /*
                 // now echo it back
@@ -217,7 +217,12 @@ public class TestStreamTransfer {
             }
             try { Thread.sleep(5*1000) ; } catch (InterruptedException ie) {}
             req = "STREAM SEND ID=42 SIZE=10\nBlahBlah!!";
-            _log.info("Sending data");
+            _log.info("\n** Sending BlahBlah!!");
+            out.write(req.getBytes());
+            out.flush();
+            try { Thread.sleep(5*1000) ; } catch (InterruptedException ie) {}
+            req = "STREAM SEND ID=42 SIZE=10\nFooBarBaz!";
+            _log.info("\n** Sending FooBarBaz!");
             out.write(req.getBytes());
             out.flush();
             try { Thread.sleep(20*1000); } catch (InterruptedException ie) {}

apps/sam/java/test/net/i2p/sam/TestSwarm.java

@@ -0,0 +1,312 @@
+package net.i2p.sam;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.FileOutputStream;
+import java.io.FileInputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+
+import java.util.Map;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
+import net.i2p.I2PAppContext;
+import net.i2p.data.DataHelper;
+import net.i2p.util.Log;
+import net.i2p.util.I2PThread;
+
+import net.i2p.sam.client.SAMEventHandler;
+import net.i2p.sam.client.SAMClientEventListenerImpl;
+import net.i2p.sam.client.SAMReader;
+
+/**
+ * Sit around on a SAM destination, receiving lots of data and sending lots of
+ * data to whomever talks to us.
+ *
+ * Usage: TestSwarm samHost samPort myKeyFile [peerDestFile ]*
+ *
+ */
+public class TestSwarm {
+    private I2PAppContext _context;
+    private Log _log;
+    private String _samHost;
+    private String _samPort;
+    private String _destFile;
+    private String _peerDestFiles[];
+    private String _conOptions;
+    private Socket _samSocket;
+    private OutputStream _samOut;
+    private InputStream _samIn;
+    private SAMReader _reader;
+    private boolean _dead;
+    private SAMEventHandler _eventHandler;
+    /** Connection id (Integer) to peer (Flooder) */
+    private Map _remotePeers;
+    
+    public static void main(String args[]) {
+        if (args.length < 3) {
+            System.err.println("Usage: TestSwarm samHost samPort myDestFile [peerDestFile ]*");
+            return;
+        }
+        I2PAppContext ctx = new I2PAppContext();
+        String files[] = new String[args.length - 3];
+        System.arraycopy(args, 3, files, 0, files.length);
+        TestSwarm swarm = new TestSwarm(ctx, args[0], args[1], args[2], files);
+        swarm.startup();
+    }
+    
+    public TestSwarm(I2PAppContext ctx, String samHost, String samPort, String destFile, String peerDestFiles[]) {
+        _context = ctx;
+        _log = ctx.logManager().getLog(TestSwarm.class);
+        _dead = false;
+        _samHost = samHost;
+        _samPort = samPort;
+        _destFile = destFile;
+        _peerDestFiles = peerDestFiles;
+        _conOptions = "";
+        _eventHandler = new SwarmEventHandler(_context);
+        _remotePeers = new HashMap();
+    }
+    
+    public void startup() {
+        _log.debug("Starting up");
+        boolean ok = connect();
+        _log.debug("Connected: " + ok);
+        if (ok) {
+            _reader = new SAMReader(_context, _samIn, _eventHandler);
+            _reader.startReading();
+            _log.debug("Reader created");
+            String ourDest = handshake();
+            _log.debug("Handshake complete.  we are " + ourDest);
+            if (ourDest != null) {
+                boolean written = writeDest(ourDest);
+                _log.debug("Dest written");
+                if (written) {
+                    connectWithPeers();
+                    _log.debug("connected with peers");
+                }
+            }
+        }
+    }
+    
+    private class SwarmEventHandler extends SAMEventHandler {
+        public SwarmEventHandler(I2PAppContext ctx) { super(ctx); }
+        public void streamClosedReceived(String result, int id, String message) {
+            Flooder flooder = null;
+            synchronized (_remotePeers) {
+                flooder = (Flooder)_remotePeers.remove(new Integer(id));
+            }
+            if (flooder != null) {
+                flooder.closed();
+                _log.debug("Connection " + flooder.getConnectionId() + " closed to " + flooder.getDestination());
+            } else {
+                _log.error("wtf, not connected to " + id + " but we were just closed?");
+            }
+        }
+        public void streamDataReceived(int id, byte data[], int offset, int length) {
+            Flooder flooder = null;
+            synchronized (_remotePeers) {
+                flooder = (Flooder)_remotePeers.get(new Integer(id));
+            }
+            long value = DataHelper.fromLong(data, 0, 4);
+            if (flooder != null) {
+                flooder.received(length, value);
+            } else {
+                _log.error("wtf, not connected to " + id + " but we received " + value + "?");
+            }
+        }
+        public void streamConnectedReceived(String dest, int id) {  
+            _log.debug("Connection " + id + " received from " + dest);
+
+            Flooder flooder = new Flooder(id, dest);
+            synchronized (_remotePeers) {
+                _remotePeers.put(new Integer(id), flooder);
+            }
+            I2PThread t = new I2PThread(flooder, "Flood " + id);
+            t.start();
+        }
+
+    }
+    
+    private boolean connect() {
+        try {
+            _samSocket = new Socket(_samHost, Integer.parseInt(_samPort));
+            _samOut = _samSocket.getOutputStream();
+            _samIn = _samSocket.getInputStream();
+            return true;
+        } catch (Exception e) {
+            _log.error("Unable to connect to SAM at " + _samHost + ":" + _samPort, e);
+            return false;
+        }
+    }
+    
+    private String handshake() {
+        synchronized (_samOut) {
+            try {
+                _samOut.write("HELLO VERSION MIN=1.0 MAX=1.0\n".getBytes());
+                _samOut.flush();
+                _log.debug("Hello sent");
+                boolean ok = _eventHandler.waitForHelloReply();
+                _log.debug("Hello reply found: " + ok);
+                if (!ok) 
+                    throw new IOException("wtf, hello failed?");
+                String req = "SESSION CREATE STYLE=STREAM DESTINATION=" + _destFile + " " + _conOptions + "\n";
+                _samOut.write(req.getBytes());
+                _samOut.flush();
+                _log.debug("Session create sent");
+                ok = _eventHandler.waitForSessionCreateReply();
+                _log.debug("Session create reply found: " + ok);
+
+                req = "NAMING LOOKUP NAME=ME\n";
+                _samOut.write(req.getBytes());
+                _samOut.flush();
+                _log.debug("Naming lookup sent");
+                String destination = _eventHandler.waitForNamingReply("ME");
+                _log.debug("Naming lookup reply found: " + destination);
+                if (destination == null) {
+                    _log.error("No naming lookup reply found!");
+                    return null;
+                } else {
+                    _log.info(_destFile + " is located at " + destination);
+                }
+                return destination;
+            } catch (Exception e) {
+                _log.error("Error handshaking", e);
+                return null;
+            }
+        }
+    }
+    
+    private boolean writeDest(String dest) {
+        try {
+            FileOutputStream fos = new FileOutputStream(_destFile);
+            fos.write(dest.getBytes());
+            fos.close();
+            return true;
+        } catch (Exception e) {
+            _log.error("Error writing to " + _destFile, e);
+            return false;
+        }
+    }
+    
+    private void connectWithPeers() {
+        if (_peerDestFiles != null) {
+            for (int i = 0; i < _peerDestFiles.length; i++) {
+                try {
+                    FileInputStream fin = new FileInputStream(_peerDestFiles[i]);
+                    byte dest[] = new byte[1024];
+                    int read = DataHelper.read(fin, dest);
+                    
+                    String remDest = new String(dest, 0, read);
+                    int con = 0;
+                    Flooder flooder = null;
+                    synchronized (_remotePeers) {
+                        con = _remotePeers.size() + 1;
+                        flooder = new Flooder(con, remDest);
+                        _remotePeers.put(new Integer(con), flooder);
+                    }
+                    
+                    byte msg[] = ("STREAM CONNECT ID=" + con + " DESTINATION=" + remDest + "\n").getBytes();
+                    synchronized (_samOut) {
+                        _samOut.write(msg);
+                        _samOut.flush();
+                    }
+                    I2PThread flood = new I2PThread(flooder, "Flood " + con);
+                    flood.start();
+                    _log.debug("Starting flooder with peer from " + _peerDestFiles[i] + ": " + con);
+                } catch (IOException ioe) {
+                    _log.error("Unable to read the peer from " + _peerDestFiles[i]);
+                }
+            }
+        }
+    }
+    
+    private class Flooder implements Runnable {
+        private int _connectionId; 
+        private String _remoteDestination;
+        private boolean _closed;
+        private long _started;
+        private long _totalSent;
+        private long _totalReceived;
+        private long _lastReceived;
+        private long _lastReceivedOn;
+        private boolean _outOfSync;
+        
+        public Flooder(int conId, String remDest) {
+            _connectionId = conId;
+            _remoteDestination = remDest;
+            _closed = false;
+            _outOfSync = false;
+            _lastReceived = -1;
+            _lastReceivedOn = _context.clock().now();
+            _context.statManager().createRateStat("swarm." + conId + ".totalReceived", "Data size received", "swarm", new long[] { 30*1000, 60*1000, 5*60*1000 });
+            _context.statManager().createRateStat("swarm." + conId + ".totalSent", "Data size sent", "swarm", new long[] { 30*1000, 60*1000, 5*60*1000 });
+            _context.statManager().createRateStat("swarm." + conId + ".started", "When we start", "swarm", new long[] { 5*60*1000 });
+            _context.statManager().createRateStat("swarm." + conId + ".lifetime", "How long we talk to a peer", "swarm", new long[] { 5*60*1000 });
+        }
+        
+        public int getConnectionId() { return _connectionId; }
+        public String getDestination() { return _remoteDestination; }
+        
+        public void closed() {
+            _closed = true;
+            long lifetime = _context.clock().now() - _started;
+            _context.statManager().addRateData("swarm." + _connectionId + ".lifetime", lifetime, lifetime);
+        }
+        public void run() {
+            _started = _context.clock().now();
+            _context.statManager().addRateData("swarm." + _connectionId + ".started", 1, 0);
+            byte data[] = new byte[32*1024];
+            long value = 0;
+            long lastSend = _context.clock().now();
+            while (!_closed) {
+                byte msg[] = ("STREAM SEND ID=" + _connectionId + " SIZE=" + data.length + "\n").getBytes();
+                DataHelper.toLong(data, 0, 4, value);
+                try {
+                    synchronized (_samOut) {
+                        _samOut.write(msg);
+                        _samOut.write(data);
+                        _samOut.flush();
+                    }
+                } catch (IOException ioe) {
+                    _log.error("Error talking to SAM", ioe);
+                    return;
+                }
+                _totalSent += data.length;
+                _context.statManager().addRateData("swarm." + _connectionId + ".totalSent", _totalSent, 0);
+                value++;
+                try { Thread.sleep(20); } catch (InterruptedException ie) {}
+                long now = _context.clock().now();
+                _log.debug("Sending " + value + " on " + _connectionId + " after " + (now-lastSend));
+                lastSend = now;
+            }
+        }
+        public void received(int len, long value) {
+            _totalReceived += len;
+            if ( (!_outOfSync) && (len % 32*1024 != 0) ) {
+                _outOfSync = true;
+                if (_log.shouldLog(Log.ERROR))
+                    _log.error("Out of sync (len=" + len + " after " + (_totalReceived-len) + ")");
+            }
+            _context.statManager().addRateData("swarm." + getConnectionId() + ".totalReceived", _totalReceived, 0);
+            if (value != _lastReceived + 1) {
+                if (!_outOfSync)
+                    _log.error("Received " + value + " when expecting " + (_lastReceived+1) + " on " 
+                               + _connectionId + " with " + _remoteDestination.substring(0,6));
+                else
+                    _log.debug("(out of sync) Received " + value + " when expecting " + (_lastReceived+1) + " on " 
+                               + _connectionId + " with " + _remoteDestination.substring(0,6));
+            } else {
+                _log.debug("Received " + value + " on " + _connectionId + " after " + (_context.clock().now()-_lastReceivedOn)
+                           + "ms with " + _remoteDestination.substring(0,6));
+            }
+            _lastReceived = value;
+            _lastReceivedOn = _context.clock().now();
+        }
+    }
+}

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

@@ -112,6 +112,8 @@ public class Connection {
         _connectLock = new Object();
         _activeResends = 0;
         _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 });
     }
     
     public long getNextOutboundPacketNum() { 
@@ -135,9 +137,14 @@ public class Connection {
     boolean packetSendChoke(long timeoutMs) {
         if (false) return true;
         long writeExpire = timeoutMs;
+        long start = _context.clock().now();
+        boolean started = false;
         while (true) {
             long timeLeft = writeExpire - _context.clock().now();
             synchronized (_outboundPackets) {
+                if (!started)
+                    _context.statManager().addRateData("stream.chokeSizeBegin", _outboundPackets.size(), timeoutMs);
+                started = true;
                 if (_outboundPackets.size() >= _options.getWindowSize()) {
                     if (writeExpire > 0) {
                         if (timeLeft <= 0) {
@@ -154,6 +161,7 @@ public class Connection {
                         try { _outboundPackets.wait(); } catch (InterruptedException ie) {}
                     }
                 } else {
+                    _context.statManager().addRateData("stream.chokeSizeEnd", _outboundPackets.size(), _context.clock().now() - start);
                     return true;
                 }
             }
@@ -325,14 +333,19 @@ public class Connection {
             _occurredEventCount++;
         } else {
             _occurredTime = now;
-            if (_occurredEventCount > 100) {
-                _log.log(Log.CRIT, "More than 100 events (" + _occurredEventCount + ") in a second on " 
-                                   + toString() + ": scheduler = " + sched);
+            if ( (_occurredEventCount > 1000) && (_log.shouldLog(Log.WARN)) ) {
+                _log.warn("More than 1000 events (" + _occurredEventCount + ") in a second on " 
+                          + toString() + ": scheduler = " + sched);
             }
             _occurredEventCount = 0;
         }
+        
+        long before = System.currentTimeMillis();
             
         sched.eventOccurred(this);
+        long elapsed = System.currentTimeMillis() - before;
+        if ( (elapsed > 1000) && (_log.shouldLog(Log.WARN)) )
+            _log.warn("Took " + elapsed + "ms to pump through " + sched);
     }
     
     void resetReceived() {
@@ -381,15 +394,12 @@ public class Connection {
         if (_socket != null)
             _socket.destroy();
         _socket = null;
-        _inputStream = null;
         if (_outputStream != null)
             _outputStream.destroy();
-        _outputStream = null;
-        _outboundQueue = null;
         if (_receiver != null)
             _receiver.destroy();
         if (_activityTimer != null)
-            SimpleTimer.getInstance().addEvent(_activityTimer, 1);
+            SimpleTimer.getInstance().removeEvent(_activityTimer);
         _activityTimer = null;
         
         if (!_disconnectScheduled) {
@@ -714,6 +724,7 @@ public class Connection {
         public ResendPacketEvent(PacketLocal packet) {
             _packet = packet;
             _currentIsActiveResend = false;
+            packet.setResendPacketEvent(ResendPacketEvent.this);
         }
         
         public void timeReached() {

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

@@ -26,6 +26,10 @@ class ConnectionDataReceiver implements MessageOutputStream.DataReceiver {
         _dummyStatus = new DummyStatus();
     }
     
+    public boolean writeInProcess() {
+        return _connection.getUnackedPacketsSent() > 0;
+    }
+    
     /**
      * Send some data through the connection, or if there is no new data, this
      * may generate a packet with a plain ACK/NACK or CLOSE, or nothing whatsoever
@@ -64,7 +68,7 @@ class ConnectionDataReceiver implements MessageOutputStream.DataReceiver {
         if (doSend) {
             PacketLocal packet = send(buf, off, size);
             //dont wait for non-acks
-            if ( (packet.getPayloadSize() > 0) || (packet.isFlagSet(Packet.FLAG_SYNCHRONIZE)) )
+            if ( (packet.getSequenceNum() > 0) || (packet.isFlagSet(Packet.FLAG_SYNCHRONIZE)) )
                 return packet;
             else
                 return _dummyStatus;
@@ -95,8 +99,16 @@ class ConnectionDataReceiver implements MessageOutputStream.DataReceiver {
      * @return the packet sent
      */
     public PacketLocal send(byte buf[], int off, int size, boolean forceIncrement) {
+        long before = System.currentTimeMillis();
         PacketLocal packet = buildPacket(buf, off, size, forceIncrement);
+        long built = System.currentTimeMillis();
         _connection.sendPacket(packet);
+        long sent = System.currentTimeMillis();
+        
+        if ( (built-before > 1000) && (_log.shouldLog(Log.WARN)) )
+            _log.warn("wtf, took " + (built-before) + "ms to build a packet: " + packet);
+        if ( (sent-built> 1000) && (_log.shouldLog(Log.WARN)) )
+            _log.warn("wtf, took " + (sent-built) + "ms to send a packet: " + packet);
         return packet;
     }
     

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

@@ -87,7 +87,7 @@ public class ConnectionOptions extends I2PSocketOptionsImpl {
         setMaxResends(getInt(opts, PROP_MAX_RESENDS, 5));
         setWriteTimeout(getInt(opts, PROP_WRITE_TIMEOUT, -1));
         setInactivityTimeout(getInt(opts, PROP_INACTIVITY_TIMEOUT, 5*60*1000));
-        setInactivityAction(getInt(opts, PROP_INACTIVITY_ACTION, INACTIVITY_ACTION_SEND));
+        setInactivityAction(getInt(opts, PROP_INACTIVITY_ACTION, INACTIVITY_ACTION_DISCONNECT));
         setInboundBufferSize((getMaxMessageSize() + 2) * Connection.MAX_WINDOW_SIZE);
     }
     

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

@@ -30,12 +30,22 @@ public class ConnectionPacketHandler {
     /** distribute a packet to the connection specified */
     void receivePacket(Packet packet, Connection con) throws I2PException {
         boolean ok = verifyPacket(packet, con);
-        if (!ok) return;
+        if (!ok) {
+            if ( (!packet.isFlagSet(Packet.FLAG_RESET)) && (_log.shouldLog(Log.ERROR)) )
+                _log.error("Packet does NOT verify: " + packet);
+            return;
+        }
         con.packetReceived();
         
-        if (con.getInputStream().getTotalQueuedSize() > con.getOptions().getInboundBufferSize()) {
+        long ready = con.getInputStream().getHighestReadyBockId();
+        int available = con.getOptions().getInboundBufferSize() - con.getInputStream().getTotalReadySize();
+        int allowedBlocks = available/con.getOptions().getMaxMessageSize();
+        if (packet.getSequenceNum() > ready + allowedBlocks) {
             if (_log.shouldLog(Log.WARN))
-                _log.warn("Inbound buffer exceeded on connection " + con + ": dropping " + packet);
+                _log.warn("Inbound buffer exceeded on connection " + con + " (" 
+                          + ready + "/"+ (ready+allowedBlocks) + "/" + available
+                          + ": dropping " + packet);
+            ack(con, packet.getAckThrough(), packet.getNacks(), null, false);
             con.getOptions().setChoke(5*1000);
             return;
         }
@@ -95,8 +105,20 @@ public class ConnectionPacketHandler {
             }
         }
         
+        boolean fastAck = ack(con, packet.getAckThrough(), packet.getNacks(), packet, isNew);
+        con.eventOccurred();
+        if (fastAck) {
+            if (con.getLastSendTime() + con.getOptions().getRTT() < _context.clock().now()) {
+                if (_log.shouldLog(Log.DEBUG))
+                    _log.debug("Fast ack for dup " + packet);
+                con.ackImmediately();
+            }
+        }
+    }
+    
+    private boolean ack(Connection con, long ackThrough, long nacks[], Packet packet, boolean isNew) {
         int numResends = 0;
-        List acked = con.ackPackets(packet.getAckThrough(), packet.getNacks());
+        List acked = con.ackPackets(ackThrough, nacks);
         if ( (acked != null) && (acked.size() > 0) ) {
             if (_log.shouldLog(Log.DEBUG))
                 _log.debug(acked.size() + " of our packets acked with " + packet);
@@ -130,18 +152,15 @@ public class ConnectionPacketHandler {
             _context.statManager().addRateData("stream.con.packetsAckedPerMessageReceived", acked.size(), highestRTT);
         }
 
-        boolean fastAck = adjustWindow(con, isNew, packet.getSequenceNum(), numResends, (acked != null ? acked.size() : 0));
-        con.eventOccurred();
-        if (fastAck) {
-            if (con.getLastSendTime() + con.getOptions().getRTT() < _context.clock().now()) {
-                if (_log.shouldLog(Log.DEBUG))
-                    _log.debug("Fast ack for dup " + packet);
-                con.ackImmediately();
-            }
-        }
+        if (packet != null)
+            return adjustWindow(con, isNew, packet.getSequenceNum(), numResends, (acked != null ? acked.size() : 0));
+        else
+            return adjustWindow(con, false, -1, numResends, (acked != null ? acked.size() : 0));
     }
     
+    
     private boolean adjustWindow(Connection con, boolean isNew, long sequenceNum, int numResends, int acked) {
+        boolean congested = false;
         if ( (!isNew) && (sequenceNum > 0) ) {
             // dup real packet
             int oldSize = con.getOptions().getWindowSize();
@@ -156,64 +175,38 @@ public class ConnectionPacketHandler {
                            + con.getLastCongestionSeenAt() + " (#resends: " + numResends 
                            + ") for " + con);
 
-            return true;
-        //} else if (numResends > 0) {
-            // window sizes are shrunk on resend, not on ack
-        } else {
-            if (acked > 0) { 
-                long lowest = con.getHighestAckedThrough();
-                if (lowest >= con.getCongestionWindowEnd()) {
-                    // new packet that ack'ed uncongested data, or an empty ack
-                    int newWindowSize = con.getOptions().getWindowSize();
-                    
-                    if (numResends <= 0) {
-                        if (newWindowSize > con.getLastCongestionSeenAt() / 2) {
-                            // congestion avoidance
+            congested = true;
+        } 
+        
+        long lowest = con.getHighestAckedThrough();
+        if (lowest >= con.getCongestionWindowEnd()) {
+            // new packet that ack'ed uncongested data, or an empty ack
+            int newWindowSize = con.getOptions().getWindowSize();
 
-                            // we can't use newWindowSize += 1/newWindowSize, since we're
-                            // integers, so lets use a random distribution instead
-                            int shouldIncrement = _context.random().nextInt(newWindowSize);
-                            if (shouldIncrement <= 0)
-                                newWindowSize += 1;
-                        } else {
-                            // slow start
-                            newWindowSize += 1;
-                        }
-                    }
-                    
-                    if (_log.shouldLog(Log.DEBUG))
-                        _log.debug("New window size " + newWindowSize + " congestionSeenAt: "
-                                   + con.getLastCongestionSeenAt() + " (#resends: " + numResends 
-                                   + ") for " + con);
-                    con.getOptions().setWindowSize(newWindowSize);
-                    con.setCongestionWindowEnd(newWindowSize + lowest);
+            if ( (!congested) && (acked > 0) && (numResends <= 0) ) {
+                if (newWindowSize > con.getLastCongestionSeenAt() / 2) {
+                    // congestion avoidance
+
+                    // we can't use newWindowSize += 1/newWindowSize, since we're
+                    // integers, so lets use a random distribution instead
+                    int shouldIncrement = _context.random().nextInt(newWindowSize);
+                    if (shouldIncrement <= 0)
+                        newWindowSize += 1;
+                } else {
+                    // slow start
+                    newWindowSize += 1;
                 }
-            } else {
-                // received a message that doesn't contain a new ack
-                
-                // ehh. cant do this, as we SACK and the acks may be 
-                // received out of order: 
-                // Alice: RECEIVE 2
-                // Alice: SEND    ack 2 nack 1
-                // Alice: RECEIVE 1
-                // Alice: SEND    ack 2
-                // Bob:   RECEIVE ack 2
-                // Bob:   RECEIVE ack 2 nack 1 <-- NOT bad
-                
-                /*
-                if (con.getUnackedPacketsSent() > 0) {
-                    // peer got a dup
-                    int oldSize = con.getOptions().getWindowSize();
-                    oldSize >>>= 1;
-                    if (oldSize <= 0)
-                        oldSize = 1;
-                    con.getOptions().setWindowSize(oldSize);
-                    return false;
-                }
-                */
             }
+                    
+            if (_log.shouldLog(Log.DEBUG))
+                _log.debug("New window size " + newWindowSize + " congestionSeenAt: "
+                           + con.getLastCongestionSeenAt() + " (#resends: " + numResends 
+                           + ") for " + con);
+            con.getOptions().setWindowSize(newWindowSize);
+            con.setCongestionWindowEnd(newWindowSize + lowest);
         }
-        return false;
+        
+        return congested;
     }
     
     /**

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

@@ -33,9 +33,9 @@ public class MessageInputStream extends InputStream {
     private List _readyDataBlocks;
     private int _readyDataBlockIndex;
     /** highest message ID used in the readyDataBlocks */
-    private long _highestReadyBlockId;
+    private volatile long _highestReadyBlockId;
     /** highest overall message ID */
-    private long _highestBlockId;
+    private volatile long _highestBlockId;
     /** 
      * Message ID (Long) to ByteArray for blocks received
      * out of order when there are lower IDs not yet 
@@ -74,15 +74,13 @@ public class MessageInputStream extends InputStream {
     
     /** What is the highest block ID we've completely received through? */
     public long getHighestReadyBockId() { 
-        synchronized (_dataLock) {
-            return _highestReadyBlockId; 
-        }
+        // not synchronized as it doesnt hurt to read a too-low value
+        return _highestReadyBlockId; 
     }
     
     public long getHighestBlockId() { 
-        synchronized (_dataLock) {
-            return _highestBlockId;
-        }
+        // not synchronized as it doesnt hurt to read a too-low value
+        return _highestBlockId;
     }
     
     /**
@@ -394,6 +392,21 @@ public class MessageInputStream extends InputStream {
         }
     }
     
+    public int getTotalReadySize() {
+        synchronized (_dataLock) {
+            if (_locallyClosed) return 0;
+            int numBytes = 0;
+            for (int i = 0; i < _readyDataBlocks.size(); i++) {
+                ByteArray cur = (ByteArray)_readyDataBlocks.get(i);
+                if (i == 0)
+                    numBytes += cur.getData().length - _readyDataBlockIndex;
+                else
+                    numBytes += cur.getData().length;
+            }
+            return numBytes;
+        }
+    }
+    
     public void close() {
         synchronized (_dataLock) {
             _readyDataBlocks.clear();

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

@@ -47,7 +47,7 @@ public class MessageOutputStream extends OutputStream {
         _written = 0;
         _closed = false;
         _writeTimeout = -1;
-        _passiveFlushDelay = 5*1000;
+        _passiveFlushDelay = 500;
         _flusher = new Flusher();
         if (_log.shouldLog(Log.DEBUG))
             _log.debug("MessageOutputStream created");
@@ -83,8 +83,7 @@ public class MessageOutputStream extends OutputStream {
                     remaining = 0;
                     _lastBuffered = _context.clock().now();
                     if (_passiveFlushDelay > 0) {
-                        // if it is already enqueued, this just pushes it further out
-                        SimpleTimer.getInstance().addEvent(_flusher, _passiveFlushDelay);
+                        _flusher.enqueue();
                     }
                 } else {
                     // buffer whatever we can fit then flush,
@@ -115,9 +114,9 @@ public class MessageOutputStream extends OutputStream {
                 ws.waitForAccept(_writeTimeout);
                 if (!ws.writeAccepted()) {
                     if (_writeTimeout > 0)
-                        throw new InterruptedIOException("Write not accepted within timeout");
+                        throw new InterruptedIOException("Write not accepted within timeout: " + ws);
                     else
-                        throw new IOException("Write not accepted into the queue");
+                        throw new IOException("Write not accepted into the queue: " + ws);
                 }
             } else {
                 if (_log.shouldLog(Log.DEBUG))
@@ -140,11 +139,42 @@ public class MessageOutputStream extends OutputStream {
      * period of inactivity
      */
     private class Flusher implements SimpleTimer.TimedEvent {
+        private boolean _enqueued;
+        public void enqueue() {
+            // no need to be overly worried about duplicates - it would just 
+            // push it further out
+            if (!_enqueued) {
+                SimpleTimer.getInstance().addEvent(_flusher, _passiveFlushDelay);
+                if (_log.shouldLog(Log.DEBUG))
+                    _log.debug("Enqueueing the flusher for " + _passiveFlushDelay + "ms out");
+            } else {
+                if (_log.shouldLog(Log.DEBUG))
+                    _log.debug("NOT enqueing the flusher");
+            }
+            _enqueued = true;
+        }
         public void timeReached() {
+            _enqueued = false;
+            DataReceiver rec = _dataReceiver;
+            long timeLeft = (_lastBuffered + _passiveFlushDelay - _context.clock().now());
+            if (_log.shouldLog(Log.DEBUG))
+                _log.debug("flusher time reached: left = " + timeLeft);
+            if (timeLeft > 0)
+                enqueue();
+            else if ( (rec != null) && (rec.writeInProcess()) )
+                enqueue(); // don't passive flush if there is a write being done (unacked outbound)
+            else
+                doFlush();
+        }
+        
+        private void doFlush() {
             boolean sent = false;
             WriteStatus ws = null;
             synchronized (_dataLock) {
-                if ( (_valid > 0) && (_lastBuffered + _passiveFlushDelay > _context.clock().now()) ) {
+                long flushTime = _lastBuffered + _passiveFlushDelay;
+                if ( (_valid > 0) && (flushTime < _context.clock().now()) ) {
+                    if (_log.shouldLog(Log.DEBUG))
+                        _log.debug("doFlush() valid = " + _valid);
                     if ( (_buf != null) && (_dataReceiver != null) ) {
                         ws = _dataReceiver.writeData(_buf, 0, _valid);
                         _written += _valid;
@@ -153,13 +183,15 @@ public class MessageOutputStream extends OutputStream {
                         _dataLock.notifyAll();
                         sent = true;
                     }
+                } else {
+                    if (_log.shouldLog(Log.DEBUG))
+                        _log.debug("doFlush() rejected... valid = " + _valid);
                 }
             }
             // ignore the ws
             if (sent && _log.shouldLog(Log.DEBUG)) 
                 _log.debug("Passive flush of " + ws);
         }
-        
     }
     
     /** 
@@ -275,6 +307,7 @@ public class MessageOutputStream extends OutputStream {
     }
     void flushAvailable(DataReceiver target, boolean blocking) throws IOException {
         WriteStatus ws = null;
+        long before = System.currentTimeMillis();
         synchronized (_dataLock) {
             // _buf may be null, but the data receiver can handle that just fine,
             // deciding whether or not to send a packet
@@ -284,6 +317,10 @@ public class MessageOutputStream extends OutputStream {
             _dataLock.notifyAll();
             _lastFlushed = _context.clock().now();
         }
+        long afterBuild = System.currentTimeMillis();
+        if ( (afterBuild - before > 1000) && (_log.shouldLog(Log.DEBUG)) )
+            _log.debug("Took " + (afterBuild-before) + "ms to build a packet?  " + ws);
+        
         if (blocking && ws != null) {
             ws.waitForAccept(_writeTimeout);
             if (ws.writeFailed())
@@ -291,6 +328,9 @@ public class MessageOutputStream extends OutputStream {
             else if (!ws.writeAccepted())
                 throw new InterruptedIOException("Flush available timed out");
         }
+        long afterAccept = System.currentTimeMillis();
+        if ( (afterAccept - afterBuild > 1000) && (_log.shouldLog(Log.DEBUG)) )
+            _log.debug("Took " + (afterAccept-afterBuild) + "ms to accept a packet? " + ws);
         return;
     }
     
@@ -304,6 +344,7 @@ public class MessageOutputStream extends OutputStream {
          * Nonblocking write
          */
         public WriteStatus writeData(byte buf[], int off, int size);
+        public boolean writeInProcess();
     }
     
     /** Define a way to detect the status of a write */

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

@@ -104,7 +104,7 @@ public class PacketHandler {
         }
     }
     
-    private static final SimpleDateFormat _fmt = new SimpleDateFormat("hh:mm:ss.SSS");
+    private static final SimpleDateFormat _fmt = new SimpleDateFormat("HH:mm:ss.SSS");
     void displayPacket(Packet packet, String prefix) {
         String msg = null;
         synchronized (_fmt) {

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

@@ -5,6 +5,8 @@ import java.util.Set;
 import net.i2p.I2PAppContext;
 import net.i2p.data.Destination;
 import net.i2p.data.SessionKey;
+import net.i2p.util.Log;
+import net.i2p.util.SimpleTimer;
 
 /**
  * coordinate local attributes about a packet - send time, ack time, number of
@@ -12,6 +14,7 @@ import net.i2p.data.SessionKey;
  */
 public class PacketLocal extends Packet implements MessageOutputStream.WriteStatus {
     private I2PAppContext _context;
+    private Log _log;
     private Connection _connection;
     private Destination _to;
     private SessionKey _keyUsed;
@@ -22,6 +25,7 @@ public class PacketLocal extends Packet implements MessageOutputStream.WriteStat
     private long _acceptedOn;
     private long _ackOn;
     private long _cancelledOn;
+    private SimpleTimer.TimedEvent _resendEvent;
     
     public PacketLocal(I2PAppContext ctx, Destination to) {
         this(ctx, to, null);
@@ -29,6 +33,7 @@ public class PacketLocal extends Packet implements MessageOutputStream.WriteStat
     public PacketLocal(I2PAppContext ctx, Destination to, Connection con) {
         _context = ctx;
         _createdOn = ctx.clock().now();
+        _log = ctx.logManager().getLog(PacketLocal.class);
         _to = to;
         _connection = con;
         _lastSend = -1;
@@ -78,14 +83,16 @@ public class PacketLocal extends Packet implements MessageOutputStream.WriteStat
                 _ackOn = _context.clock().now(); 
             notifyAll();
         }
-        _connection = null;
+        SimpleTimer.getInstance().removeEvent(_resendEvent);
     }
     public void cancelled() { 
         synchronized (this) {
             _cancelledOn = _context.clock().now();
             notifyAll();
         }
-        _connection = null;
+        SimpleTimer.getInstance().removeEvent(_resendEvent);
+        if (_log.shouldLog(Log.DEBUG))
+            _log.debug("Cancelled! " + toString(), new Exception("cancelled"));
     }
     
     /** how long after packet creation was it acked? */
@@ -99,6 +106,8 @@ public class PacketLocal extends Packet implements MessageOutputStream.WriteStat
     public long getLastSend() { return _lastSend; }
     public Connection getConnection() { return _connection; }
     
+    public void setResendPacketEvent(SimpleTimer.TimedEvent evt) { _resendEvent = evt; }
+    
     public String toString() {
         String str = super.toString();
         if (_ackOn > 0)
@@ -110,17 +119,27 @@ public class PacketLocal extends Packet implements MessageOutputStream.WriteStat
     public void waitForAccept(int maxWaitMs) {
         if (_connection == null) 
             throw new IllegalStateException("Cannot wait for accept with no connection");
-        long expiration = _context.clock().now()+maxWaitMs;
+        long before = _context.clock().now();
+        long expiration = before+maxWaitMs;
+        int queued = _connection.getUnackedPacketsSent();
+        int window = _connection.getOptions().getWindowSize();
         boolean accepted = _connection.packetSendChoke(maxWaitMs);
+        long after = _context.clock().now();
         if (accepted)
-            _acceptedOn = _context.clock().now();
+            _acceptedOn = after;
         else
             _acceptedOn = -1;
-        _connection = null;
+        int afterQueued = _connection.getUnackedPacketsSent();
+        if ( (after - before > 1000) && (_log.shouldLog(Log.DEBUG)) )
+            _log.debug("Took " + (after-before) + "ms to get " 
+                       + (accepted ? " accepted" : " rejected")
+                       + (_cancelledOn > 0 ? " and CANCELLED" : "")
+                       + ", queued behind " + queued +" with a window size of " + window 
+                       + ", finally accepted with " + afterQueued + " queued: " 
+                       + toString());
     }
     
     public void waitForCompletion(int maxWaitMs) {
-        _connection = null;
         long expiration = _context.clock().now()+maxWaitMs;
         while (true) {
             long timeRemaining = expiration - _context.clock().now();

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

@@ -24,24 +24,17 @@ class PacketQueue {
     private Log _log;
     private I2PSession _session;
     private ConnectionManager _connectionManager;
-    private byte _buf[];
     private ByteCache _cache = ByteCache.getInstance(64, 36*1024);
     
     public PacketQueue(I2PAppContext context, I2PSession session, ConnectionManager mgr) {
         _context = context;
         _session = session;
         _connectionManager = mgr;
-        _buf = _cache.acquire().getData(); // new byte[36*1024];
         _log = context.logManager().getLog(PacketQueue.class);
         _context.statManager().createRateStat("stream.con.sendMessageSize", "Size of a message sent on a connection", "Stream", new long[] { 60*1000, 10*60*1000, 60*60*1000 });
         _context.statManager().createRateStat("stream.con.sendDuplicateSize", "Size of a message resent on a connection", "Stream", new long[] { 60*1000, 10*60*1000, 60*60*1000 });
     }
     
-    protected void finalize() throws Throwable {
-        _cache.release(new ByteArray(_buf));
-        super.finalize();
-    }
-    
     /**
      * Add a new packet to be sent out ASAP
      */
@@ -53,7 +46,7 @@ class PacketQueue {
             keyUsed = new SessionKey();
         Set tagsSent = packet.getTagsSent();
         if (tagsSent == null)
-            tagsSent = new HashSet();
+            tagsSent = new HashSet(0);
 
         // cache this from before sendMessage
         String conStr = (packet.getConnection() != null ? packet.getConnection().toString() : "");
@@ -63,29 +56,36 @@ class PacketQueue {
         } else {
             _log.debug("Sending... " + packet);
         }
+    
+        ByteArray ba = _cache.acquire();
+        byte buf[] = ba.getData();
 
         long begin = 0;
         long end = 0;
         boolean sent = false;
         try {
             int size = 0;
-            synchronized (this) {
-                Arrays.fill(_buf, (byte)0x0);
-                if (packet.shouldSign())
-                    size = packet.writeSignedPacket(_buf, 0, _context, _session.getPrivateKey());
-                else
-                    size = packet.writePacket(_buf, 0);
+            long beforeWrite = System.currentTimeMillis();
+            if (packet.shouldSign())
+                size = packet.writeSignedPacket(buf, 0, _context, _session.getPrivateKey());
+            else
+                size = packet.writePacket(buf, 0);
+            long writeTime = System.currentTimeMillis() - beforeWrite;
+            if ( (writeTime > 1000) && (_log.shouldLog(Log.WARN)) )
+                _log.warn("took " + writeTime + "ms to write the packet: " + packet);
 
-                // this should not block!
-                begin = _context.clock().now();
-                sent = _session.sendMessage(packet.getTo(), _buf, 0, size, keyUsed, tagsSent);
-                end = _context.clock().now();
-            }
+            // this should not block!
+            begin = _context.clock().now();
+            sent = _session.sendMessage(packet.getTo(), buf, 0, size, keyUsed, tagsSent);
+            end = _context.clock().now();
+            
+            if ( (end-begin > 1000) && (_log.shouldLog(Log.WARN)) ) 
+                _log.warn("Took " + (end-begin) + "ms to sendMessage(...) " + packet);
+            
             _context.statManager().addRateData("stream.con.sendMessageSize", size, packet.getLifetime());
             if (packet.getNumSends() > 1)
                 _context.statManager().addRateData("stream.con.sendDuplicateSize", size, packet.getLifetime());
             
-            
             Connection con = packet.getConnection();
             if (con != null) {
                 con.incrementBytesSent(size);
@@ -97,6 +97,8 @@ class PacketQueue {
                 _log.warn("Unable to send the packet " + packet, ise);
         }
         
+        _cache.release(ba);
+        
         if (!sent) {
             if (_log.shouldLog(Log.WARN))
                 _log.warn("Send failed for " + packet);

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

@@ -32,5 +32,6 @@ abstract class SchedulerImpl implements TaskScheduler {
             //    _log.debug("firing event on " + _connection, _addedBy);
             _connection.eventOccurred(); 
         }
+        public String toString() { return "event on " + _connection; }
     }
 }

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

@@ -57,6 +57,7 @@ public class MessageOutputStreamTest {
             _data.write(buf, off, size);
 			return new DummyWriteStatus();
         }
+        public boolean writeInProcess() { return false; }
         public byte[] getData() { return _data.toByteArray(); }
     }
 

build.xml

@@ -239,8 +239,6 @@
         <copy file="build/routerconsole.jar" todir="pkg-temp/lib/" />
         <copy file="build/i2ptunnel.war" todir="pkg-temp/webapps/" />
         <copy file="build/routerconsole.war" todir="pkg-temp/webapps/" />
-        <copy file="installer/resources/wrapper.config" todir="pkg-temp/" />
-        <copy file="installer/resources/wrapper.config" tofile="pkg-temp/wrapper.config.updated" />
         <copy file="history.txt" todir="pkg-temp/" />
         <copy file="hosts.txt" todir="pkg-temp/" />
         <mkdir dir="pkg-temp/eepsite" />

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

@@ -67,6 +67,7 @@ class I2CPMessageProducer {
      *
      */
     public void disconnect(I2PSessionImpl session) throws I2PSessionException {
+        if (session.isClosed()) return;
         DestroySessionMessage dmsg = new DestroySessionMessage();
         dmsg.setSessionId(session.getSessionId());
         session.sendMessage(dmsg);

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

@@ -108,6 +108,8 @@ class I2PSessionImpl2 extends I2PSessionImpl {
 
     private boolean sendBestEffort(Destination dest, byte payload[], SessionKey keyUsed, Set tagsSent)
                     throws I2PSessionException {
+        long begin = _context.clock().now();
+        
         SessionKey key = _context.sessionKeyManager().getCurrentKey(dest.getPublicKey());
         if (key == null) key = _context.sessionKeyManager().createSession(dest.getPublicKey());
         SessionTag tag = _context.sessionKeyManager().consumeNextAvailableTag(dest.getPublicKey(), key);
@@ -180,9 +182,17 @@ class I2PSessionImpl2 extends I2PSessionImpl {
                        + " sync took " + (inSendingSync-beforeSendingSync) 
                        + " add took " + (afterSendingSync-inSendingSync));
         _producer.sendMessage(this, dest, nonce, payload, tag, key, sentTags, newKey);
+        
+        // since this is 'best effort', all we're waiting for is a status update 
+        // saying that the router received it - in theory, that should come back
+        // immediately, but in practice can take up to a second (though usually
+        // much quicker).  setting this to false will short-circuit that delay
+        boolean actuallyWait = true;
+        
         long beforeWaitFor = _context.clock().now();
-        state.waitFor(MessageStatusMessage.STATUS_SEND_ACCEPTED, 
-                      _context.clock().now() + getTimeout());
+        if (actuallyWait)
+            state.waitFor(MessageStatusMessage.STATUS_SEND_ACCEPTED, 
+                          _context.clock().now() + getTimeout());
         long afterWaitFor = _context.clock().now();
         long inRemovingSync = 0;
         synchronized (_sendingStates) {
@@ -190,7 +200,7 @@ class I2PSessionImpl2 extends I2PSessionImpl {
             _sendingStates.remove(state);
         }
         long afterRemovingSync = _context.clock().now();
-        boolean found = state.received(MessageStatusMessage.STATUS_SEND_ACCEPTED);
+        boolean found = !actuallyWait || state.received(MessageStatusMessage.STATUS_SEND_ACCEPTED);
         if (_log.shouldLog(Log.DEBUG))
             _log.debug(getPrefix() + "After waitFor sending state " + state.getMessageId()
                        + " / " + state.getNonce() + " found = " + found);
@@ -200,6 +210,13 @@ class I2PSessionImpl2 extends I2PSessionImpl {
             _log.warn("wtf, took " + timeToSend + "ms to send the message?!", new Exception("baz"));
         }
         
+        if ( (afterRemovingSync - begin > 500) && (_log.shouldLog(Log.WARN) ) ) {
+            _log.warn("Took " + (afterRemovingSync-begin) + "ms to sendBestEffort, "
+                      + (afterSendingSync-begin) + "ms to prepare, "
+                      + (beforeWaitFor-afterSendingSync) + "ms to send, "
+                      + (afterRemovingSync-beforeWaitFor) + "ms waiting for reply");
+        }
+        
         if (found) {
             if (_log.shouldLog(Log.INFO))
                 _log.info(getPrefix() + "Message sent after " + state.getElapsed() + "ms with "

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

@@ -16,6 +16,7 @@ import net.i2p.data.i2cp.I2CPMessage;
 import net.i2p.data.i2cp.MessageId;
 import net.i2p.data.i2cp.MessagePayloadMessage;
 import net.i2p.data.i2cp.ReceiveMessageEndMessage;
+import net.i2p.util.Log;
 
 /**
  * Handle I2CP MessagePayloadMessages from the router delivering the contents
@@ -30,7 +31,8 @@ class MessagePayloadMessageHandler extends HandlerImpl {
     }
 
     public void handleMessage(I2CPMessage message, I2PSessionImpl session) {
-        _log.debug("Handle message " + message);
+        if (_log.shouldLog(Log.DEBUG))
+            _log.debug("Handle message " + message);
         try {
             MessagePayloadMessage msg = (MessagePayloadMessage) message;
             MessageId id = msg.getMessageId();
@@ -55,9 +57,8 @@ class MessagePayloadMessageHandler extends HandlerImpl {
         Payload payload = msg.getPayload();
         byte[] data = _context.elGamalAESEngine().decrypt(payload.getEncryptedData(), session.getDecryptionKey());
         if (data == null) {
-            _log
-                .error("Error decrypting the payload to public key "
-                       + session.getMyDestination().getPublicKey().toBase64() + "\nPayload: " + payload.calculateHash());
+            if (_log.shouldLog(Log.ERROR))
+                _log.error("Error decrypting the payload");
             throw new DataFormatException("Unable to decrypt the payload");
         }
         payload.setUnencryptedData(data);

core/java/src/net/i2p/client/package.html

@@ -27,7 +27,7 @@ but there are three other subpackages that are helpful.  Specifically:<ul>
 <li>{@link net.i2p.client.streaming} - for applications that want to use 
     a streaming API to provide reliable in order message delivery (<b>note</b>:
     the streaming library is packaged seperate from the main SDK - in the 
-    ministreaming.jar)</li>
+    mstreaming.jar and streaming.jar)</li>
 </ul></p>
 
 <p>The {@link net.i2p.client.I2PSession} implementation itself communicates with

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

@@ -18,6 +18,7 @@ import java.io.Serializable;
  */
 public class ByteArray implements Serializable, Comparable {
     private byte[] _data;
+    private int _valid;
 
     public ByteArray() {
         this(null);
@@ -25,6 +26,7 @@ public class ByteArray implements Serializable, Comparable {
 
     public ByteArray(byte[] data) {
         _data = data;
+        _valid = 0;
     }
 
     public final byte[] getData() {
@@ -34,6 +36,14 @@ public class ByteArray implements Serializable, Comparable {
     public void setData(byte[] data) {
         _data = data;
     }
+    
+    /** 
+     * Count how many of the bytes in the array are 'valid'.  
+     * this property does not necessarily have meaning for all byte 
+     * arrays.
+     */
+    public final int getValid() { return _valid; }
+    public final void setValid(int valid) { _valid = valid; }
 
     public final boolean equals(Object o) {
         if (o == null) return false;

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

@@ -658,18 +658,41 @@ public class DataHelper {
     }
 
     public static int read(InputStream in, byte target[]) throws IOException {
-        int cur = 0;
-        while (cur < target.length) {
-            int numRead = in.read(target, cur, target.length - cur);
+        return read(in, target, 0, target.length);
+    }
+    public static int read(InputStream in, byte target[], int offset, int length) throws IOException {
+        int cur = offset;
+        while (cur < length) {
+            int numRead = in.read(target, cur, length - cur);
             if (numRead == -1) {
-                if (cur == 0) return -1; // throw new EOFException("EOF Encountered during reading");
-
+                if (cur == offset) return -1; // throw new EOFException("EOF Encountered during reading");
                 return cur;
             }
             cur += numRead;
         }
         return cur;
     }
+    
+    
+    /**
+     * Read a newline delimited line from the stream, returning the line (without
+     * the newline), or null if EOF reached before the newline was found
+     */
+    public static String readLine(InputStream in) throws IOException {
+        StringBuffer buf = new StringBuffer(128);
+
+        int c = -1;
+        while ( (c = in.read()) != -1) {
+            if (c == '\n')
+                break;
+            buf.append((char)c);
+        }
+        if (c == -1) 
+            return null;
+        else
+            return buf.toString();
+    }
+    
 
     public static List sortStructures(Collection dataStructures) {
         if (dataStructures == null) return new ArrayList();
@@ -735,7 +758,7 @@ public class DataHelper {
 
     /** decompress the GZIP compressed data (returning null on error) */
     public static byte[] decompress(byte orig[]) throws IOException {
-        return decompress(orig, 0, orig.length);
+        return (orig != null ? decompress(orig, 0, orig.length) : null);
     }
     public static byte[] decompress(byte orig[], int offset, int length) throws IOException {
         if ((orig == null) || (orig.length <= 0)) return orig;

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

@@ -18,20 +18,30 @@ import net.i2p.I2PAppContext;
 public class SimpleTimer {
     private static final SimpleTimer _instance = new SimpleTimer();
     public static SimpleTimer getInstance() { return _instance; }
+    private I2PAppContext _context;
     private Log _log;
     /** event time (Long) to event (TimedEvent) mapping */
     private TreeMap _events;
     /** event (TimedEvent) to event time (Long) mapping */
     private Map _eventTimes;
+    private List _readyEvents;
     
     private SimpleTimer() {
-        _log = I2PAppContext.getGlobalContext().logManager().getLog(SimpleTimer.class);
+        _context = I2PAppContext.getGlobalContext();
+        _log = _context.logManager().getLog(SimpleTimer.class);
         _events = new TreeMap();
         _eventTimes = new HashMap();
+        _readyEvents = new ArrayList(4);
         I2PThread runner = new I2PThread(new SimpleTimerRunner());
         runner.setName("SimpleTimer");
         runner.setDaemon(true);
         runner.start();
+        for (int i = 0; i < 3; i++) {
+            I2PThread executor = new I2PThread(new Executor());
+            executor.setName("SimpleTimerExecutor " + i);
+            executor.setDaemon(true);
+            executor.start();
+        }
     }
     
     /**
@@ -40,18 +50,42 @@ public class SimpleTimer {
      */
     public void addEvent(TimedEvent event, long timeoutMs) {
         long eventTime = System.currentTimeMillis() + timeoutMs;
+        Long time = new Long(eventTime);
         synchronized (_events) {
             // remove the old scheduled position, then reinsert it
             if (_eventTimes.containsKey(event))
                 _events.remove(_eventTimes.get(event));
-            while (_events.containsKey(new Long(eventTime)))
-                eventTime++;
-            _events.put(new Long(eventTime), event);
-            _eventTimes.put(event, new Long(eventTime));
+            while (_events.containsKey(time))
+                time = new Long(time.longValue() + 1);
+            _events.put(time, event);
+            _eventTimes.put(event, time);
+            
+            if ( (_events.size() != _eventTimes.size()) ) {
+                _log.error("Skewed events: " + _events.size() + " for " + _eventTimes.size());
+                for (Iterator iter = _eventTimes.keySet().iterator(); iter.hasNext(); ) {
+                    TimedEvent evt = (TimedEvent)iter.next();
+                    Long when = (Long)_eventTimes.get(evt);
+                    TimedEvent cur = (TimedEvent)_events.get(when);
+                    if (cur != evt) {
+                        _log.error("event " + evt + " @ " + when + ": " + cur);
+                    }
+                }
+            }
+            
             _events.notifyAll();
         }
     }
     
+    public boolean removeEvent(TimedEvent evt) {
+        if (evt == null) return false;
+        synchronized (_events) {
+            Long when = (Long)_eventTimes.remove(evt);
+            if (when != null)
+                _events.remove(when);
+            return null != when;
+        }
+    }
+    
     /**
      * Simple interface for events to be queued up and notified on expiration
      */
@@ -82,8 +116,8 @@ public class SimpleTimer {
             while (true) {
                 try {
                     synchronized (_events) {
-                        if (_events.size() <= 0)
-                            _events.wait();
+                        //if (_events.size() <= 0)
+                        //    _events.wait();
                         //if (_events.size() > 100)
                         //    _log.warn("> 100 events!  " + _events.values());
                         long now = System.currentTimeMillis();
@@ -97,7 +131,7 @@ public class SimpleTimer {
                                 if (evt != null) {                            
                                     _eventTimes.remove(evt);
                                     eventsToFire.add(evt);
-                                }
+                                } 
                             } else {
                                 nextEventDelay = when.longValue() - now;
                                 nextEvent = _events.get(when);
@@ -128,32 +162,20 @@ public class SimpleTimer {
                 long now = System.currentTimeMillis();
                 now = now - (now % 1000);
 
-                for (int i = 0; i < eventsToFire.size(); i++) {
-                    TimedEvent evt = (TimedEvent)eventsToFire.get(i);
-                    try {
-                        evt.timeReached();
-                    } catch (Throwable t) {
-                        log("wtf, event borked: " + evt, t);
-                    }
-                    _recentEvents[4] = _recentEvents[3];
-                    _recentEvents[3] = _recentEvents[2];
-                    _recentEvents[2] = _recentEvents[1];
-                    _recentEvents[1] = _recentEvents[0];
-                    _recentEvents[0] = evt;
+                synchronized (_readyEvents) {
+                    for (int i = 0; i < eventsToFire.size(); i++) 
+                        _readyEvents.add(eventsToFire.get(i));
+                    _readyEvents.notifyAll();
                 }
 
                 if (_occurredTime == now) {
                     _occurredEventCount += eventsToFire.size();
                 } else {
                     _occurredTime = now;
-                    if (_occurredEventCount > 100) {
-                        StringBuffer buf = new StringBuffer(256);
+                    if (_occurredEventCount > 1000) {
+                        StringBuffer buf = new StringBuffer(128);
                         buf.append("Too many simpleTimerJobs (").append(_occurredEventCount);
-                        buf.append(") in a second!  Last 5: \n");
-                        for (int i = 0; i < _recentEvents.length; i++) {
-                            if (_recentEvents[i] != null)
-                                buf.append(_recentEvents[i]).append('\n');
-                        }
+                        buf.append(") in a second!");
                         _log.log(Log.CRIT, buf.toString());
                     }
                     _occurredEventCount = 0;
@@ -163,4 +185,30 @@ public class SimpleTimer {
             }
         }
     }
+    
+    private class Executor implements Runnable {
+        public void run() {
+            while (true) {
+                TimedEvent evt = null;
+                synchronized (_readyEvents) {
+                    if (_readyEvents.size() <= 0) 
+                        try { _readyEvents.wait(); } catch (InterruptedException ie) {}
+                    if (_readyEvents.size() > 0) 
+                        evt = (TimedEvent)_readyEvents.remove(0);
+                }
+                
+                if (evt != null) {
+                    long before = _context.clock().now();
+                    try {
+                        evt.timeReached();
+                    } catch (Throwable t) {
+                        log("wtf, event borked: " + evt, t);
+                    }
+                    long time = _context.clock().now() - before;
+                    if ( (time > 1000) && (_log != null) && (_log.shouldLog(Log.WARN)) )
+                        _log.warn("wtf, event execution took " + time + ": " + evt);
+                }
+            }
+        }
+    }
 }

history.txt

@@ -1,4 +1,85 @@
-$Id: history.txt,v 1.90 2004/11/30 18:41:52 jrandom Exp $
+$Id: history.txt,v 1.101 2004/12/08 12:16:17 jrandom Exp $
+
+* 2004-12-08  0.4.2.3 released
+
+2004-12-08  jrandom
+    * Revised the buffering when reading from the SAM client and writing 
+      to the stream.  Also added a thread (sigh) so we don't block the
+      SAM client from giving us more messages for abnormally long periods
+      of time.
+    * Display the router version in the logs on startup (oft requested)
+    * Fix a race during the closing of a messageOutputStream
+
+2004-12-06  jrandom
+    * Don't do a 'passive flush' while there are already outbound messages 
+      unacked.
+    * Show the reseed link if up to 10 peers profiles are active (thanks 
+      dburton!)
+
+2004-12-06  jrandom
+    * Don't propogate streaming connection failures out to the SAM bridge as
+      fatal errors.
+    * Dont barf on repeated I2CP closure.
+
+2004-12-05  jrandom
+    * Explicitly use "127.0.0.1" to bind the I2CP listener, not the JVM's
+      getLocalhost call
+
+2004-12-05  jrandom
+    * Default the I2CP listener to localhost only, unless overridden by 
+      i2cp.tcp.bindAllInterfaces=true (thanks dm!)
+    * More SAM fixes for things recently broken (whee)
+
+2004-12-05  jrandom
+    * Fix the recently broken SAM bridge (duh)
+    * Add a new pair of SAM apps - net.i2p.sam.client.SAMStreamSink and
+      net.i2p.sam.client.SAMStreamSend, mirroring the streaming lib's
+      StreamSink and StreamSend apps for transferring files.
+    * Make the passive flush timer fire more frequently.
+
+2004-12-05  jrandom
+    * Fixed some links in the console (thanks ugha!) and the javadoc 
+      (thanks dinoman!)
+    * Fix the stream's passive flush timer (oh, its supposed to work?)
+
+2004-12-03  jrandom
+    * Toss in a small pool of threads (3) to execute the events queued up with
+      the SimpleTimer, as we do currently see the occational event 
+      notification spiking up to a second or so.
+    * Implement a SAM client API in java, useful for event based streaming (or
+      for testing the SAM bridge)
+    * Added support to shut down the SAM bridge on OOM (useful if the SAM 
+      bridge is being run outside of the router).
+    * Include the SAM test code in the sam.jar
+    * Remove an irrelevent warning message from SAM, which was caused by 
+      perfectly normal operation due to a session being closed.
+    * Removed some unnecessary synchronization in the streaming lib's 
+      PacketQueue
+    * More quickly clean up the memory used by the streaming lib by 
+      immediately killing each packet's resend job as soon as it is ACKed (or
+      cancelled), so that there are no longer any valid pointers to the 
+      (potentially 32KB) packet.
+    * Fixed the timestamps dumped to stdout when debugging the PacketHandler.
+    * Drop packets that would expand our inbound window beyond our maximum 
+      buffer size (default 32 messages)
+    * Always read the ACK/NACK data from the verified packets received, even
+      if we are going to drop them
+    * Always adjust the window when there are messages ACKed, though do not
+      change its size except as before.
+    * Streamlined some synchronization in the router's I2CP handling
+    * Streamlined some memory allocation in the SAM bridge
+    * Default the streaming lib to disconnect on inactivity, rather than send
+      an empty message.
+
+2004-12-01  jrandom
+    * Fix for a race in the streaming lib as caused by some odd SAM activity
+
+* 2004-12-01  0.4.2.2 released
+
+2004-12-01  jrandom
+    * Fixed a stupid typo that inadvertantly allowed persistent HTTP 
+      connections to work (thanks duck!)
+    * Make sure we override the inactivity timeout too
 
 * 2004-12-01  0.4.2.1 released
 

hosts.txt

@@ -1,6 +1,12 @@
 ; TC's hosts.txt guaranteed freshness
-; $Id: hosts.txt,v 1.82 2004/11/28 17:47:01 jrandom Exp $
+; $Id: hosts.txt,v 1.88 2004/12/06 17:13:41 jrandom Exp $
 ; changelog:
+; (1.111) aliased gott.i2p as jrandom.i2p (ed. note: no, i am not gott)
+; (1.110) added sonax.i2p
+; (1.109) added 1.fcp.freenet.i2p and copied fcp.i2p to 2.fcp.freenet.i2p
+; (1.108) added asciiwhite.i2p
+; (1.107) added fcp.i2p
+; (1.106) added greenflog.i2p
 ; (1.105) added bdl.i2p
 ; (1.104) added bacardi.i2p and guttersnipe.i2p
 ; (1.103) added evil.i2p
@@ -235,4 +241,11 @@ evil.i2p=NGNaN9qrpk2dC~OQlo-1yHT~Tvb6SvU8VH9SiBkwNZxuNVRKN~2ZtU50nkTklevB5V08GMT
 bacardi.i2p=oZm0JRHiUFKwAzLz1wlNOK2h2fI8V6u1nUhgCpt1RcErs99QMPHqu4oR4cel5lsJbeg1X0GgHe72JYabsntjimjWs1zi0RzknddVvq0hMGnn9EA-9Atu9qViScXp42ddnYhIlMBNNswMp8AJ01jHkO3SUSDSVk-rF5wnrhpyN9BFyho8h18nHrr6S4jaGHsuLVage8ImwQRv~PYfr4hVULdiFn5HDRePdvgzKUD3o4Y7nFiQMXswP02ZhXXtE-rMGDs2TD15qYah6mkQWdZtRYFuKuCh7Myn35u2IHGyMs56zpnuVr~w~Uh7wydg26JShsAz4AyZhGy70eTFUC2dtEr7bUvQSE3V3xNKOeBuGYadipWB30xmGDX2kfaU5Efy45MLPBwTU-8f4owQBokgSD3jBEc4vV0DbJrGoNnA3zpAC0JwZ9rFLolQNzenRgkWYlO09PEkKPUyUMpUBGY~Wj7jcsGnt5uNskeHHpV4hsvdpboHnlPAcZKvN7rTCenoAAAA
 guttersnipe.i2p=yS6ECPvCobRLKMXJg-rLZ5PF6dRcXliR2e9KEX~aUZMEsznpzE-lCs~FgGd7w9-~GW8ObvKiyt47S7SuCunjndl874xPhrQ0dFRUNEsdovLBr6s9v2xi7kpWC1yKLbT-Ti3p8WhNPZkGsJl6YEIc357j4FjNVFx2-b~V16G0lhjhY1a55nsCoU7xXisdqOaKZL-4Y7vEVHqZNgM6cAZpY8vHtui30J3oGmV-RcJG9ahYkorqleKtb2G0fwbUMakxHv5uzlHyAU~r7OmS7NCIfoyBgU3MrSiwkYiW5elQ294XV-1Bciy9DFnJh4KA0rLIA7GanvkQ-NwqoGLsXz08mpi12vVssDhdavXooBeZLg7gipFYzle3-B1rgGKZ~51~9Tou~XSn6jGJGgtqKV7fTmys4~AXNy7vCWrMKQaWh6M1HI69yV466bJWv6nVhwNmOmtk48EIC3ik2IXC1wjA6Rgz2AcSiR-UEyaBkv251Vu6H92HZJTrsTzuzVmZcYt0AAAA
 bdl.i2p=IMzcrD4jQLBtyzV8TdL-jgbyDhRjMBS1BfI6xGuddMyJEoMnZ1ZWDUn3NwqdyEYRQD7zREgbsQgzpE7Gdmpp-vLrzba3W1mUR5Ddu13tgIiDrOWR38Omv7L~DTDimK9m0Y-HCJROVigRfxdZbsI6P37d77NArdpwLzFos6qyK2C40JQFIaNCPYGkf05DsXtHLPwTJXYVKVp0R2V7nGmI77BUdwDgt4zSotlyvmsX6U1mYqKwutwr~oxggdvgfoNbrGC0~xQCbfQtEOwFYwxc5oUeJlt4jjb1-C9HAb7r4LtJ3Daqr0bx1hXS5hADw68cfUHbEjbfrhJhBA0mMqgGMm~r~0II8R19EXprc91YY4d0QycR2Osdn9MVNXS01Ziy~JX-SfT8DTjj2ZZn7rpyjcq7rgVbspPLJOdNQNERiAm06yjosOrPjtl8mrWXxWcOcGlMO5ftoTvX2hFsfc-vmfN7S8IZEfUdJRpJxDytChNTUr~qMWuP0LicNv0xKtA3AAAA
+greenflog.i2p=4RdKwi7a5wrn-B1crYUuH8H5xHExl8oIxouASnG5Q-s--Sk2eQr7ajeXCdkxzz0Ep9CKhGY4rARRWvCuNYokkl3Jzpc-17oj-Qrr46kRdjqad2AlcJ0q920nmU3tjoqoE4qNshnP7H7NcephURg2GbHsrmUJm1EqA9SsTPk6~kUvvPiLtpbEAoas9uv0a5oI-Ykpwc2VSuZnk9hZQ25ndeW6pSH68FCbzZZfDVNAT1vcTtKGYoop2rmaGTkRsxT0vCG06S8iAoIBt4kHznZRldnnND5n31Dz8rYB7ICLplN54vlntrcjaL82HGSdxSmPg5crG3bwbvwC-7jspiZNGHFM8gun047A3b5g4YaNmCuzrLGgoW5pMlCWgOK7Wdf8NTQ9yrY1iBRIua2-zZwVEuCaIR8mlRdZ-UW37kad-OabJ18iavapc0iz~CaJBer4zlrJev3H9TfIMlk2WhG~SSDW9Y3dELIoZDfvgkfIcyPrNJThrcxpFZWGREhFuI5oAAAA
+fcp.i2p=yY8ahms44MDj2cdI6o7Fc2ozz-jM4ACEp8t4YJiRsKgEYx6XNB7QrNK8jZQoKIQ8G6GMmKMYsgRGmbwWFt60au5HFNv56NWsB4Nd80G9iSRLiEHOHhaUSFnR~ZnSdzL-nbMqA8-vzteaqZ8HNnC2NNjJXsMyULFdkBsIKYS0jsS5hl7ddf0v69X7sCSp1CCy5H28rmZSEtKA4aYXGcBHJ8bXFomV5ovy~Mh2xZzWdeVmjdmJACG~ekDBcMkm7G5mlYoTN2aEBghxiHv~plGlHFqERB3lgISlomYIwYwPqxcmpxwbg9OSEo53t45P9~dat8XMvabzXiUdm0UgVnFsNBAIyNgyTEktw38~5v2XHhqpn8RSoMUeNOqp~k740v9fYH7xxHYCrfN7y3rKg~~GlWekbNmX5g0UvKjV-QWHIvrdOVZmII9qNTTwm3Uf2Tyi2aFll7TF9CvKUJCI0Mt1BpQEmPQdY~FgFXNd0p-~DvlRrwaI4jorbn4eUUEJqgzFAAAA
+asciiwhite.i2p=kJJmuP~sE0SrQFX-nyV2cEFDffnqv3D4-vBNJX6wqEq7vbTjQzZVn3jtt5kYlv4FpMyJnhPloYJWZNw-Yt2opdRnxNGpY~AHnI~iW-rmjuwkv0Qp~NG5sKEfTd7b6tAcop87He9FZ~ANNMmPpJbS1CNGGxLtkcceg4El7pJvodCp9uPjtAfMqnsKUYK6HKg~Wlz-8yC1QUxufkoT6PF645BNWp9PUVioCnUIaqizqBmDjTuUNqf9NOXnoQnx2PuqXxHGphKJqLp8faexDSTvLgns~yudyACMexzdnQMdEQJCkUqvwFuyeS2-uw6OFfHfACIc1yr3UdHPPFzsHT0WtwF5rFBpJqeWTiWph~Vas26824PdM-sK-PKo388UemmDJmY1YknGxsky6qhDGYkFHtWXF2D7fuOL~6V1aVw8DpIGW4PS~pjug9wtPoUkcKPd4zey7HNlgnVae4P7hviKlwRPPnxfor9athm1omU75GlIEwUi79GqVPb4N~qrbZOfAAAA
+1.fcp.freenet.i2p=r2zbc34IQSzOIF4N0enKf0xXkJKgsj9yTGGspRnstKZf~4UoAljZOW5aFZywGo-NlaXwt~tIyj4NC0Til0vl1D5N9ip7OMYUCajNNgiXEH~FN33yl-AcJbeTlB-FychSmVfYciTQj6yd19~6wICwkdpy6AYo90bAejSVGpvtFeP5P2pnSwPmcB8m79wyq~C2XjQCe5UcBxnfYolWKgr3uDFrgbhqBVCCkO7zTiARwOWZLVOvZsvKZR4WvYAmQI6CQaxnmT5n1FKO6NBb-HOxVw4onERq86Sc6EQ5d48719Yk-73wq1Mxmr7Y2UwmL~FCnY33rT1FJY2KzUENICL1uEuiVmr9N924CT9RbtldOUUcXmM1gaHlPS40-Hz4AvPxFXHynbyySktN3hBLPwfwhyIQw95ezSNuiBB0xPcujazCw02103n2CO-59rMDmWpttLjpLMggP9IwsAPa9FVLnBqfuCn3NrC4fia50RDwfR41AD1GOOWiUT0avYzbbOdsAAAA
+2.fcp.freenet.i2p=yY8ahms44MDj2cdI6o7Fc2ozz-jM4ACEp8t4YJiRsKgEYx6XNB7QrNK8jZQoKIQ8G6GMmKMYsgRGmbwWFt60au5HFNv56NWsB4Nd80G9iSRLiEHOHhaUSFnR~ZnSdzL-nbMqA8-vzteaqZ8HNnC2NNjJXsMyULFdkBsIKYS0jsS5hl7ddf0v69X7sCSp1CCy5H28rmZSEtKA4aYXGcBHJ8bXFomV5ovy~Mh2xZzWdeVmjdmJACG~ekDBcMkm7G5mlYoTN2aEBghxiHv~plGlHFqERB3lgISlomYIwYwPqxcmpxwbg9OSEo53t45P9~dat8XMvabzXiUdm0UgVnFsNBAIyNgyTEktw38~5v2XHhqpn8RSoMUeNOqp~k740v9fYH7xxHYCrfN7y3rKg~~GlWekbNmX5g0UvKjV-QWHIvrdOVZmII9qNTTwm3Uf2Tyi2aFll7TF9CvKUJCI0Mt1BpQEmPQdY~FgFXNd0p-~DvlRrwaI4jorbn4eUUEJqgzFAAAA
+sonax.i2p=s~FYxHeR1n0aN0kuilNtJU9IbXRX~jWI6vGz4TUf6oZyjZBYYmY9OpgDa3sr-8AERqsuG6EKA~UBn4KiQdkI-LU16DwEHvbgfZXAdwY73G6SkHOgwVAnT2SIOuh90v1QevYtxiGpA7IVm6icoz5V4I6V29hPlUNJxBFF~Qn2cY6zj0d6wBk6ulYc0vbyOwu8Lfc8T8bTnBLut3SZWgKHYLbxabcXJtcQpoN7k815N1MEUi0APD45o5TwPhvpHLt8fF10aNcMScpL01RR~tKHgC6jPX~HKM~Ld4l0z0lvLeq9197Qp6zHRvRD3YUQxyvgHi2ANkYprvJof1Abgs8TD1JWkZUAzlfqFPyjO~f3pJSDd5eM7E0Fk69ym1Y4Rltih~Y2N1IVtJPfo9Tx9a3RQWOJZ0MN12xfiZjyF92gDRgfKW5RDpwCoTVmP79u~WUr8lQ-qQbKhsMQQqMn8Uy8DeXvKLRpHaECtevjohL4lWBBR0ezXlBLCXKqaVXKcMTjAAAA
+jrandom.i2p=BxciUZkGQwi6Sj1Ucg5GGagDdwujlj8ClePa4~3d-1nnRJsBhTNJtvs-UuQYY77gPGNlpNk9dt02mxeS7f~pEC4E1KxJH9mhnf0OlIGB4hOOhDlXokAaKE2u1E-vVCDJlZCq32r~Ne53w-L2m5h5FAq5Bx7NXrTzWAEPgAlC8A2wASJWIF-EKOX5kfkkYoF6sKZqam5CxAAAMAUwmnbD--7wo8d2mz0C-c~oE7hzuHsg2J8yME5Zd~-FOZUxkoNCBJdfrVlVRn9~6685zqpaotL-SIqFK6~28ZCNMNCtnZcZZLeG2gZxq2pe8HtgzDrMMSx45vs3JLUp8Bap6~D9oFX0o7k2DQm-5R9D5NWhsJgol5Ny~8ABTXBpW~WQQOuKxE5xJauXM5rQia2yyXgldfOyGjxYnkrTGu6LaxlLmhyAva3ZbOO0mtLvrKLZebLKCYUxP7~TtNmSWEAzPKFYbjdZ~NjE0q4TanLFBaWotefPmy3IuAc8Mr7PbCvi4GmdAAAA
 

installer/install.xml

@@ -4,7 +4,7 @@
 
     <info>
         <appname>i2p</appname>
-        <appversion>0.4.2.1</appversion>
+        <appversion>0.4.2.3</appversion>
         <authors>
             <author name="I2P" email="support@i2p.net"/>
         </authors>

router/java/src/net/i2p/router/Router.java

@@ -792,6 +792,8 @@ public class Router {
     }
     
     public static void main(String args[]) {
+        System.out.println("Starting I2P " + RouterVersion.VERSION + "-" + RouterVersion.BUILD);
+        System.out.println(RouterVersion.ID);
         installUpdates();
         verifyWrapperConfig();
         Router r = new Router();

router/java/src/net/i2p/router/RouterVersion.java

@@ -15,8 +15,8 @@ import net.i2p.CoreVersion;
  *
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.95 $ $Date: 2004/11/30 18:41:51 $";
-    public final static String VERSION = "0.4.2.1";
+    public final static String ID = "$Revision: 1.106 $ $Date: 2004/12/08 12:16:17 $";
+    public final static String VERSION = "0.4.2.3";
     public final static long BUILD = 0;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION);

router/java/src/net/i2p/router/client/ClientListenerRunner.java

@@ -9,6 +9,7 @@ package net.i2p.router.client;
  */
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 
@@ -28,15 +29,21 @@ public class ClientListenerRunner implements Runnable {
     private ClientManager _manager;
     private ServerSocket _socket;
     private int _port;
+    private boolean _bindAllInterfaces;
     private boolean _running;
     private long _nextFailDelay = 1000;
     
+    public static final String BIND_ALL_INTERFACES = "i2cp.tcp.bindAllInterfaces";
+
     public ClientListenerRunner(RouterContext context, ClientManager manager, int port) {
         _context = context;
         _log = _context.logManager().getLog(ClientListenerRunner.class);
         _manager = manager;
         _port = port;
         _running = false;
+        
+        String val = context.getProperty(BIND_ALL_INTERFACES, "False");
+        _bindAllInterfaces = Boolean.valueOf(val).booleanValue();
     }
     
     public void setPort(int port) { _port = port; }
@@ -55,7 +62,11 @@ public class ClientListenerRunner implements Runnable {
         while (_running) {
             try {
                 _log.info("Starting up listening for connections on port " + _port);
-                _socket = new ServerSocket(_port);
+                if (_bindAllInterfaces)
+                    _socket = new ServerSocket(_port);
+                else
+                    _socket = new ServerSocket(_port, 0, InetAddress.getByName("127.0.0.1"));
+                
                 curDelay = 0;
                 while (_running) {
                     try {
@@ -82,7 +93,7 @@ public class ClientListenerRunner implements Runnable {
                 if (_context.router().isAlive()) 
                     _log.error("Error listening on port " + _port, ioe);
             }
-
+            
             if (_socket != null) {
                 try { _socket.close(); } catch (IOException ioe) {}
                 _socket = null; 

router/java/src/net/i2p/router/client/ClientWriterRunner.java

@@ -25,8 +25,6 @@ class ClientWriterRunner implements Runnable {
     
     private static final long MAX_WAIT = 5*1000;
     
-    /** notify this lock when there are messages to write */
-    private Object _activityLock = new Object();
     /** lock on this when updating the class level data structs */
     private Object _dataLock = new Object();
     
@@ -47,9 +45,7 @@ class ClientWriterRunner implements Runnable {
         synchronized (_dataLock) {
             _messagesToWrite.add(msg);
             _messagesToWriteTimes.add(new Long(_context.clock().now()));
-        }
-        synchronized (_activityLock) {
-            _activityLock.notifyAll();
+            _dataLock.notifyAll();
         }
         if (_log.shouldLog(Log.DEBUG))
             _log.debug("["+_id+"] addMessage completed for " + msg.getClass().getName());
@@ -60,8 +56,8 @@ class ClientWriterRunner implements Runnable {
      *
      */
     public void stopWriting() {
-        synchronized (_activityLock) {
-            _activityLock.notifyAll();
+        synchronized (_dataLock) {
+            _dataLock.notifyAll();
         }
     }
     public void run() {
@@ -70,6 +66,9 @@ class ClientWriterRunner implements Runnable {
             List messageTimes = null;
             
             synchronized (_dataLock) {
+                if (_messagesToWrite.size() <= 0) 
+                    try { _dataLock.wait(); } catch (InterruptedException ie) {}
+                
                 if (_messagesToWrite.size() > 0) {
                     messages = new ArrayList(_messagesToWrite.size());
                     messageTimes = new ArrayList(_messagesToWriteTimes.size());
@@ -80,16 +79,7 @@ class ClientWriterRunner implements Runnable {
                 } 
             }
             
-            if (messages == null) {
-                try {
-                    synchronized (_activityLock) {
-                        _activityLock.wait();
-                    }
-                } catch (InterruptedException ie) {
-                    if (_log.shouldLog(Log.WARN))
-                        _log.warn("Interrupted while waiting for activity", ie);
-                }
-            } else {
+            if (messages != null) {
                 for (int i = 0; i < messages.size(); i++) {
                     I2CPMessage msg = (I2CPMessage)messages.get(i);
                     Long when = (Long)messageTimes.get(i);

router/java/src/net/i2p/router/transport/tcp/TCPTransport.java

@@ -769,8 +769,8 @@ public class TCPTransport extends TransportImpl {
     /** Make this stuff pretty (only used in the old console) */
     public String renderStatusHTML() { 
         StringBuffer buf = new StringBuffer(1024);
-        buf.append("<b>Connections:</b><ul>\n");
         synchronized (_connectionLock) {
+            buf.append("<b>Connections (").append(_connectionsByIdent.size()).append("):</b><ul>\n");
             for (Iterator iter = _connectionsByIdent.values().iterator(); iter.hasNext(); ) {
                 TCPConnection con = (TCPConnection)iter.next();
                 buf.append("<li>");