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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2008-08-14 19:16:45 +0000 (Thu, 14 Aug 2008)
New Revision: 21861

Modified:
   trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
Log:
bug #2370: don't ask for the darknet port to be forwarded if there is no 
darknet peer

Modified: trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
===================================================================
--- trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2008-08-14 
19:08:00 UTC (rev 21860)
+++ trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2008-08-14 
19:16:45 UTC (rev 21861)
@@ -286,10 +286,10 @@
                                return new int[] { (darknetStatus < 
AddressTracker.DONT_KNOW ? -1 : 1) * node.getDarknetPortNumber() };
                        }
                } else {
-                       if(darknetStatus > AddressTracker.DONT_KNOW) {
+                       if(node.peers.anyDarknetPeers() && 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(), 
+                               return new int[] { ((darknetStatus < 
AddressTracker.DONT_KNOW) ? -1 : 1 ) * node.getDarknetPortNumber(), 
                                                (opennetStatus < 
AddressTracker.DONT_KNOW ? -1 : 1 ) * om.crypto.portNumber };
                        }
                }