Author: toad
Date: 2008-09-04 19:06:45 +0000 (Thu, 04 Sep 2008)
New Revision: 22434
Modified:
trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
Log:
Don't show the port forwarding alert unless the status is MAYBE_NATED or
DEFINITELY_NATED.
Modified: trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
===================================================================
--- trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2008-09-04
19:03:55 UTC (rev 22433)
+++ trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2008-09-04
19:06:45 UTC (rev 22434)
@@ -277,16 +277,16 @@
*/
public int[] getUDPPortsNotForwarded() {
OpennetManager om = node.getOpennet();
- int darknetStatus = (node.peers.anyDarknetPeers() ?
node.darknetCrypto.getDetectedConnectivityStatus() :
AddressTracker.MAYBE_PORT_FORWARDED);
+ int darknetStatus = (node.peers.anyDarknetPeers() ?
node.darknetCrypto.getDetectedConnectivityStatus() : AddressTracker.DONT_KNOW);
int opennetStatus = om == null ? AddressTracker.DONT_KNOW :
om.crypto.getDetectedConnectivityStatus();
- if(om == null || opennetStatus > AddressTracker.DONT_KNOW) {
- if(darknetStatus > AddressTracker.DONT_KNOW) {
+ if(om == null || opennetStatus >= AddressTracker.DONT_KNOW) {
+ if(darknetStatus >= AddressTracker.DONT_KNOW) {
return new int[] { };
} else {
return new int[] { (darknetStatus <
AddressTracker.DONT_KNOW ? -1 : 1) * node.getDarknetPortNumber() };
}
} else {
- if(darknetStatus > AddressTracker.DONT_KNOW) {
+ 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(),
