Author: nextgens
Date: 2008-08-14 19:39:03 +0000 (Thu, 14 Aug 2008)
New Revision: 21862
Modified:
trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
Log:
doh, fix last commit
Modified: trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
===================================================================
--- trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2008-08-14
19:16:45 UTC (rev 21861)
+++ trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2008-08-14
19:39:03 UTC (rev 21862)
@@ -277,7 +277,7 @@
*/
public int[] getUDPPortsNotForwarded() {
OpennetManager om = node.getOpennet();
- int darknetStatus =
node.darknetCrypto.getDetectedConnectivityStatus();
+ int darknetStatus = (node.peers.anyDarknetPeers() ?
node.darknetCrypto.getDetectedConnectivityStatus() :
AddressTracker.MAYBE_PORT_FORWARDED);
int opennetStatus = om == null ? AddressTracker.DONT_KNOW :
om.crypto.getDetectedConnectivityStatus();
if(om == null || opennetStatus > AddressTracker.DONT_KNOW) {
if(darknetStatus > AddressTracker.DONT_KNOW) {
@@ -286,7 +286,7 @@
return new int[] { (darknetStatus <
AddressTracker.DONT_KNOW ? -1 : 1) * node.getDarknetPortNumber() };
}
} else {
- if(node.peers.anyDarknetPeers() && 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(),
