From fb641187b8ddc9047c9399792a1703bf6d46593f Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 2 Dec 2014 13:42:58 +0000 Subject: [PATCH] use new getVersion() --- .../src/net/i2p/data/i2np/DatabaseLookupMessage.java | 5 ++--- .../net/i2p/router/networkdb/kademlia/StoreJob.java | 12 +++--------- .../net/i2p/router/peermanager/ProfileOrganizer.java | 4 ++-- .../net/i2p/router/transport/ntcp/NTCPTransport.java | 4 ++-- .../net/i2p/router/transport/udp/UDPTransport.java | 6 +++--- .../net/i2p/router/tunnel/pool/BuildRequestor.java | 4 +--- .../i2p/router/tunnel/pool/TunnelPeerSelector.java | 8 +++----- 7 files changed, 16 insertions(+), 27 deletions(-) diff --git a/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java b/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java index 63c33b063..9aa7530d3 100644 --- a/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java +++ b/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java @@ -214,9 +214,8 @@ public class DatabaseLookupMessage extends FastI2NPMessageImpl { public static boolean supportsEncryptedReplies(RouterInfo to) { if (to == null) return false; - String v = to.getOption("router.version"); - return v != null && - VersionComparator.comp(v, MIN_ENCRYPTION_VERSION) >= 0; + String v = to.getVersion(); + return VersionComparator.comp(v, MIN_ENCRYPTION_VERSION) >= 0; } /** diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java index 81bef6950..809b96015 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java @@ -513,9 +513,7 @@ class StoreJob extends JobImpl { * @since 0.7.10 */ private static boolean supportsEncryption(RouterInfo ri) { - String v = ri.getOption("router.version"); - if (v == null) - return false; + String v = ri.getVersion(); return VersionComparator.comp(v, MIN_ENCRYPTION_VERSION) >= 0; } @@ -535,9 +533,7 @@ class StoreJob extends JobImpl { } if (type == null) return false; - String v = ri.getOption("router.version"); - if (v == null) - return false; + String v = ri.getVersion(); String since = type.getSupportedSince(); return VersionComparator.comp(v, since) >= 0; } @@ -549,9 +545,7 @@ class StoreJob extends JobImpl { * @since 0.9.12 */ public static boolean supportsBigLeaseSets(RouterInfo ri) { - String v = ri.getOption("router.version"); - if (v == null) - return false; + String v = ri.getVersion(); return VersionComparator.comp(v, MIN_BIGLEASESET_VERSION) >= 0; } diff --git a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java index 7ebc4ce93..87f751bdc 100644 --- a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java +++ b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java @@ -697,9 +697,9 @@ public class ProfileOrganizer { // they probably don't have a TCP hole punched in their firewall either. RouterInfo info = _context.netDb().lookupRouterInfoLocally(peer); if (info != null) { - String v = info.getOption("router.version"); + String v = info.getVersion(); // this only works if there is no 0.6.1.34! - if (v != null && (!v.equals("0.6.1.33")) && + if ((!v.equals("0.6.1.33")) && v.startsWith("0.6.1.") && info.getTargetAddress("NTCP") == null) l.add(peer); else { diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java index 1a7ec1ed4..b48dab090 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java @@ -375,8 +375,8 @@ public class NTCPTransport extends TransportImpl { if (us != null) { RouterIdentity id = us.getIdentity(); if (id.getSigType() != SigType.DSA_SHA1) { - String v = toAddress.getOption("router.version"); - if (v != null && VersionComparator.comp(v, MIN_SIGTYPE_VERSION) < 0) { + String v = toAddress.getVersion(); + if (VersionComparator.comp(v, MIN_SIGTYPE_VERSION) < 0) { markUnreachable(peer); return null; } 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 80a383c9d..efed5b13b 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -1232,7 +1232,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority _context.simpleScheduler().addEvent(new RemoveDropList(remote), DROPLIST_PERIOD); } markUnreachable(peerHash); - _context.banlist().banlistRouter(peerHash, "Part of the wrong network, version = " + ((RouterInfo) entry).getOption("router.version")); + _context.banlist().banlistRouter(peerHash, "Part of the wrong network, version = " + ((RouterInfo) entry).getVersion()); //_context.banlist().banlistRouter(peerHash, "Part of the wrong network", STYLE); dropPeer(peerHash, false, "wrong network"); if (_log.shouldLog(Log.WARN)) @@ -1578,8 +1578,8 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority if (us != null) { RouterIdentity id = us.getIdentity(); if (id.getSigType() != SigType.DSA_SHA1) { - String v = toAddress.getOption("router.version"); - if (v != null && VersionComparator.comp(v, MIN_SIGTYPE_VERSION) < 0) { + String v = toAddress.getVersion(); + if (VersionComparator.comp(v, MIN_SIGTYPE_VERSION) < 0) { markUnreachable(to); return null; } diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java b/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java index 493db21ab..4e74aedb5 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java +++ b/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java @@ -238,9 +238,7 @@ abstract class BuildRequestor { RouterInfo ri = ctx.netDb().lookupRouterInfoLocally(h); if (ri == null) return false; - String v = ri.getOption("router.version"); - if (v == null) - return false; + String v = ri.getVersion(); return VersionComparator.comp(v, MIN_VARIABLE_VERSION) >= 0; } diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java index fa3f5e75d..74fc53e83 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java @@ -349,9 +349,7 @@ public abstract class TunnelPeerSelector { if (known != null) { for (int i = 0; i < known.size(); i++) { RouterInfo peer = known.get(i); - String v = peer.getOption("router.version"); - if (v == null) - continue; + String v = peer.getVersion(); // RI sigtypes added in 0.9.16 // SSU inbound connection bug fixed in 0.9.17, but it won't bid, so NTCP only, // no need to check @@ -402,8 +400,8 @@ public abstract class TunnelPeerSelector { // so don't exclude it based on published capacity // minimum version check - String v = peer.getOption("router.version"); - if (v == null || VersionComparator.comp(v, MIN_VERSION) < 0) + String v = peer.getVersion(); + if (VersionComparator.comp(v, MIN_VERSION) < 0) return true; // uptime is always spoofed to 90m, so just remove all this