[freenet-cvs] r15983 - trunk/freenet/src/freenet/io

[t...@freenetproject.org]

Author: toad
Date: 2007-11-27 18:47:23 +0000 (Tue, 27 Nov 2007)
New Revision: 15983

Modified:
   trunk/freenet/src/freenet/io/AddressTracker.java
Log:
Allow LOCAL to influence outcome.

Modified: trunk/freenet/src/freenet/io/AddressTracker.java
===================================================================
--- trunk/freenet/src/freenet/io/AddressTracker.java    2007-11-27 18:42:11 UTC 
(rev 15982)
+++ trunk/freenet/src/freenet/io/AddressTracker.java    2007-11-27 18:47:23 UTC 
(rev 15983)
@@ -197,15 +197,16 @@
                for(int i=0;i<items.length;i++) {
                        PeerAddressTrackerItem item = items[i];
                        if(item.packetsReceived() <= 0) continue;
-                       if(item.weSentFirst()) continue;
                        if(!item.peer.isRealInternetAddress(false, false)) 
continue;
                        if(item.hasLongTunnel(HORIZON)) {
                                // FIXME should require more than one
                                return DEFINITELY_PORT_FORWARDED;
                        }
-                       if(item.timeFromStartupToFirstReceivedPacket() > 
MAX_TUNNEL_LENGTH) {
-                               // FIXME should require more than one
-                               return DEFINITELY_PORT_FORWARDED;
+                       if(!item.weSentFirst()) {
+                               if(item.timeFromStartupToFirstReceivedPacket() 
> MAX_TUNNEL_LENGTH) {
+                                       // FIXME should require more than one
+                                       return DEFINITELY_PORT_FORWARDED;
+                               }
                        }
                }
                return DONT_KNOW;