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

[t...@freenetproject.org]

Author: toad
Date: 2006-04-03 18:11:43 +0000 (Mon, 03 Apr 2006)
New Revision: 8440

Modified:
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/Version.java
Log:
616: Old IP address was a little bit TOO sticky.

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-04-03 18:00:32 UTC (rev 
8439)
+++ trunk/freenet/src/freenet/node/Node.java    2006-04-03 18:11:43 UTC (rev 
8440)
@@ -314,7 +314,7 @@
                if(myOldPeer.getPort() != portNumber)
                        throw new IllegalArgumentException("Wrong port number "+
                                        myOldPeer.getPort()+" should be 
"+portNumber);
-               lastIPAddress = myOldPeer.getAddress();
+               oldIPAddress = myOldPeer.getAddress();
         }
         String identity = fs.get("identity");
         if(identity == null)
@@ -1468,6 +1468,8 @@
     }

     InetAddress overrideIPAddress;
+    /** IP address from last time */
+    InetAddress oldIPAddress;
     /** Last detected IP address */
     InetAddress lastIPAddress;

@@ -1526,7 +1528,8 @@
                        lastIPAddress = best;
                return best;
                }
-               return lastIPAddress;
+               lastIPAddress = oldIPAddress;
+               return oldIPAddress;
     }

     InetAddress getPrimaryIPAddress() {

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-04-03 18:00:32 UTC (rev 
8439)
+++ trunk/freenet/src/freenet/node/Version.java 2006-04-03 18:11:43 UTC (rev 
8440)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

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

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