Author: toad
Date: 2007-04-25 23:15:19 +0000 (Wed, 25 Apr 2007)
New Revision: 12969
Modified:
trunk/freenet/src/freenet/node/NodeIPDetector.java
Log:
IP detection:
- Don't add old address unless really don't know it.
- Don't add twice
Modified: trunk/freenet/src/freenet/node/NodeIPDetector.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeIPDetector.java 2007-04-25 22:58:50 UTC
(rev 12968)
+++ trunk/freenet/src/freenet/node/NodeIPDetector.java 2007-04-25 23:15:19 UTC
(rev 12969)
@@ -145,7 +145,7 @@
}
}
}
- if((detectedAddrs.length == 0) && (oldIPAddress != null) &&
!oldIPAddress.equals(overrideIPAddress))
+ if(addresses.isEmpty() && (oldIPAddress != null) &&
!oldIPAddress.equals(overrideIPAddress))
addresses.add(new Peer(oldIPAddress, node.portNumber));
// Try to pick it up from our connections
if(node.peers != null) {
@@ -227,7 +227,9 @@
node.clientCore.alerts.unregister(maybeSymmetricAlert);
}
-
addresses.add(new Peer(best.getFreenetAddress(), node.portNumber));
+ Peer p = new
Peer(best.getFreenetAddress(), node.portNumber);
+
if(!addresses.contains(p))
+
addresses.add(p);
}
}
}
