2005-07-04 jrandom

* Within the tunnel, use xor(IV, msg[0:16]) as the flag to detect dups,
      rather than the IV by itself, preventing an attack that would let
      colluding internal adversaries tag a message to determine that they are
      in the same tunnel.  Thanks dvorak for the catch!
    * Drop long inactive profiles on startup and shutdown
    * /configstats.jsp: web interface to pick what stats to log
    * Deliver more session tags to account for wider window sizes
    * Cache some intermediate values in our HMACSHA256 and BC's HMAC
    * Track the client send rate (stream.sendBps and client.sendBpsRaw)
    * UrlLauncher: adjust the browser selection order
    * I2PAppContext: hooks for dummy HMACSHA256 and a weak PRNG
    * StreamSinkClient: add support for sending an unlimited amount of data
    * Migrate the tests out of the default build jars

2005-06-22  Comwiz
    * Migrate the core tests to junit

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

@@ -72,8 +72,8 @@ public class Connection {
     private long _lifetimeDupMessageSent;
     private long _lifetimeDupMessageReceived;
     
-    public static final long MAX_RESEND_DELAY = 20*1000;
-    public static final long MIN_RESEND_DELAY = 10*1000;
+    public static final long MAX_RESEND_DELAY = 10*1000;
+    public static final long MIN_RESEND_DELAY = 3*1000;
 
     /** wait up to 5 minutes after disconnection so we can ack/close packets */
     public static int DISCONNECT_TIMEOUT = 5*60*1000;

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

@@ -38,6 +38,10 @@ public class MessageOutputStream extends OutputStream {
      * size
      */
     private volatile int _nextBufferSize;
+    // rate calc helpers
+    private long _sendPeriodBeginTime;
+    private long _sendPeriodBytes;
+    private int _sendBps;
     
     public MessageOutputStream(I2PAppContext ctx, DataReceiver receiver) {
         this(ctx, receiver, Packet.MAX_PAYLOAD_SIZE);
@@ -55,6 +59,10 @@ public class MessageOutputStream extends OutputStream {
         _writeTimeout = -1;
         _passiveFlushDelay = 500;
         _nextBufferSize = -1;
+        _sendPeriodBeginTime = ctx.clock().now();
+        _sendPeriodBytes = 0;
+        _sendBps = 0;
+        _context.statManager().createRateStat("stream.sendBps", "How fast we pump data through the stream", "Stream", new long[] { 60*1000, 5*60*1000, 60*60*1000 });
         _flusher = new Flusher();
         if (_log.shouldLog(Log.DEBUG))
             _log.debug("MessageOutputStream created");
@@ -137,6 +145,21 @@ public class MessageOutputStream extends OutputStream {
         if ( (elapsed > 10*1000) && (_log.shouldLog(Log.DEBUG)) )
             _log.debug("wtf, took " + elapsed + "ms to write to the stream?", new Exception("foo"));
         throwAnyError();
+        updateBps(len);
+    }
+    
+    private void updateBps(int len) {
+        long now = _context.clock().now();
+        int periods = (int)Math.floor((now - _sendPeriodBeginTime) / 1000d);
+        if (periods > 0) {
+            // first term decays on slow transmission
+            _sendBps = (int)(((float)0.9f*((float)_sendBps/(float)periods)) + ((float)0.1f*((float)_sendPeriodBytes/(float)periods)));
+            _sendPeriodBytes = len;
+            _sendPeriodBeginTime = now;
+            _context.statManager().addRateData("stream.sendBps", _sendBps, 0);
+        } else {
+            _sendPeriodBytes += len;
+        }
     }
     
     public void write(int b) throws IOException {

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

@@ -119,6 +119,19 @@ public class PacketHandler {
     }
     
     private void receiveKnownCon(Connection con, Packet packet) {
+        if (packet.isFlagSet(Packet.FLAG_ECHO)) {
+            if (packet.getSendStreamId() != null) {
+                receivePing(packet);
+            } else if (packet.getReceiveStreamId() != null) {
+                receivePong(packet);
+            } else {
+                if (_log.shouldLog(Log.WARN))
+                    _log.warn("Echo packet received with no stream IDs: " + packet);
+            }
+            packet.releasePayload();
+            return;
+        } 
+        
         // the packet is pointed at a stream ID we're receiving on
         if (isValidMatch(con.getSendStreamId(), packet.getReceiveStreamId())) {
             // the packet's receive stream ID also matches what we expect
@@ -163,8 +176,19 @@ public class PacketHandler {
                 } else {
                     if (!con.getResetSent()) {
                         // someone is sending us a packet on the wrong stream 
-                        if (_log.shouldLog(Log.WARN))
-                            _log.warn("Received a packet on the wrong stream: " + packet + " connection: " + con);
+                        if (_log.shouldLog(Log.ERROR)) {
+                            Set cons = _manager.listConnections();
+                            StringBuffer buf = new StringBuffer(512);
+                            buf.append("Received a packet on the wrong stream: ");
+                            buf.append(packet);
+                            buf.append(" connection: ");
+                            buf.append(con);
+                            for (Iterator iter = cons.iterator(); iter.hasNext();) {
+                                Connection cur = (Connection)iter.next();
+                                buf.append(" ").append(cur);
+                            }
+                            _log.error(buf.toString(), new Exception("Wrong stream"));
+                        }
                     }
                     packet.releasePayload();
                 }