Log tweaks and minor cleanups, -15

core/java/src/net/i2p/crypto/TransientSessionKeyManager.java

@@ -518,14 +518,15 @@ public class TransientSessionKeyManager extends SessionKeyManager {
     public void tagsReceived(SessionKey key, Set<SessionTag> sessionTags, long expire) {
         TagSet tagSet = new TagSet(sessionTags, key, _context.clock().now() + expire,
                                    _rcvTagSetID.incrementAndGet());
-        if (_log.shouldLog(Log.INFO))
+        if (_log.shouldLog(Log.INFO)) {
             _log.info("Received " + tagSet);
+            if (_log.shouldLog(Log.DEBUG))
+                _log.debug("Tags: " + DataHelper.toString(sessionTags));
+        }
         TagSet old = null;
         SessionTag dupTag = null;
         synchronized (_inboundTagSets) {
             for (SessionTag tag : sessionTags) {
-                //if (_log.shouldLog(Log.DEBUG))
-                //    _log.debug("Receiving tag " + tag + " in tagSet: " + tagSet);
                 old = _inboundTagSets.put(tag, tagSet);
                 if (old != null) {
                     if (!old.getAssociatedKey().equals(tagSet.getAssociatedKey())) {

history.txt

@@ -1,3 +1,18 @@
+2013-10-29 zzz
+ * InboundMessageDistributor:
+   - Don't discard an encrypted DSRM received
+     down a tunnel, just strip the hashes like we do for unencrypted
+   - Send a store of our own encrypted LS received down a tunnel to
+     the InNetMessagePool so the FloodfillVerifyStoreJob will see it.
+ * NetDB: Fix LS store verifies with encrypted replies
+   by storing the tagset with the correct SKM for the inbound tunnel used.
+   Broken since 0.9.7 when it was introduced.
+ * Tunnels:
+   - Build a new exploratory fallback tunnel in the BuildExecutor
+     loop if we run out.
+   - Don't use closest expl. tunnel as the paired tunnel for a build,
+     use a random one instead (partially back out change from -12)
+
 2013-10-29 meeh
  * Adding no.i2p registrar
 

router/java/src/net/i2p/router/InNetMessagePool.java

@@ -130,7 +130,7 @@ public class InNetMessagePool implements Service {
                 _log.info("Received inbound " 
                           + " with id " + messageBody.getUniqueId()
                           + " expiring on " + exp
-                          + " of type " + messageBody.getClass().getName());
+                          + " of type " + messageBody.getClass().getSimpleName());
         
         //if (messageBody instanceof DataMessage) {
         //    _context.statManager().getStatLog().addData(fromRouterHash.toBase64().substring(0,6), "udp.floodDataReceived", 1, 0);
@@ -185,7 +185,7 @@ public class InNetMessagePool implements Service {
 
                 if (_log.shouldLog(Log.DEBUG))
                     _log.debug("Add message to the inNetMessage pool - builder: " + builder 
-                               + " message class: " + messageBody.getClass().getName());
+                               + " message class: " + messageBody.getClass().getSimpleName());
 
                 if (builder != null) {
                     Job job = builder.createJob(messageBody, fromRouter, 

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

@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 14;
+    public final static long BUILD = 15;
 
     /** for example "-test" */
     public final static String EXTRA = "";

router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java

@@ -250,7 +250,8 @@ public class TunnelPool {
         TunnelInfo rv = null;
         synchronized (_tunnels) {
             if (!_tunnels.isEmpty()) {
-                Collections.sort(_tunnels, new TunnelInfoComparator(closestTo, avoidZeroHop));
+                if (_tunnels.size() > 1)
+                    Collections.sort(_tunnels, new TunnelInfoComparator(closestTo, avoidZeroHop));
                 for (TunnelInfo info : _tunnels) {
                     if (info.getExpiration() > _context.clock().now()) {
                         rv = info;

router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java

@@ -271,9 +271,6 @@ public class TunnelPoolManager implements TunnelManagerFacade {
     
     /** @return number of inbound exploratory tunnels */
     public int getFreeTunnelCount() { 
-        if (_inboundExploratory == null)
-            return 0;
-        else
             return _inboundExploratory.size(); 
     }