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

Transport: Publish IPv6 address on transition to non-firewalled (ticket #2175)

Browse Source
This commit is contained in:
zzz
2019-10-25 13:27:30 +00:00
parent df6465f802
commit eee9e47cac
3 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -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 = 1;
public final static long BUILD = 2;
/** for example "-test" */
public final static String EXTRA = "";

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

@ -878,7 +878,8 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
if (!isIPv4Firewalled())
setReachabilityStatus(Status.IPV4_OK_IPV6_UNKNOWN);
} else if (ip.length == 16) {
// TODO this will set non-firewalled every time our IPv6 address changes
// TODO if we start periodically scanning our interfaces (we don't now),
// this will set non-firewalled every time our IPv6 address changes
if (!isIPv6Firewalled())
setReachabilityStatus(Status.IPV4_UNKNOWN_IPV6_OK, true);
}
@ -3092,6 +3093,19 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
status == Status.IPV4_UNKNOWN_IPV6_FIREWALLED ||
status == Status.IPV4_DISABLED_IPV6_FIREWALLED) {
removeExternalAddress(true, true);
} else if ((old == Status.IPV4_OK_IPV6_FIREWALLED ||
old == Status.IPV4_UNKNOWN_IPV6_FIREWALLED ||
old == Status.IPV4_DISABLED_IPV6_FIREWALLED) &&
(status == Status.OK ||
status == Status.IPV4_UNKNOWN_IPV6_OK ||
status == Status.IPV4_FIREWALLED_IPV6_OK ||
status == Status.IPV4_DISABLED_IPV6_OK ||
status == Status.IPV4_SNAT_IPV6_OK) &&
_lastOurIPv6 != null &&
!explicitAddressSpecified()){
String addr = Addresses.toString(_lastOurIPv6);
int port = _context.getProperty(PROP_EXTERNAL_PORT, -1);
rebuildExternalAddress(addr, port, true);
}
} else {
rebuildExternalAddress();