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

fixup after prop

Browse Source
This commit is contained in:
zzz
2013-05-06 13:30:11 +00:00
parent 31531ee882
commit 228e6d7d03
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,7 +88,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
private RouterAddress _externalAddress;
/**
* Port number on which we can be reached, or -1 for error, or 0 for unset
* Do NOT use this for current internal port - use _endpoint.getListenPort()
* Do NOT use this for current internal port - use UDPEndpoint.getListenPort()
*/
private int _externalListenPort;
/** IP address of externally reachable host, or null */
@@ -324,7 +324,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
// we will check below after starting up the endpoint.
int port;
int oldIPort = _context.getProperty(PROP_INTERNAL_PORT, -1);
int oldBindPort = _endpoint != null ? _endpoint.getListenPort() : -1;
int oldBindPort = getIPv4ListenPort();
int oldEPort = _context.getProperty(PROP_EXTERNAL_PORT, -1);
if (oldIPort > 0)
port = oldIPort;
@@ -462,6 +462,20 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
return ia.getAddress();
}
/**
* The current port of the first IPv4 endpoint.
* To be enhanced to handle multiple IPv4 endpoints.
* @return port or -1
* @since IPv6
*/
private int getIPv4ListenPort() {
for (UDPEndpoint endpoint : _endpoints) {
if (endpoint.isIPv4())
return endpoint.getListenPort();
}
return -1;
}
/**
* The current or configured internal port.
* UDPEndpoint should always be instantiated (and a random port picked if not configured)
@@ -470,13 +484,11 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
*/
@Override
public int getRequestedPort() {
if (_endpoint != null) {
int rv = _endpoint.getListenPort();
if (rv > 0)
return rv;
}
int rv = getIPv4ListenPort();
if (rv > 0)
return rv;
// fallbacks
int rv = _context.getProperty(PROP_INTERNAL_PORT, -1);
rv = _context.getProperty(PROP_INTERNAL_PORT, -1);
if (rv > 0)
return rv;
return _context.getProperty(PROP_EXTERNAL_PORT, -1);
@@ -2588,14 +2600,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
long pingCutoff = now - (2 * 60*60*1000);
long pingFirewallCutoff = now - PING_FIREWALL_CUTOFF;
boolean shouldPingFirewall = _reachabilityStatus != CommSystemFacade.STATUS_OK;
int currentListenPort = -1;
for (UDPEndpoint endpoint : _endpoints) {
// hack, first IPv4 endpoint, FIXME
if (endpoint.isIPv4()) {
currentListenPort = endpoint.getListenPort();
break;
}
}
int currentListenPort = getIPv4ListenPort();
boolean pingOneOnly = shouldPingFirewall && _externalListenPort == currentListenPort;
boolean shortLoop = shouldPingFirewall;
_expireBuffer.clear();