2006-03-21 jrandom

* Avoid a very strange (unconfirmed) bug that people using the systray's
      browser picker dialog could cause by disabling the GUI-based browser
      picker.
    * Cut down on subsequent streaming lib reset packets transmitted
    * Use a larger MTU more often
    * Allow netDb searches to query shitlisted peers, as the queries are
      indirect.
    * Add an option to disable non-floodfill netDb searches (non-floodfill
      searches are used by default, but can be disabled by adding
      netDb.floodfillOnly=true to the advanced config)

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

@@ -46,7 +46,9 @@ public class StatSummarizer implements Runnable {
                                                     ",router.activeSendPeers.60000" +
                                                     ",tunnel.acceptLoad.60000" +
                                                     ",client.sendAckTime.60000" +
-                                                    ",client.dispatchNoACK.60000";
+                                                    ",client.dispatchNoACK.60000" +
+                                                    ",transport.sendMessageFailureLifetime.60000" +
+                                                    ",transport.sendProcessingTime.60000";
     
     private String adjustDatabases(String oldSpecs) {
         String spec = _context.getProperty("stat.summaries", DEFAULT_DATABASES);

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

@@ -210,6 +210,11 @@ public class Connection {
             }
         }
         if (packet != null) {
+            if (packet.isFlagSet(Packet.FLAG_RESET)) {
+                // sendReset takes care to prevent too-frequent RSET transmissions
+                sendReset();
+                return;
+            }
             ResendPacketEvent evt = (ResendPacketEvent)packet.getResendEvent();
             if (evt != null) {
                 boolean sent = evt.retransmit(false);
@@ -240,9 +245,11 @@ public class Connection {
             _disconnectScheduledOn = _context.clock().now();
             SimpleTimer.getInstance().addEvent(new DisconnectEvent(), DISCONNECT_TIMEOUT);
         }
+        long now = _context.clock().now();
+        if (_resetSentOn + 10*1000 > now) return; // don't send resets too fast
         _resetSent = true;
         if (_resetSentOn <= 0)
-            _resetSentOn = _context.clock().now();
+            _resetSentOn = now;
         if ( (_remotePeer == null) || (_sendStreamId <= 0) ) return;
         PacketLocal reply = new PacketLocal(_context, _remotePeer);
         reply.setFlag(Packet.FLAG_RESET);

apps/systray/java/src/net/i2p/apps/systray/SysTray.java

@@ -169,7 +169,14 @@ public class SysTray implements SysTrayMenuListener {
         _itemOpenConsole.addSysTrayMenuListener(this);
 //        _sysTrayMenu.addItem(_itemShutdown);
 //        _sysTrayMenu.addSeparator();
-        _sysTrayMenu.addItem(_itemSelectBrowser);
+        // hide it, as there have been reports of b0rked behavior on some JVMs.
+        // specifically, that on XP & sun1.5.0.1, a user launching i2p w/out the
+        // service wrapper would create netDb/, peerProfiles/, and other files
+        // underneath each directory browsed to - as if the router's "." directory
+        // is changing whenever the itemSelectBrowser's JFileChooser changed
+        // directories.  This has not been reproduced or confirmed yet, but is
+        // pretty scary, and this function isn't too necessary.
+        //_sysTrayMenu.addItem(_itemSelectBrowser);
         _sysTrayMenu.addItem(_itemOpenConsole);
         refreshDisplay();
     }