From d2ee5b96ad7dafa0b8763da8e61e84e1b50556ff Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 29 Oct 2013 21:03:20 +0000 Subject: [PATCH] Log tweaks and minor cleanups, -15 --- .../i2p/crypto/TransientSessionKeyManager.java | 7 ++++--- history.txt | 15 +++++++++++++++ .../java/src/net/i2p/router/InNetMessagePool.java | 4 ++-- router/java/src/net/i2p/router/RouterVersion.java | 2 +- .../net/i2p/router/tunnel/pool/TunnelPool.java | 3 ++- .../i2p/router/tunnel/pool/TunnelPoolManager.java | 3 --- 6 files changed, 24 insertions(+), 10 deletions(-) diff --git a/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java b/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java index a9e3a2d0c..0d2d02436 100644 --- a/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java +++ b/core/java/src/net/i2p/crypto/TransientSessionKeyManager.java @@ -518,14 +518,15 @@ public class TransientSessionKeyManager extends SessionKeyManager { public void tagsReceived(SessionKey key, Set 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())) { diff --git a/history.txt b/history.txt index 2beeb0b0c..5e2cd7061 100644 --- a/history.txt +++ b/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 diff --git a/router/java/src/net/i2p/router/InNetMessagePool.java b/router/java/src/net/i2p/router/InNetMessagePool.java index 4d5c1f506..a4396dc8d 100644 --- a/router/java/src/net/i2p/router/InNetMessagePool.java +++ b/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, diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 31c35f8c3..ea17ad55f 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/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 = ""; diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java index aa96135fa..4b16a8ab6 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java +++ b/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; diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java index dd0c026f3..f57fff8cb 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java +++ b/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(); }