Author: toad
Date: 2008-09-04 16:24:24 +0000 (Thu, 04 Sep 2008)
New Revision: 22418
Modified:
trunk/freenet/src/freenet/io/AddressTracker.java
trunk/freenet/src/freenet/node/PeerNode.java
Log:
Introduce MAYBE_NATED detection level. Not used yet.
Modified: trunk/freenet/src/freenet/io/AddressTracker.java
===================================================================
--- trunk/freenet/src/freenet/io/AddressTracker.java 2008-09-04 16:00:12 UTC
(rev 22417)
+++ trunk/freenet/src/freenet/io/AddressTracker.java 2008-09-04 16:24:24 UTC
(rev 22418)
@@ -191,7 +191,8 @@
public static final int DEFINITELY_PORT_FORWARDED = 2;
public static final int MAYBE_PORT_FORWARDED = 1;
- public static final int DEFINITELY_NATED = -1;
+ public static final int MAYBE_NATED = -1;
+ public static final int DEFINITELY_NATED = -2;
public static final int DONT_KNOW = 0;
/** If the minimum gap is at least this, we might be port forwarded.
@@ -243,6 +244,8 @@
return "Port forwarded";
case MAYBE_PORT_FORWARDED:
return "Maybe port forwarded";
+ case MAYBE_NATED:
+ return "Maybe behind NAT";
case DEFINITELY_NATED:
return "Behind NAT";
case DONT_KNOW:
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2008-09-04 16:00:12 UTC
(rev 22417)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2008-09-04 16:24:24 UTC
(rev 22418)
@@ -1464,7 +1464,7 @@
public boolean isBurstOnly() {
int status = outgoingMangler.getConnectivityStatus();
if(status == AddressTracker.DONT_KNOW) return false;
- if(status == AddressTracker.DEFINITELY_NATED) return false;
+ if(status == AddressTracker.DEFINITELY_NATED || status ==
AddressTracker.MAYBE_NATED) return false;
// For now. FIXME try it with a lower probability when we're
sure that the packet-deltas mechanisms works.
if(status == AddressTracker.MAYBE_PORT_FORWARDED) return false;
