2004-11-29 jrandom

* Reduced contention for local client delivery
    * Drop the new code that munges the wrapper.config.  Instead, updates that
      need to change it will include their own wrapper.config in the
      i2pupdate.zip, overwriting the existing file.  If the file
      "wrapper.config.updated" is included, it is deleted at first opportunity
      and the router shut down, displaying a notice that the router must be
      started again cleanly to allow the changes to the wrapper.config to take
      effect.
    * Properly stop accept()ing I2PSocket connections if we close down the
      session (duh).
    * Make sure we cancel any outstanding Packets in flight when a connection
      is terminated (thanks susi!)
    * Split up the I2PTunnel closing a little further.

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

@@ -350,31 +350,18 @@ public class Connection {
         disconnect(cleanDisconnect, true);
     }
     void disconnect(boolean cleanDisconnect, boolean removeFromConMgr) {
-        if (!_connected) return;
-        _connected = false;
         synchronized (_connectLock) { _connectLock.notifyAll(); }
         if (_log.shouldLog(Log.DEBUG))
             _log.debug("Disconnecting " + toString(), new Exception("discon"));
         
-        if (cleanDisconnect) {
+        if (cleanDisconnect && _connected) {
             // send close packets and schedule stuff...
             _outputStream.closeInternal();
             _inputStream.close();
         } else {
-            doClose();
-            boolean tagsCancelled = false;
-            synchronized (_outboundPackets) {
-                for (Iterator iter = _outboundPackets.values().iterator(); iter.hasNext(); ) {
-                    PacketLocal pl = (PacketLocal)iter.next();
-                    if ( (pl.getTagsSent() != null) && (pl.getTagsSent().size() > 0) )
-                        tagsCancelled = true;
-                    pl.cancelled();
-                }
-                _outboundPackets.clear();
-                _outboundPackets.notifyAll();
-            }
-            if (tagsCancelled)
-                _context.sessionKeyManager().failTags(_remotePeer.getPublicKey());
+            if (_connected)
+                doClose();
+            killOutstandingPackets();
         }
         if (removeFromConMgr) {
             if (!_disconnectScheduled) {
@@ -382,6 +369,7 @@ public class Connection {
                 SimpleTimer.getInstance().addEvent(new DisconnectEvent(), DISCONNECT_TIMEOUT);
             }
         }
+        _connected = false;
     }
     
     void disconnectComplete() {
@@ -409,6 +397,10 @@ public class Connection {
             _connectionManager.removeConnection(this);
         }
 
+        killOutstandingPackets();
+    }
+    
+    private void killOutstandingPackets() {
         boolean tagsCancelled = false;
         synchronized (_outboundPackets) {
             for (Iterator iter = _outboundPackets.values().iterator(); iter.hasNext(); ) {
@@ -422,7 +414,6 @@ public class Connection {
         }            
         if (tagsCancelled)
             _context.sessionKeyManager().failTags(_remotePeer.getPublicKey());
-
     }
     
     private class DisconnectEvent implements SimpleTimer.TimedEvent {
@@ -432,6 +423,7 @@ public class Connection {
                           + Connection.this.toString());
         }
         public void timeReached() {
+            killOutstandingPackets();
             if (_log.shouldLog(Log.INFO))
                 _log.info("Connection disconnect timer complete, drop the con "
                           + Connection.this.toString());

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

@@ -31,7 +31,12 @@ class ConnectionHandler {
         _acceptTimeout = DEFAULT_ACCEPT_TIMEOUT;
     }
     
-    public void setActive(boolean active) { _active = active; }
+    public void setActive(boolean active) { 
+        synchronized (_synQueue) {
+            _active = active; 
+            _synQueue.notifyAll(); // so we break from the accept()
+        }
+    }
     public boolean getActive() { return _active; }
     
     public void receiveNewSyn(Packet packet) {
@@ -66,8 +71,17 @@ class ConnectionHandler {
         while (true) {
             if ( (timeoutMs > 0) && (expiration < _context.clock().now()) )
                 return null;
-            if (!_active) 
+            if (!_active) {
+                // fail all the ones we had queued up
+                synchronized (_synQueue) {
+                    for (int i = 0; i < _synQueue.size(); i++) {
+                        Packet packet = (Packet)_synQueue.get(i);
+                        sendReset(packet);
+                    }
+                    _synQueue.clear();
+                }
                 return null;
+            }
             
             Packet syn = null;
             synchronized (_synQueue) {