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

[t...@freenetproject.org]

Author: toad
Date: 2006-07-11 22:12:51 +0000 (Tue, 11 Jul 2006)
New Revision: 9567

Modified:
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/Version.java
Log:
873: Maybe fix a reported bug.

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-07-11 20:42:59 UTC (rev 
9566)
+++ trunk/freenet/src/freenet/node/Node.java    2006-07-11 22:12:51 UTC (rev 
9567)
@@ -729,20 +729,22 @@
                // Read contents
                String[] udp = fs.getAll("physical.udp");
                if((udp != null) && (udp.length > 0)) {
-                       // Just keep the first one.
-                       Peer myOldPeer;
-                       try {
-                               myOldPeer = new Peer(udp[0], false);
-                       } catch (PeerParseException e) {
-                               IOException e1 = new IOException();
-                               e1.initCause(e);
-                               throw e1;
+                       for(int i=0;i<udp.length;i++) {
+                               // Just keep the first one with the correct 
port number.
+                               Peer p;
+                               try {
+                                       p = new Peer(udp[i], false);
+                               } catch (PeerParseException e) {
+                                       IOException e1 = new IOException();
+                                       e1.initCause(e);
+                                       throw e1;
+                               }
+                               if(p.getPort() == portNumber) {
+                                       // DNSRequester doesn't deal with our 
own node
+                                       oldIPAddress = p.getFreenetAddress();
+                                       break;
+                               }
                        }
-                       if(myOldPeer.getPort() != portNumber)
-                               throw new IllegalArgumentException("Wrong port 
number "+
-                                               myOldPeer.getPort()+" should be 
"+portNumber);
-                       // DNSRequester doesn't deal with our own node
-                       oldIPAddress = myOldPeer.getFreenetAddress();
                }
                String identity = fs.get("identity");
                if(identity == null)

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-07-11 20:42:59 UTC (rev 
9566)
+++ trunk/freenet/src/freenet/node/Version.java 2006-07-11 22:12:51 UTC (rev 
9567)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

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

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