From 96c565d486e5f64b9db13251e19fd05432c4f2f7 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 26 Jun 2018 18:45:11 +0000 Subject: [PATCH] Router: Misc. javadocs and debug --- .../com/southernstorm/noise/protocol/SymmetricState.java | 1 - router/java/src/net/i2p/data/router/RouterInfo.java | 8 +++----- router/java/src/net/i2p/router/OutNetMessage.java | 6 +++--- router/java/src/net/i2p/router/RouterVersion.java | 2 +- .../i2p/router/transport/crypto/DHSessionKeyBuilder.java | 3 +-- .../src/net/i2p/router/transport/udp/UDPTransport.java | 2 +- .../java/src/net/i2p/router/tunnel/pool/TunnelPool.java | 2 +- 7 files changed, 10 insertions(+), 14 deletions(-) diff --git a/router/java/src/com/southernstorm/noise/protocol/SymmetricState.java b/router/java/src/com/southernstorm/noise/protocol/SymmetricState.java index 398f0bc9e..5f676f84b 100644 --- a/router/java/src/com/southernstorm/noise/protocol/SymmetricState.java +++ b/router/java/src/com/southernstorm/noise/protocol/SymmetricState.java @@ -72,7 +72,6 @@ class SymmetricState implements Destroyable { * Constructs a new symmetric state object. * Noise protocol name is hardcoded. * - * @param protocolName The name of the Noise protocol, which is assumed to be valid. * @param cipherName The name of the cipher within protocolName. * @param hashName The name of the hash within protocolName. * diff --git a/router/java/src/net/i2p/data/router/RouterInfo.java b/router/java/src/net/i2p/data/router/RouterInfo.java index 95b8ed728..7d49b9a92 100644 --- a/router/java/src/net/i2p/data/router/RouterInfo.java +++ b/router/java/src/net/i2p/data/router/RouterInfo.java @@ -157,11 +157,9 @@ public class RouterInfo extends DatabaseEntry { } /** - * Retrieve the approximate date on which the info was published - * (essentially a version number for the routerInfo structure, except that - * it also contains freshness information - whether or not the router is - * currently publishing its information). This should be used to help expire - * old routerInfo structures + * Retrieve the timestamp on which the info was published, + * essentially a version number for the RouterInfo. + * This should be used to expire old RouterInfo structures. * */ public long getPublished() { diff --git a/router/java/src/net/i2p/router/OutNetMessage.java b/router/java/src/net/i2p/router/OutNetMessage.java index fc6f8b71b..3c0a77a2b 100644 --- a/router/java/src/net/i2p/router/OutNetMessage.java +++ b/router/java/src/net/i2p/router/OutNetMessage.java @@ -371,12 +371,12 @@ public class OutNetMessage implements CDPQEntry { buf.append(getMessageType()); buf.append(" ID ").append(_messageId); } - buf.append(" expiring on ").append(new Date(_expiration)); + buf.append(" expiring ").append(new Date(_expiration)); buf.append(" priority ").append(_priority); if (_failedTransports != null) - buf.append(" failed delivery on transports ").append(_failedTransports); + buf.append(" failed transports: ").append(_failedTransports); if (_target == null) - buf.append(" targetting no one in particular..."); + buf.append(" (null target)"); else buf.append(" targetting ").append(_target.getIdentity().getHash().toBase64()); if (_onReply != null) diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index a411b0099..87e5bffca 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 = 0; + public final static long BUILD = 1; /** for example "-test" */ public final static String EXTRA = ""; diff --git a/router/java/src/net/i2p/router/transport/crypto/DHSessionKeyBuilder.java b/router/java/src/net/i2p/router/transport/crypto/DHSessionKeyBuilder.java index c49a4cf41..8fd8da26f 100644 --- a/router/java/src/net/i2p/router/transport/crypto/DHSessionKeyBuilder.java +++ b/router/java/src/net/i2p/router/transport/crypto/DHSessionKeyBuilder.java @@ -572,8 +572,7 @@ public class DHSessionKeyBuilder { */ public void returnUnused(DHSessionKeyBuilder builder) { if (builder.getPeerPublicValue() != null) { - if (_log.shouldLog(Log.WARN)) - _log.warn("builder returned used"); + _log.error("builder returned used", new Exception()); return; } _context.statManager().addRateData("crypto.DHReused", 1); diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java index e88ce2c64..ddc386269 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -310,7 +310,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority int port = getRequestedPort(); if (port < 0) { port = UDPEndpoint.selectRandomPort(_context); - Map changes = new HashMap(); + Map changes = new HashMap(2); changes.put(PROP_INTERNAL_PORT, Integer.toString(port)); changes.put(PROP_EXTERNAL_PORT, Integer.toString(port)); _context.router().saveConfig(changes, null); 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 5f884f987..e9da3c72a 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java @@ -305,7 +305,7 @@ public class TunnelPool { /** * Return a list of tunnels in the pool * - * @return list of TunnelInfo objects + * @return A copy of the list of TunnelInfo objects */ public List listTunnels() { synchronized (_tunnels) {