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

[t...@freenetproject.org]

Author: toad
Date: 2007-11-19 17:51:23 +0000 (Mon, 19 Nov 2007)
New Revision: 15840

Modified:
   trunk/freenet/src/freenet/node/NodeIPDetector.java
Log:
Fix tempIPAddressHint when includeLocalAddresses = true.

Modified: trunk/freenet/src/freenet/node/NodeIPDetector.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeIPDetector.java  2007-11-19 16:44:19 UTC 
(rev 15839)
+++ trunk/freenet/src/freenet/node/NodeIPDetector.java  2007-11-19 17:51:23 UTC 
(rev 15840)
@@ -143,12 +143,13 @@
                                if(!addresses.contains(a)) {
                                        Logger.normal(this, "Plugin detected IP 
address: "+a);
                                        addresses.add(a);
-                                       addedValidIP = true;
+                                       if(a.isRealInternetAddress(false, 
false))
+                                               addedValidIP = true;
                                }
                        }
                }

-               if(addresses.isEmpty() && (oldIPAddress != null) && 
!oldIPAddress.equals(overrideIPAddress)) {
+               if((!addedValidIP) && (oldIPAddress != null) && 
!oldIPAddress.equals(overrideIPAddress)) {
                        addresses.add(oldIPAddress);
                        if(oldIPAddress.isRealInternetAddress(false, true))
                                addedValidIP = true;