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

NTCP: Don't publish IP at startup when configured as firewalled

Browse Source 
Ensure we have an outbound NTCP2 address published even when configured as firewalled
This commit is contained in:
zzz
2021-02-25 10:59:15 -05:00
parent daf894dbe3
commit f09de33978
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java
View File

@@ -865,18 +865,23 @@ public class NTCPTransport extends TransportImpl {
// all detected interfaces
Collection<InetAddress> addrs = getSavedLocalAddresses();
if (!addrs.isEmpty() && !_context.router().isHidden()) {
int count = 0;
for (InetAddress ia : addrs) {
boolean ipv6 = ia instanceof Inet6Address;
if ((ipv6 && (isIPv6Firewalled() || _context.getBooleanProperty(PROP_IPV6_FIREWALLED))) ||
(!ipv6 && isIPv4Firewalled()))
continue;
OrderedProperties props = new OrderedProperties();
props.setProperty(RouterAddress.PROP_HOST, ia.getHostAddress());
props.setProperty(RouterAddress.PROP_PORT, Integer.toString(port));
addNTCP2Options(props);
boolean ipv6 = ia instanceof Inet6Address;
if (!ipv6 || !_context.getBooleanProperty(PROP_IPV6_FIREWALLED)) {
int cost = getDefaultCost(ipv6);
myAddress = new RouterAddress(getPublishStyle(), props, cost);
replaceAddress(myAddress);
}
int cost = getDefaultCost(ipv6);
myAddress = new RouterAddress(getPublishStyle(), props, cost);
replaceAddress(myAddress);
count++;
}
if (count <= 0)
setOutboundNTCP2Address();
} else if (_enableNTCP2) {
setOutboundNTCP2Address();
}