Bug 1996 - multihomed hostnames

6 files changed, 131 insertions, 8 deletions

diff --git a/java/CHANGES b/java/CHANGES
index 4f51fadb3ff..1422898c28b 100644
--- a/java/CHANGES
+++ b/java/CHANGES
@@ -1,6 +1,10 @@
 Changes since version 3.2.X (binary incompabible)
 -------------------------------------------------
 
+- If a client endpoint configuration contains a host which is multihomed, 
+  the client will now use all the available ip addresses. Previously, 
+  only the first in the address list was used and others were ignored.
+
 - Added a new property, Ice.Warn.UnusedProperties. If set to 1, when
   the communicator is destroyed a warning will be printed listing all
   properties that were set, but never read. Default is 0.
diff --git a/java/src/IceInternal/Network.java b/java/src/IceInternal/Network.java
index 92a1547d234..cfa52fa0e4c 100644
--- a/java/src/IceInternal/Network.java
+++ b/java/src/IceInternal/Network.java
@@ -654,6 +654,41 @@ public final class Network
     }
 
     public static java.util.ArrayList
+    getHosts(String host)
+    {
+        java.util.ArrayList hosts = new java.util.ArrayList();
+        try
+        {
+            java.net.InetAddress[] addrs = java.net.InetAddress.getAllByName(host);
+            for(int i = 0; i < addrs.length; ++i)
+            {
+                if(addrs[i] instanceof java.net.Inet4Address)
+                {
+                    hosts.add(addrs[i].getHostAddress());
+                }
+            }
+        }
+        catch(java.net.UnknownHostException ex)
+        {
+            Ice.DNSException e = new Ice.DNSException();
+            e.host = host;
+            throw e;
+        }
+
+        //
+        // No Inet4Address available.
+        //
+        if(hosts.size() == 0)
+        {
+            Ice.DNSException e = new Ice.DNSException();
+            e.host = host;
+            throw e;
+        }
+
+        return hosts;
+    }
+
+    public static java.util.ArrayList
     getLocalHosts()
     {
         java.util.ArrayList hosts = new java.util.ArrayList();
diff --git a/java/src/IceInternal/TcpEndpointI.java b/java/src/IceInternal/TcpEndpointI.java
index 21eb90d067c..e83c38ac416 100644
--- a/java/src/IceInternal/TcpEndpointI.java
+++ b/java/src/IceInternal/TcpEndpointI.java
@@ -388,8 +388,29 @@ final class TcpEndpointI extends EndpointI
         }
         else
         {
-            calcHashValue();
-            endps.add(this);
+            if(!server)
+            {
+                java.util.ArrayList hosts = Network.getHosts(_host);
+                if(hosts.size() > 1)
+                {
+                    java.util.Iterator iter = hosts.iterator();
+                    while(iter.hasNext())
+                    {
+                        String host = (String)iter.next();
+                        endps.add(new TcpEndpointI(_instance, host, _port, _timeout, _connectionId, _compress, true));
+                    }
+                }
+                else
+                {
+                    calcHashValue();
+                    endps.add(this);
+                }
+            }
+            else
+            {
+                calcHashValue();
+                endps.add(this);
+            }
         }
         return endps;
     }
diff --git a/java/src/IceInternal/UdpEndpointI.java b/java/src/IceInternal/UdpEndpointI.java
index 6207a0499b8..44f3a01b5c0 100644
--- a/java/src/IceInternal/UdpEndpointI.java
+++ b/java/src/IceInternal/UdpEndpointI.java
@@ -523,8 +523,29 @@ final class UdpEndpointI extends EndpointI
         }
         else
         {
-            calcHashValue();
-            endps.add(this);
+            if(!server)
+            {
+                java.util.ArrayList hosts = Network.getHosts(_host);
+                if(hosts.size() > 1)
+                {
+                    java.util.Iterator iter = hosts.iterator();
+                    while(iter.hasNext())
+                    {
+                        String host = (String)iter.next();
+                        endps.add(new UdpEndpointI(_instance, host, _port, _connect, _connectionId, _compress, true));
+                    }
+                }
+                else
+                {
+                    calcHashValue();
+                    endps.add(this);
+                }
+            }
+            else
+            {
+                calcHashValue();
+                endps.add(this);
+            }
         }
         return endps;
     }
diff --git a/java/ssl/jdk1.4/IceSSL/EndpointI.java b/java/ssl/jdk1.4/IceSSL/EndpointI.java
index 40c51386679..e164d10111d 100644
--- a/java/ssl/jdk1.4/IceSSL/EndpointI.java
+++ b/java/ssl/jdk1.4/IceSSL/EndpointI.java
@@ -388,8 +388,29 @@ final class EndpointI extends IceInternal.EndpointI
         }
         else
         {
-            calcHashValue();
-            endps.add(this);
+            if(!server)
+            {
+                java.util.ArrayList hosts = IceInternal.Network.getHosts(_host);
+                if(hosts.size() > 1)
+                {
+                    java.util.Iterator iter = hosts.iterator();
+                    while(iter.hasNext())
+                    {
+                        String host = (String)iter.next();
+                        endps.add(new EndpointI(_instance, host, _port, _timeout, _connectionId, _compress, true));
+                    }
+                }
+                else
+                {
+                    calcHashValue();
+                    endps.add(this);
+                }
+            }
+            else
+            {
+                calcHashValue();
+                endps.add(this);
+            }
         }
         return endps;
     }
diff --git a/java/ssl/jdk1.5/IceSSL/EndpointI.java b/java/ssl/jdk1.5/IceSSL/EndpointI.java
index fb640240eff..1153d352f9d 100644
--- a/java/ssl/jdk1.5/IceSSL/EndpointI.java
+++ b/java/ssl/jdk1.5/IceSSL/EndpointI.java
@@ -388,8 +388,29 @@ final class EndpointI extends IceInternal.EndpointI
         }
         else
         {
-            calcHashValue();
-            endps.add(this);
+            if(!server)
+            {
+                java.util.ArrayList hosts = IceInternal.Network.getHosts(_host);
+                if(hosts.size() > 1)
+                {
+                    java.util.Iterator iter = hosts.iterator();
+                    while(iter.hasNext())
+                    {
+                        String host = (String)iter.next();
+                        endps.add(new EndpointI(_instance, host, _port, _timeout, _connectionId, _compress, true));
+                    }
+                }
+                else
+                {
+                    calcHashValue();
+                    endps.add(this);
+                }
+            }
+            else
+            {
+                calcHashValue();
+                endps.add(this);
+            }
         }
         return endps;
     }