AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPnP: IPv6 part 11

Browse Source 
Change IPv6 last-firewalled config after UPnP success
Minor cleanup in changeAddress()
This commit is contained in:
zzz
2021-03-02 09:05:11 -05:00
parent e1cd22e6ee
commit d3563752a1
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
router/java/src/net/i2p/router/transport/udp/UDPTransport.java
View File

@@ -1025,6 +1025,9 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
if (getExternalIP() != null && !isIPv4Firewalled())
setReachabilityStatus(Status.IPV4_OK_IPV6_UNKNOWN);
} else if (ip.length == 16) {
boolean fwOld = _context.getBooleanProperty(PROP_IPV6_FIREWALLED);
if (!fwOld)
_context.router().saveConfig(PROP_IPV6_FIREWALLED, "false");
if (!isIPv6Firewalled())
setReachabilityStatus(Status.IPV4_UNKNOWN_IPV6_OK, true);
}
@@ -1241,7 +1244,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
} else if (updated) {
_context.statManager().addRateData("udp.addressUpdated", 1);
Map<String, String> changes = new HashMap<String, String>();
if (ourIP.length == 4 && !fixedPort)
if (!isIPv6 && !fixedPort)
changes.put(PROP_EXTERNAL_PORT, Integer.toString(ourPort));
// queue a country code lookup of the new IP
_context.commSystem().queueLookup(ourIP);
@@ -1249,7 +1252,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
// IPV4 ONLY
String oldIP = _context.getProperty(PROP_IP);
String newIP = Addresses.toString(ourIP);
if (ourIP.length == 4 && !newIP.equals(oldIP)) {
if (!isIPv6 && !newIP.equals(oldIP)) {
long lastChanged = 0;
long now = _context.clock().now();
String lcs = _context.getProperty(PROP_IP_CHANGE);
@@ -1284,10 +1287,10 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
_context.router().shutdown(Router.EXIT_HARD_RESTART);
// doesn't return
}
} else if (ourIP.length == 4 && !fixedPort) {
} else if (!isIPv6 && !fixedPort) {
// save PROP_EXTERNAL_PORT
_context.router().saveConfig(changes, null);
} else if (ourIP.length == 16) {
} else if (isIPv6) {
oldIP = _context.getProperty(PROP_IPV6);
if (!newIP.equals(oldIP)) {
changes.put(PROP_IPV6, newIP);