Changeset 173

Timestamp:

02/23/06 18:37:19 (2 years ago)

Author:

dsandler

Message:

Working on ticket #38: Allow the user to specify the local IP address to bind
to (in so doing, selecting the interface to bind to as well).

Command-line clients should use the {{-I}}/{{--local-ip}} flag to specify an
IP. The Publisher now has a node_local_ip property (to go along with
node_port.) The GUI app needs (but does not currently have!) a spot in
the preference dialog for the user to specify an IP.

I plan to seed this version as a nightly build to those who've had trouble,
and update the UI, before closing #38.

Files:

• feedtree/trunk/build.xml (modified) (1 diff)
• feedtree/trunk/src/net/feedtree/core/client/Client.java (modified) (4 diffs)
• feedtree/trunk/src/net/feedtree/proxyapp/WebProxyClient.java (modified) (4 diffs)
• feedtree/trunk/src/net/feedtree/proxyapp/gui/AppControl.java (modified) (4 diffs)
• feedtree/trunk/src/net/feedtree/publisher/Publisher.java (modified) (3 diffs)
• feedtree/trunk/src/net/feedtree/util/NAT.java (modified) (2 diffs)

feedtree/trunk/build.xml

@@ -72 +72 @@
-                description="compile the source " >
-
-        <!-- Compile the java code from ${src} into ${build} -->
-        <javac 
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    </target>
-

feedtree/trunk/src/net/feedtree/core/client/Client.java

@@ -238 +238 @@
-    }
-
-
+
+
+
+
+
-        Node node = null;
-
@@ -275 +279 @@
-            attempts --;
-
-
+
+
-            
-            if (bootHost != "") {
@@ -296 +301 @@
-                                
-                    InetAddress natAddr = NAT.findNatAddress(
-
+localHost, 
-                    g_localNodeAddress = null;
-                    if (natAddr != null)
@@ -310 +315 @@
-                        factory.getNodeHandle(bootSocketList[0]),
-                        g_localNodeAddress);
+                } catch (java.net.BindException exc) {
+                    Logger.global.severe("error: couldn't bind to requested address (already in use?)");
+                    status.notifyStatus(ClientStatus.STATUS_ERROR,
+                            "The address " + localHost.getHostAddress() + ":"
+                            + port + " couldn't be used.  Is the proxy already running?");
+                    return null;
-                } catch (java.io.StreamCorruptedException exc) {
-                    Logger.global.severe("Stream corruption error while finding bootstrap.  Sleeping and trying again.");

feedtree/trunk/src/net/feedtree/proxyapp/WebProxyClient.java

@@ -1345 +1345 @@
-                "Starting up");
-
+        InetAddress myHost = null;
+        try {
+            myHost = InetAddress.getLocalHost();
+        } catch (UnknownHostException exc) {
+            // pass ... hopefully the user will specify it
+        }
-        int myPort = Client.PASTRY_PORT;
-        int bsPort = Client.PASTRY_PORT;
@@ -1364 +1370 @@
-            if (args[i].equals("--port") || args[i].equals("-p")) {
-                myPort = to_int(args[++i]);
+            } else if (args[i].equals("--local-ip") || args[i].equals("-I")) {
+                String hostSpec = args[++i];
+                try {
+                    myHost = InetAddress.getByName(hostSpec);
+                } catch (UnknownHostException exc) {
+                    System.out.println("error: address could not be resolved: " + hostSpec);
+                    System.exit(1);
+                }
-            } else if (args[i].equals("--verbose") || args[i].equals("-v")) {
-                verbosity++;
@@ -1449 +1463 @@
-                    + "       (default: "+Client.PASTRY_PORT+")\n"
-                    + "\n"
+                    + "  -I/--local-ip <address>\n"
+                    + "       local IP address for FeedTree node (optional)\n"
+                    + "       (use this only if you need to select among multiple network \n"
+                    + "       interfaces; if behind a NAT, put your internal NAT IP here,\n"
+                    + "       not your public IP)\n"
+                    + "       (guessed default: "+myHost.getHostAddress()+")\n"
+                    + "\n"
-                    + "  -w/--web-port <port>\n"
-                    + "       port on localhost for web-based status page\n"
@@ -1546 +1567 @@
-        }
-
+        if (myHost == null) {
+            System.out.println("error: could not automatically detect local host address; consider using --local-ip flag");
+            System.exit(1);
+        }
+
-        // Start the node
-
-
-
+
+
+
+
+
+
-        
-        Client.clientStatus().notifyStatus(ClientStatus.STATUS_STARTING,

feedtree/trunk/src/net/feedtree/proxyapp/gui/AppControl.java

@@ -5 +5 @@
-import java.util.logging.*;
-import java.util.prefs.*;
+import java.net.*;
-
-import net.feedtree.proxyapp.*;
@@ -21 +22 @@
-
-    public static final String PR_PASTRY_PORT = "port";
+    public static final String PR_LOCAL_IP = "local-ip";
-    public static final String PR_BOOTSTRAP = "bootstrap";
-    public static final String PR_PUBLIC = "public";
@@ -258 +260 @@
-                WebProxyClient.DEFAULT_BOOTSTRAP_HOST + ":" + Client.PASTRY_PORT);
-
+        InetAddress myHost = null;
+        String localIP = prefs.get(PR_LOCAL_IP, "");
+        if (localIP.equals("")) {
+            try {
+                myHost = InetAddress.getLocalHost();
+            } catch (UnknownHostException exc) {
+                Client.clientStatus().notifyStatus(
+                        Client.ClientStatus.STATUS_ERROR,
+                        "Could not detect local IP.  Please configure one in the preferences panel and re-start the proxy.");
+            }
+        } else {
+            try {
+                myHost = InetAddress.getByName(localIP);
+            } catch (UnknownHostException exc) {
+                Client.clientStatus().notifyStatus(
+                        Client.ClientStatus.STATUS_ERROR,
+                        "Could not parse local IP: " + localIP + ".  Please alter the value in the preferences panel and re-start the proxy.");
+            }
+        }
+        
-        String bs; int bsPort;
-        try {
@@ -343 +365 @@
-        
-        // Start the node
-
+Host, my
-        
-        // communicate with AppGUI

feedtree/trunk/src/net/feedtree/publisher/Publisher.java

@@ -83 +83 @@
-    public static final String PROP_HEARTBEAT_INTERVAL = "heartbeat_interval_sec";
-    
+    /// Local hostname or IP on which to start the FeedTree node (default: auto-detected)
+    /// \note If your publisher host has multiple network interfaces, this
+    /// will allow you to control which one is used for the Pastry node
+    /// \note If you run behind a NAT and choose to specify this, use your
+    /// local address, not your public address; the public address will be
+    /// detected at run-time
+    public static final String PROP_LOCAL_IP = "node_local_ip";
+
-    /// Port on which to start the FeedTree node (default: 29690)
-    /// \note If the Publisher runs behind a NAT, this port must be 
@@ -776 +784 @@
-        }
-        
+        InetAddress myHost = null;
+
+        String localIP = g_config.optString(PROP_LOCAL_IP,"");
+        if (localIP.equals("")) {
+            try {
+                myHost = InetAddress.getLocalHost();
+            } catch (UnknownHostException exc) {
+                Logger.global.severe("error: could not automatically detect IP address; add a " + PROP_LOCAL_IP + " property to your config file");
+                System.exit(1);
+            }
+        } else {
+            try {
+                myHost = InetAddress.getByName(localIP);
+            } catch (UnknownHostException exc) {
+                Logger.global.severe("error: could not parse/resolve specified IP address: " + localIP);
+                System.exit(1);
+            }
+        }
+
+        
-        int myPort = g_config.optInt(PROP_PASTRY_PORT, Client.PASTRY_PORT);
-        int bsPort = g_config.optInt(PROP_BOOTSTRAP_PORT, Client.PASTRY_PORT);
@@ -849 +877 @@
-        // Start the publisher node and application.
-    
-
+Host, my
-        
-        Publisher appl = new Publisher(node, myPort, webPort, feeds, privateKey);

feedtree/trunk/src/net/feedtree/util/NAT.java

@@ -3 +3 @@
-import java.lang.*;
-import java.net.*;
+import java.io.*;
-import java.util.Random;
-import java.util.logging.*;
@@ -29 +30 @@
-    protected static Random random = new Random();
-
-
-
+
+
+
+
-    {
-
+
+
-        InetSocketAddress localSocket = new InetSocketAddress(localHost, port);
-        int speedup = 4;