2006-01-22 jrandom

* New tunnel build process - does not use the new crypto or new peer
      selection strategies.  However, it does drop the fallback tunnel
      procedure, except for tunnels who are configured to allow them, or for
      the exploratory pool during bootstrapping or after a catastrophic
      failure.  This new process prefers to fail rather than use too-short
      tunnels, so while it can do some pretty aggressive tunnel rebuilding,
      it may expose more tunnel failures to the user.
    * Always prefer normal tunnels to fallback tunnels.
    * Potential fix for a bug while changing i2cp settings on I2PSnark (thanks
      bar!)
    * Do all of the netDb entry writing in a separate thread, avoiding
      duplicates and batching them up.

apps/i2psnark/java/src/org/klomp/snark/ConnectionAcceptor.java

@@ -125,7 +125,13 @@ public class ConnectionAcceptor implements Runnable
                 if (socketChanged) {
                     continue;
                 } else {
-                    Snark.debug("Null socket accepted, but socket wasn't changed?", Snark.ERROR);
+                    I2PServerSocket ss = I2PSnarkUtil.instance().getServerSocket();
+                    if (ss != serverSocket) {
+                        serverSocket = ss;
+                    } else {
+                        Snark.debug("Null socket accepted, but socket wasn't changed?", Snark.ERROR);
+                        try { Thread.sleep(10*1000); } catch (InterruptedException ie) {}
+                    }
                 }
             } else {
                 Thread t = new I2PThread(new Handler(socket), "Connection-" + socket);

apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java

@@ -52,7 +52,8 @@ public class SnarkManager implements Snark.CompleteListener {
             while (_messages.size() > MAX_MESSAGES)
                 _messages.remove(0);
         }
-        _log.info("MSG: " + message);
+        if (_log.shouldLog(Log.INFO))
+            _log.info("MSG: " + message);
     }
     
     /** newest last */