Improved fix for issue 591

rjmatthews62 · rjmatthews62 · commit 2b7fb1b6daaf · 2012-04-28T19:02:27.000+10:00
diff --git a/android/ScriptingLayer/src/com/googlecode/android_scripting/interpreter/InterpreterProcess.java b/android/ScriptingLayer/src/com/googlecode/android_scripting/interpreter/InterpreterProcess.java
@@ -18,9 +18,15 @@
 
 import com.googlecode.android_scripting.Analytics;
 import com.googlecode.android_scripting.AndroidProxy;
+import com.googlecode.android_scripting.Log;
 import com.googlecode.android_scripting.Process;
+import com.googlecode.android_scripting.SimpleServer;
 import com.googlecode.android_scripting.jsonrpc.RpcReceiverManagerFactory;
 
+import java.net.InetSocketAddress;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+
 /**
  * This is a skeletal implementation of an interpreter process.
  * 
@@ -66,13 +72,28 @@ public Interpreter getInterpreter() {
   }
 
   public String getHost() {
-    return mProxy.getAddress().getHostName();
+    String result = mProxy.getAddress().getHostName();
+    if (result.equals("0.0.0.0")) { // Wildcard.
+      try {
+        return SimpleServer.getPublicInetAddress().getHostName();
+      } catch (UnknownHostException e) {
+        Log.i("public address", e);
+        e.printStackTrace();
+      } catch (SocketException e) {
+        Log.i("public address", e);
+      }
+    }
+    return result;
   }
 
   public int getPort() {
     return mProxy.getAddress().getPort();
   }
 
+  public InetSocketAddress getAddress() {
+    return mProxy.getAddress();
+  }
+
   public String getSecret() {
     return mProxy.getSecret();
   }
diff --git a/android/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptProcessMonitor.java b/android/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/activity/ScriptProcessMonitor.java
@@ -24,12 +24,12 @@
 import android.os.Bundle;
 import android.os.IBinder;
 import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.ListView;
diff --git a/android/Utils/src/com/googlecode/android_scripting/SimpleServer.java b/android/Utils/src/com/googlecode/android_scripting/SimpleServer.java
@@ -117,17 +117,26 @@ public int getNumberOfConnections() {
     return mConnectionThreads.size();
   }
 
-  private InetAddress getPublicInetAddress() throws UnknownHostException, SocketException {
+  public static InetAddress getPublicInetAddress() throws UnknownHostException, SocketException {
+
+    InetAddress candidate = null;
     Enumeration<NetworkInterface> nets = NetworkInterface.getNetworkInterfaces();
     for (NetworkInterface netint : Collections.list(nets)) {
+      if (netint.isLoopback() || !netint.isUp()) { // Ignore if localhost or not active
+        continue;
+      }
       Enumeration<InetAddress> addresses = netint.getInetAddresses();
       for (InetAddress address : Collections.list(addresses)) {
-        if (!address.getHostAddress().equals("127.0.0.1") && address instanceof Inet4Address) {
-          return address;
+        if (address instanceof Inet4Address) {
+          return address; // Prefer ipv4
         }
+        candidate = address; // Probably an ipv6
       }
     }
-    return InetAddress.getLocalHost();
+    if (candidate != null) {
+      return candidate; // return ipv6 address if no suitable ipv6
+    }
+    return InetAddress.getLocalHost(); // No damn matches. Give up, return local host.
   }
 
   /**
@@ -162,7 +171,8 @@ public InetSocketAddress startLocal(int port) {
   public InetSocketAddress startPublic(int port) {
     InetAddress address;
     try {
-      address = getPublicInetAddress();
+      // address = getPublicInetAddress();
+      address = null;
       mServer = new ServerSocket(port, 5 /* backlog */, address);
     } catch (Exception e) {
       Log.e("Failed to start server.", e);
