* i2ptunnel:

- Use dropdown box to select interface for clients
      - Warn on index page if required fields not set

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java

@@ -259,10 +259,9 @@ public class TunnelController implements Logging {
     
     /*
      *  Streamr client is a UDP server, use the listenPort field for targetPort
-     *  and the listenOnInterface field for the targetHost
      */
     private void startStreamrClient() {
-        String targetHost = getListenOnInterface();
+        String targetHost = getTargetHost();
         String targetPort = getListenPort();
         String dest = getTargetDestination();
         _tunnel.runStreamrClient(new String[] { targetHost, targetPort, dest }, this);
@@ -270,10 +269,9 @@ public class TunnelController implements Logging {
     
     /**
      *  Streamr server is a UDP client, use the targetPort field for listenPort
-     *  and the targetHost field for the listenOnInterface
      */
     private void startStreamrServer() {
-        String listenOn = getTargetHost();
+        String listenOn = getListenOnInterface();
         if ( (listenOn != null) && (listenOn.length() > 0) ) {
             _tunnel.runListenOn(new String[] { listenOn }, this);
         }

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java

@@ -12,6 +12,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 import java.util.StringTokenizer;
+import java.util.Set;
 
 import net.i2p.data.Base64;
 import net.i2p.data.Destination;
@@ -22,6 +23,7 @@ import net.i2p.i2ptunnel.I2PTunnelHTTPClient;
 import net.i2p.i2ptunnel.I2PTunnelHTTPClientBase;
 import net.i2p.i2ptunnel.TunnelController;
 import net.i2p.i2ptunnel.TunnelControllerGroup;
+import net.i2p.util.Addresses;
 
 /**
  * Ugly little accessor for the edit page
@@ -314,6 +316,11 @@ public class EditBean extends IndexBean {
         return _context.isRouterContext();
     }
 
+    /** @since 0.8.3 */
+    public Set<String> interfaceSet() {
+        return Addresses.getAllAddresses();
+    }
+
     public String getI2CPHost(int tunnel) {
         if (_context.isRouterContext())
             return _("internal");

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java

@@ -63,7 +63,6 @@ public class IndexBean {
     private String _proxyList;
     private String _port;
     private String _reachableBy;
-    private String _reachableByOther;
     private String _targetDestination;
     private String _targetHost;
     private String _targetPort;
@@ -432,10 +431,13 @@ public class IndexBean {
     
     public String getClientInterface(int tunnel) {
         TunnelController tun = getController(tunnel);
-        if (tun != null)
-            return tun.getListenOnInterface();
-        else
-            return "";
+        if (tun != null) {
+            if ("streamrclient".equals(tun.getType()))
+                return tun.getTargetHost();
+            else
+                return tun.getListenOnInterface();
+        } else
+            return "127.0.0.1";
     }
     
     public int getTunnelStatus(int tunnel) {
@@ -478,11 +480,38 @@ public class IndexBean {
         return rv != null ? rv : "";
     }
     
+    /**
+     * Call this to see if it is ok to linkify getServerTarget()
+     * @since 0.8.3
+     */
+    public boolean isServerTargetLinkValid(int tunnel) {
+        TunnelController tun = getController(tunnel);
+        return tun != null &&
+               "httpserver".equals(tun.getType()) &&
+               tun.getTargetHost() != null &&
+               tun.getTargetPort() != null;
+    }
+
+    /**
+     * @return valid host:port only if isServerTargetLinkValid() is true
+     */
     public String getServerTarget(int tunnel) {
         TunnelController tun = getController(tunnel);
-        if (tun != null)
-            return tun.getTargetHost() + ':' + tun.getTargetPort();
-        else
+        if (tun != null) {
+            String host;
+            if ("streamrserver".equals(tun.getType()))
+                host = tun.getListenOnInterface();
+            else
+                host = tun.getTargetHost();
+            String port = tun.getTargetPort();
+            if (host == null)
+                host = "<font color=\"red\">" + _("Host not set") + "</font>";
+            else if (host.indexOf(':') >= 0)
+                host = '[' + host + ']';
+            if (port == null)
+                port = "<font color=\"red\">" + _("Port not set") + "</font>";
+            return host + ':' + port;
+       }  else
             return "";
     }
     
@@ -575,19 +604,11 @@ public class IndexBean {
         _port = (port != null ? port.trim() : null);
     }
     /** 
-     * what interface should this client/httpclient/ircclient listen on (unless 
-     * overridden by the setReachableByOther() field)
+     * what interface should this client/httpclient/ircclient listen on
      */
     public void setReachableBy(String reachableBy) { 
         _reachableBy = (reachableBy != null ? reachableBy.trim() : null);
     }
-    /**
-     * If specified, defines the exact IP interface to listen for requests
-     * on (in the case of client/httpclient/ircclient tunnels)
-     */
-    public void setReachableByOther(String reachableByOther) { 
-        _reachableByOther = (reachableByOther != null ? reachableByOther.trim() : null);
-    }
     /** What peer does this client tunnel point at */
     public void setTargetDestination(String dest) { 
         _targetDestination = (dest != null ? dest.trim() : null);
@@ -891,17 +912,22 @@ public class IndexBean {
         Properties config = new Properties();
         updateConfigGeneric(config);
         
+        if ((isClient(_type) && !"streamrclient".equals(_type)) || "streamrserver".equals(_type)) {
+            // streamrserver uses interface
+            if (_reachableBy != null)
+                config.setProperty("interface", _reachableBy);
+            else
+                config.setProperty("interface", "");
+        } else {
+            // streamrclient uses targetHost
+            if (_targetHost != null)
+                config.setProperty("targetHost", _targetHost);
+        }
+
         if (isClient(_type)) {
             // generic client stuff
             if (_port != null)
                 config.setProperty("listenPort", _port);
-            if (_reachableByOther != null)
-                config.setProperty("interface", _reachableByOther);
-            else if (_reachableBy != null)
-                config.setProperty("interface", _reachableBy);
-            else
-                config.setProperty("interface", "");
-
             config.setProperty("sharedClient", _sharedClient + "");
             for (String p : _booleanClientOpts)
                 config.setProperty("option." + p, "" + _booleanOptions.contains(p));
@@ -910,8 +936,6 @@ public class IndexBean {
                     config.setProperty("option." + p, _otherOptions.get(p));
         } else {
             // generic server stuff
-            if (_targetHost != null)
-                config.setProperty("targetHost", _targetHost);
             if (_targetPort != null)
                 config.setProperty("targetPort", _targetPort);
             for (String p : _booleanServerOpts)
@@ -940,9 +964,7 @@ public class IndexBean {
         if ("httpbidirserver".equals(_type)) {
             if (_port != null)
                 config.setProperty("listenPort", _port);
-            if (_reachableByOther != null)
-                config.setProperty("interface", _reachableByOther);
-            else if (_reachableBy != null)
+            if (_reachableBy != null)
                 config.setProperty("interface", _reachableBy);
             else if (_targetHost != null)
                 config.setProperty("interface", _targetHost);