[freenet-cvs] r9169 - in trunk/freenet/src/freenet: io/comm node

[t...@freenetproject.org]

Author: toad
Date: 2006-06-12 16:58:46 +0000 (Mon, 12 Jun 2006)
New Revision: 9169

Modified:
   trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/PeerNode.java
   trunk/freenet/src/freenet/node/Version.java
Log:
806: Fix problem in FreenetInetAddress causing corruption of peers file: Peers 
with a DNS name were being written with raw IP addresses!!!

Modified: trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java   2006-06-12 
15:22:04 UTC (rev 9168)
+++ trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java   2006-06-12 
16:58:46 UTC (rev 9169)
@@ -220,10 +220,10 @@
        }

        public String toString() {
-               if (_address != null) {
-                       return getHostName(_address);
+               if(hostname == null) {
+                       return hostname;
                } else {
-                       return hostname;
+                       return _address.toString();
                }
        }


Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-06-12 15:22:04 UTC (rev 
9168)
+++ trunk/freenet/src/freenet/node/Node.java    2006-06-12 16:58:46 UTC (rev 
9169)
@@ -783,7 +783,7 @@

        // set Java's DNS cache not to cache forever, since many people
        // use dyndns hostnames
-       java.security.Security.setProperty("networkaddress.cache.ttl" , "300");
+       java.security.Security.setProperty("networkaddress.cache.ttl" , "60");

        // set Java's negative DNS cache to 1 minute rather than the default 10 
seconds
        java.security.Security.setProperty("networkaddress.cache.negative.ttl" 
, "60");

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2006-06-12 15:22:04 UTC 
(rev 9168)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2006-06-12 16:58:46 UTC 
(rev 9169)
@@ -599,8 +599,8 @@

        boolean addedLocalhost = false;
        Peer detectedDuplicate = null;
-       for(int i=0;i<nominalPeer.size();i++) {
-               Peer p = (Peer) nominalPeer.get(i);
+       for(int i=0;i<myNominalPeer.length;i++) {
+               Peer p = myNominalPeer[i];
                if(p == null) continue;
                if(detectedPeer != null) {
                        if(p != detectedPeer && p.equals(detectedPeer)) {

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-06-12 15:22:04 UTC (rev 
9168)
+++ trunk/freenet/src/freenet/node/Version.java 2006-06-12 16:58:46 UTC (rev 
9169)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 805;
+       private static final int buildNumber = 806;

        /** Oldest build of Fred we will talk to */
        private static final int lastGoodBuild = 765;