From 970be35084a4831564b293caaa04e7722b2fa361 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Fri, 18 Jun 2021 09:23:22 -0400
Subject: [PATCH] Transport: Remove 4/6 caps config
since 0.9.50 is out.
Log tweaks
---
.../i2p/router/transport/TransportImpl.java | 4 ----
.../router/transport/ntcp/NTCPTransport.java | 6 ++---
.../router/transport/udp/UDPTransport.java | 23 +++++--------------
3 files changed, 8 insertions(+), 25 deletions(-)
diff --git a/router/java/src/net/i2p/router/transport/TransportImpl.java b/router/java/src/net/i2p/router/transport/TransportImpl.java
index b59d409841..273f3b95f1 100644
--- a/router/java/src/net/i2p/router/transport/TransportImpl.java
+++ b/router/java/src/net/i2p/router/transport/TransportImpl.java
@@ -71,10 +71,6 @@ public abstract class TransportImpl implements Transport {
private static final long UNREACHABLE_PERIOD = 5*60*1000;
private static final long WAS_UNREACHABLE_PERIOD = 30*60*1000;
- /** @since 0.9.50 */
- protected static final String PROP_TRANSPORT_CAPS = "i2np.transportCaps";
- /** @since 0.9.50 */
- protected static final boolean ENABLE_TRANSPORT_CAPS = true;
/** @since 0.9.50 */
public static final String CAP_IPV4 = "4";
/** @since 0.9.50 */
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 acdf4c12ba..23ee8469be 100644
--- a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java
+++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java
@@ -893,8 +893,6 @@ public class NTCPTransport extends TransportImpl {
* @since 0.9.50
*/
private void setOutboundNTCP2Address(boolean ipv6) {
- if (!_context.getProperty(PROP_TRANSPORT_CAPS, ENABLE_TRANSPORT_CAPS))
- return;
// following is like addNTCP2Options() but adds 4 or 6 only,
// and returns if not appropriately configured
String caps;
@@ -1247,7 +1245,7 @@ public class NTCPTransport extends TransportImpl {
if (props.containsKey("host")) {
props.setProperty("i", _b64Ntcp2StaticIV);
props.remove("caps");
- } else if (_context.getProperty(PROP_TRANSPORT_CAPS, ENABLE_TRANSPORT_CAPS)) {
+ } else {
String caps;
TransportUtil.IPv6Config config = getIPv6Config();
if (config == IPV6_ONLY)
@@ -1714,7 +1712,7 @@ public class NTCPTransport extends TransportImpl {
if (success)
_log.warn("UPnP has opened the NTCP port: " + port + " via " + Addresses.toString(ip, externalPort));
else
- _log.warn("UPnP has failed to open the NTCP port: " + port + " reason: " + reason);
+ _log.warn("UPnP has failed to open the NTCP port: " + Addresses.toString(ip, externalPort) + " reason: " + reason);
}
// if SSU is disabled, externalAddressReceived() will update our address and call rebuildRouterInfo().
// getReachabilityStatus() should report correctly after address is updated.
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 d2b681cf24..4e01859644 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
@@ -1048,7 +1048,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
if (success)
_log.warn("UPnP has opened the SSU port: " + port + " via " + Addresses.toString(ip, externalPort));
else
- _log.warn("UPnP has failed to open the SSU port: " + port + " reason: " + reason);
+ _log.warn("UPnP has failed to open the SSU port: " + Addresses.toString(ip, externalPort) + " reason: " + reason);
}
if (success && ip != null) {
if (ip.length == 4) {
@@ -1812,7 +1812,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
}
/**
- * Rebuild the IPv4 external address if required
+ * Rebuild the IPv4 or IPv6 external address if required
*/
private void rebuildIfNecessary() {
synchronized (_rebuildLock) {
@@ -2363,7 +2363,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
*/
private RouterAddress rebuildExternalAddress(boolean ipv6) {
if (_log.shouldLog(Log.DEBUG))
- _log.debug("REA1");
+ _log.debug("REA1 ipv6? " + ipv6);
return rebuildExternalAddress(true, ipv6);
}
@@ -2383,7 +2383,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
*/
private RouterAddress rebuildExternalAddress(boolean allowRebuildRouterInfo, boolean ipv6) {
if (_log.shouldDebug())
- _log.debug("REA2 " + allowRebuildRouterInfo);
+ _log.debug("REA2 " + allowRebuildRouterInfo + " ipv6? " + ipv6);
// if the external port is specified, we want to use that to bind to even
// if we don't know the external host.
int port = _context.getProperty(PROP_EXTERNAL_PORT, -1);
@@ -2523,8 +2523,6 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
options = new OrderedProperties();
}
}
- if (!_context.getProperty(PROP_TRANSPORT_CAPS, ENABLE_TRANSPORT_CAPS))
- return null;
// As of 0.9.50, make an address with only 4/6 caps
String caps;
TransportUtil.IPv6Config config = getIPv6Config();
@@ -2586,8 +2584,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
// if we have explicit external addresses, they had better be reachable
String caps;
if (introducersRequired || !canIntroduce(isIPv6)) {
- if (!directIncluded &&
- _context.getProperty(PROP_TRANSPORT_CAPS, ENABLE_TRANSPORT_CAPS)) {
+ if (!directIncluded) {
if (isIPv6)
caps = CAP_TESTING_6;
else
@@ -2660,7 +2657,6 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
_log.info("Address rebuilt: " + addr, new Exception());
replaceAddress(addr);
if (!isIPv6 &&
- _context.getProperty(PROP_TRANSPORT_CAPS, ENABLE_TRANSPORT_CAPS) &&
getCurrentAddress(true) == null &&
getIPv6Config() != IPV6_DISABLED &&
hasIPv6Address()) {
@@ -2695,8 +2691,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
RouterAddress local = new RouterAddress(STYLE, localOpts, DEFAULT_COST);
replaceCurrentExternalAddress(local, isIPv6);
}
- if (!isIPv6 &&
- _context.getProperty(PROP_TRANSPORT_CAPS, ENABLE_TRANSPORT_CAPS)) {
+ if (!isIPv6) {
// Make an empty "4" address
OrderedProperties opts = new OrderedProperties();
opts.setProperty(UDPAddress.PROP_CAPACITY, CAP_IPV4);
@@ -2882,9 +2877,6 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
return false;
if (config == IPV6_DISABLED)
return false;
- // must be published with '6' cap
- if (!_context.getProperty(PROP_TRANSPORT_CAPS, ENABLE_TRANSPORT_CAPS))
- return false;
if (isIPv6Firewalled())
return true;
switch (status) {
@@ -2937,9 +2929,6 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
return false;
if (config == IPV6_DISABLED)
return false;
- // must be published with '6' cap
- if (!_context.getProperty(PROP_TRANSPORT_CAPS, ENABLE_TRANSPORT_CAPS))
- return false;
if (isIPv6Firewalled())
return true;
switch (status) {
--
GitLab