[freenet-cvs] r22459 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2008-09-05 15:06:57 +0000 (Fri, 05 Sep 2008)
New Revision: 22459

Modified:
   trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
Log:
It's only serious if we're sure we're NATed. Having said that, we can't 
actually detect that atm...


Modified: trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
===================================================================
--- trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2008-09-05 
15:06:57 UTC (rev 22458)
+++ trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2008-09-05 
15:06:57 UTC (rev 22459)
@@ -283,14 +283,14 @@
                        if(darknetStatus >= AddressTracker.DONT_KNOW) {
                                return new int[] { };
                        } else {
-                               return new int[] { (darknetStatus < 
AddressTracker.DONT_KNOW ? -1 : 1) * node.getDarknetPortNumber() };
+                               return new int[] { (darknetStatus < 
AddressTracker.MAYBE_NATED ? -1 : 1) * node.getDarknetPortNumber() };
                        }
                } else {
                        if(darknetStatus >= AddressTracker.DONT_KNOW) {
-                               return new int[] { (opennetStatus < 
AddressTracker.DONT_KNOW ? -1 : 1 ) * om.crypto.portNumber };
+                               return new int[] { (opennetStatus < 
AddressTracker.MAYBE_NATED ? -1 : 1 ) * om.crypto.portNumber };
                        } else {
-                               return new int[] { ((darknetStatus < 
AddressTracker.DONT_KNOW) ? -1 : 1 ) * node.getDarknetPortNumber(), 
-                                               (opennetStatus < 
AddressTracker.DONT_KNOW ? -1 : 1 ) * om.crypto.portNumber };
+                               return new int[] { ((darknetStatus < 
AddressTracker.MAYBE_NATED) ? -1 : 1 ) * node.getDarknetPortNumber(), 
+                                               (opennetStatus < 
AddressTracker.MAYBE_NATED ? -1 : 1 ) * om.crypto.portNumber };
                        }
                }
        }