Author: toad
Date: 2008-04-19 15:18:52 +0000 (Sat, 19 Apr 2008)
New Revision: 19417
Modified:
trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
Log:
getUDPPortsNotForwarded(): be consistent. we were using
DEFINITELY_PORT_FORWARDED in the outer branches and maybe in the inner bits.
Modified: trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
===================================================================
--- trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2008-04-19
15:16:00 UTC (rev 19416)
+++ trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2008-04-19
15:18:52 UTC (rev 19417)
@@ -141,13 +141,13 @@
int darknetStatus =
node.darknetCrypto.getDetectedConnectivityStatus();
int opennetStatus = om == null ? AddressTracker.DONT_KNOW :
om.crypto.getDetectedConnectivityStatus();
if(om == null || opennetStatus ==
AddressTracker.DEFINITELY_PORT_FORWARDED) {
- if(darknetStatus ==
AddressTracker.DEFINITELY_PORT_FORWARDED) {
+ if(darknetStatus > AddressTracker.DONT_KNOW) {
return new int[] { };
} else {
return new int[] { (darknetStatus <
AddressTracker.DONT_KNOW ? -1 : 1) * node.getDarknetPortNumber() };
}
} else {
- if(darknetStatus ==
AddressTracker.DEFINITELY_PORT_FORWARDED) {
+ if(darknetStatus > AddressTracker.DONT_KNOW) {
return new int[] { (opennetStatus <
AddressTracker.DONT_KNOW ? -1 : 1 ) * om.crypto.portNumber };
} else {
return new int[] { (darknetStatus <
AddressTracker.DONT_KNOW ? -1 : 1 ) * node.getDarknetPortNumber(),
