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

* NTCP: Remove published NTCP address if SSU becomes firewalled,

Browse Source 
to fix the "Firewalled with NTCP enabled" message
This commit is contained in:
zzz
2014-04-27 15:01:01 +00:00
parent 91d7a0ab98
commit 611ff6357e
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
View File

@@ -202,8 +202,15 @@ public class CommSystemFacadeImpl extends CommSystemFacade {
*/
@Override
public void notifyReplaceAddress(RouterAddress udpAddr) {
byte[] ip = udpAddr != null ? udpAddr.getIP() : null;
int port = udpAddr != null ? udpAddr.getPort() : 0;
byte[] ip = null;
int port = 0;
// Don't pass IP along if address has introducers
// Right now we publish the direct UDP address, even if publishing introducers,
// we probably shouldn't, see UDPTransport rebuildExternalAddress() TODO
if (udpAddr != null && udpAddr.getOption("ihost0") == null) {
ip = udpAddr.getIP();
port = udpAddr.getPort();
}
if (port < 0) {
Transport udp = _manager.getTransport(UDPTransport.STYLE);
if (udp != null)

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

@@ -578,6 +578,7 @@ public class NTCPTransport extends TransportImpl {
*
* Doesn't actually restart unless addr is non-null and
* the port is different from the current listen port.
* If addr is null, removes all addresses.
*
* If we had interface addresses before, we lost them.
*
@@ -591,6 +592,8 @@ public class NTCPTransport extends TransportImpl {
else
replaceAddress(addr);
// UDPTransport.rebuildExternalAddress() calls router.rebuildRouterInfo()
} else {
replaceAddress(null);
}
}
@@ -942,14 +945,14 @@ public class NTCPTransport extends TransportImpl {
nport = Integer.toString(port);
}
if (_log.shouldLog(Log.INFO))
_log.info("old: " + oport + " config: " + cport + " new: " + nport);
if (nport == null || nport.length() <= 0)
return;
_log.info("old port: " + oport + " config: " + cport + " new: " + nport);
//if (nport == null || nport.length() <= 0)
// return;
// 0.9.6 change
// Don't have NTCP "chase" SSU's external port,
// as it may change, possibly frequently.
//if (oport == null || ! oport.equals(nport)) {
if (oport == null) {
if (oport == null && nport != null && nport.length() > 0) {
newProps.setProperty(RouterAddress.PROP_PORT, nport);
changed = true;
}
@@ -993,7 +996,7 @@ public class NTCPTransport extends TransportImpl {
// but we probably only get here if the port is auto,
// otherwise createNTCPAddress() would have done it already
if (_log.shouldLog(Log.INFO))
_log.info("old: " + ohost + " config: " + name + " new: " + name);
_log.info("old host: " + ohost + " config: " + name + " new: " + name);
newProps.setProperty(RouterAddress.PROP_HOST, name);
changed = true;
} else if (ohost == null || ohost.length() <= 0) {
@@ -1004,7 +1007,7 @@ public class NTCPTransport extends TransportImpl {
// because UPnP was successful, but a subsequent SSU Peer Test determines
// we are still firewalled (SW firewall, bad UPnP indication, etc.)
if (_log.shouldLog(Log.INFO))
_log.info("old: " + ohost + " config: " + name + " new: null");
_log.info("old host: " + ohost + " config: " + name + " new: null");
newAddr = null;
changed = true;
}