Changeset 7800 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java

Timestamp:

2014-12-12T20:08:22+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #10833 - robustness to localhost name resolution for remote control

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.io.remotecontrol;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 
 import org.openstreetmap.josm.Main;
@@ -34 +37 @@
     static final int protocolMajorVersion = 1;
     static final int protocolMinorVersion = 7;
+
+    private static final String LOCALHOST = "localhost";
 
     /**
@@ -71 +76 @@
         return Main.pref.getPreferencesDir() + "remotecontrol/";
     }
+
+    /**
+     * Returns the inet address used for remote control.
+     * @return the inet address used for remote control
+     * @throws UnknownHostException if the local host name could not be resolved into an address.
+     * @since 7800
+     */
+    public static InetAddress getInetAddress() throws UnknownHostException {
+        String hostname = Main.pref.get("remote.control.host", LOCALHOST);
+        InetAddress result = InetAddress.getByName(hostname);
+        // Sometimes localhost resolution does not work as expected, see #10833
+        if (LOCALHOST.equalsIgnoreCase(hostname) && !LOCALHOST.equalsIgnoreCase(result.getHostName())) {
+            InetAddress localhostAddr = InetAddress.getLocalHost();
+            // Use this result if it's better. Not sure if it's a Java bug or not
+            if (LOCALHOST.equalsIgnoreCase(localhostAddr.getHostName())) {
+                result = localhostAddr;
+            }
+        }
+        return result;
+    }
 }