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

[t...@freenetproject.org]

Author: toad
Date: 2006-05-11 22:25:45 +0000 (Thu, 11 May 2006)
New Revision: 8670

Modified:
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/Version.java
Log:
694: Fix the fix

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-05-11 20:45:13 UTC (rev 
8669)
+++ trunk/freenet/src/freenet/node/Node.java    2006-05-11 22:25:45 UTC (rev 
8670)
@@ -124,7 +124,7 @@

                public void update() {
                        Logger.minor(this, "update()");
-                       Peer p = new Peer(Node.this.getPrimaryIPAddress(), 
Node.this.portNumber);
+                       Peer p = new Peer(lastIPAddress, Node.this.portNumber);
                        if(p.strictEquals(lastInsertedAddress)) return;
                        Logger.minor(this, "Inserting ARK because "+p+" != 
"+lastInsertedAddress);
                        synchronized(this) {
@@ -1785,7 +1785,6 @@
                InetAddress addr = ipDetector.getAddress();
                if(addr != null) {
                        lastIPAddress = addr;
-               //      shouldInsertARK();
                        return addr;
                }
                // Try to pick it up from our connections
@@ -1809,7 +1808,6 @@
                        if(countsByPeer.size() == 0) return null;
                        Iterator it = countsByPeer.keySet().iterator();
                        if(countsByPeer.size() == 1) {
-               ///             shouldInsertARK();
                                return (InetAddress) it.next();
                        }
                        // Pick most popular address
@@ -1831,11 +1829,9 @@
                }
                if (lastIPAddress == null) {
                        this.alerts.register(primaryIPUndetectedAlert);
-               }
-               else     {
+               } else {
                        this.alerts.unregister(primaryIPUndetectedAlert);
                }
-               //shouldInsertARK();
                return lastIPAddress;
     }

@@ -2331,6 +2327,7 @@

        public void redetectAddress() {
                InetAddress newIP = detectPrimaryIPAddress();
+               shouldInsertARK();
                if(newIP.equals(lastIP)) return;
                writeNodeFile();
        }

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-05-11 20:45:13 UTC (rev 
8669)
+++ trunk/freenet/src/freenet/node/Version.java 2006-05-11 22:25:45 UTC (rev 
8670)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

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

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