[freenet-cvs] r16588 - trunk/freenet/src/freenet/support/transport/ip

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-12-15 23:19:06 +0000 (Sat, 15 Dec 2007)
New Revision: 16588

Modified:
   trunk/freenet/src/freenet/support/transport/ip/IPAddressDetector.java
Log:
IPAddressDetector: Ignore ISATAP addresses when we decide whether we should run 
a detector or not

Modified: trunk/freenet/src/freenet/support/transport/ip/IPAddressDetector.java
===================================================================
--- trunk/freenet/src/freenet/support/transport/ip/IPAddressDetector.java       
2007-12-15 23:17:02 UTC (rev 16587)
+++ trunk/freenet/src/freenet/support/transport/ip/IPAddressDetector.java       
2007-12-15 23:19:06 UTC (rev 16588)
@@ -1,6 +1,7 @@
 /* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */
 package freenet.support.transport.ip;

+import freenet.io.AddressIdentifier;
 import java.net.DatagramSocket;
 import java.net.InetAddress;
 import java.net.SocketException;
@@ -196,8 +197,10 @@
                                        } else if(i.isMulticastAddress()) {
                                                // Ignore
                                        } else {
-                                               if(!IPUtil.strict)
-                                               output.add(i);
+                                               // Ignore ISATAP addresses
+                                               // @see 
http://archives.freenetproject.org/message/20071129.220955.ac2a2a36.en.html
+                                               
if(!AddressIdentifier.isAnISATAPIPv6Address(i.toString()))
+                                                       output.add(i);
                                        }
                                }
                        }