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

[t...@freenetproject.org]

Author: toad
Date: 2006-06-20 23:16:32 +0000 (Tue, 20 Jun 2006)
New Revision: 9326

Modified:
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/Version.java
Log:
831: another try at #204.

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-06-20 23:01:53 UTC (rev 
9325)
+++ trunk/freenet/src/freenet/node/Node.java    2006-06-20 23:16:32 UTC (rev 
9326)
@@ -644,7 +644,7 @@
                                throw new IllegalArgumentException("Wrong port 
number "+
                                                myOldPeer.getPort()+" should be 
"+portNumber);
                        // DNSRequester doesn't deal with our own node
-                       oldIPAddress = myOldPeer.getAddress(true);
+                       oldIPAddress = myOldPeer.getFreenetAddress();
                }
                String identity = fs.get("identity");
                if(identity == null)
@@ -1016,7 +1016,7 @@
                                }
                                if(overrideIPAddress != null) return;
                                try {
-                                       ipAddressHint = new 
FreenetInetAddress(val, false);
+                                       oldIPAddress = new 
FreenetInetAddress(val, false);
                                } catch (UnknownHostException e) {
                                        throw new 
InvalidConfigValueException("Unknown host: "+e.getMessage());
                                }
@@ -1027,11 +1027,9 @@
                });

                String ipHintString = nodeConfig.getString("tempIPAddressHint");
-               if(ipOverrideString.length() == 0)
-                       overrideIPAddress = null;
-               else {
+               if(ipOverrideString.length() > 0) {
                        try {
-                               ipAddressHint = new 
FreenetInetAddress(ipOverrideString, false);
+                               oldIPAddress = new 
FreenetInetAddress(ipHintString, false);
                        } catch (UnknownHostException e) {
                                String msg = "Unknown host: 
"+ipOverrideString+" in config: "+e.getMessage();
                                Logger.error(this, msg);
@@ -2150,10 +2148,8 @@

        /** Explicit forced IP address */
        FreenetInetAddress overrideIPAddress;
-       /** Temporary hint at IP address if all else fails */
-       FreenetInetAddress ipAddressHint;
        /** IP address from last time */
-       InetAddress oldIPAddress;
+       FreenetInetAddress oldIPAddress;
        /** Last detected IP address */
        FreenetInetAddress lastIPAddress;

@@ -2216,12 +2212,8 @@
                        }
                        lastIPAddress = best == null ? null : new 
FreenetInetAddress(best);
                } else {
-                       lastIPAddress = oldIPAddress == null ? null : new 
FreenetInetAddress(oldIPAddress);
+                       lastIPAddress = oldIPAddress == null ? null : 
oldIPAddress;
                }
-               if(lastIPAddress == null) {
-                       lastIPAddress = ipAddressHint;
-                       ipAddressHint = null;
-               }
                if (lastIPAddress == null) {
                        this.alerts.register(primaryIPUndetectedAlert);
                } else {

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-06-20 23:01:53 UTC (rev 
9325)
+++ trunk/freenet/src/freenet/node/Version.java 2006-06-20 23:16:32 UTC (rev 
9326)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

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

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