Fixed (ICE-6179) - SessionHelper classes create bogus endpoint when use ipv6 address

13 files changed, 29 insertions, 23 deletions

diff --git a/cpp/allTests.py b/cpp/allTests.py
index 85fc2847220..a18c19c95e4 100755
--- a/cpp/allTests.py
+++ b/cpp/allTests.py
@@ -112,7 +112,7 @@ tests = [
     ("Glacier2/ssl", ["service", "novalgrind", "novc100", "nomingw"]), # valgrind doesn't work well with openssl
     ("Glacier2/dynamicFiltering", ["service", "novc100", "nomingw"]),
     ("Glacier2/staticFiltering", ["service", "noipv6", "novc100", "nomingw", "nomx"]),
-    ("Glacier2/sessionHelper", ["service", "novc100", "nomingw", "nossl", "noipv6"]),
+    ("Glacier2/sessionHelper", ["core", "novc100", "nomingw"]),
     ]
 
 #
diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp
index 0e75b6b2136..b75ba28cc97 100644
--- a/cpp/src/Glacier2Lib/SessionHelper.cpp
+++ b/cpp/src/Glacier2Lib/SessionHelper.cpp
@@ -1023,7 +1023,7 @@ Glacier2::SessionFactoryHelper::createProxyStr(const Ice::Identity& ident)
     {
         os << ident.category << "/";
     }
-    os << ident.name << "\":" << _protocol << " -p " << getPortInternal() << " -h " << _routerHost;
+    os << ident.name << "\":" << _protocol << " -p " << getPortInternal() << " -h \"" << _routerHost << "\"";
     if(_timeout > 0)
     {
         os << " -t " << _timeout;
diff --git a/cpp/test/Glacier2/sessionHelper/Client.cpp b/cpp/test/Glacier2/sessionHelper/Client.cpp
index 0cb9020cbbb..0290fcf85f7 100644
--- a/cpp/test/Glacier2/sessionHelper/Client.cpp
+++ b/cpp/test/Glacier2/sessionHelper/Client.cpp
@@ -228,6 +228,7 @@ public:
     {
         instance = this;
         string protocol = communicator()->getProperties()->getPropertyWithDefault("Ice.Default.Protocol", "tcp");
+        string host = communicator()->getProperties()->getPropertyWithDefault("Ice.Default.Host", "127.0.0.1");
         _initData.properties = Ice::createProperties(argc, argv, communicator()->getProperties());
         _initData.properties->setProperty("Ice.Default.Router", "Glacier2/router:default -p 12347");
 
@@ -260,7 +261,7 @@ public:
         {
             IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
             cout << "testing SessionHelper connect... " << flush;
-            _factory->setRouterHost("localhost");
+            _factory->setRouterHost(host);
             _factory->setPort(12347);
             _factory->setProtocol(protocol);
             _session = _factory->connect("userid", "abc123");
@@ -370,7 +371,7 @@ public:
             Ice::ObjectPrx processBase;
             {
                 cout << "testing stringToProxy for process object... " << flush;
-                processBase = communicator()->stringToProxy("Glacier2/admin -f Process:default -h localhost -p 12348");
+                processBase = communicator()->stringToProxy("Glacier2/admin -f Process:default -h \"" + host + "\" -p 12348");
                 cout << "ok" << endl;
             }
 
@@ -407,7 +408,7 @@ public:
         {
             IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
             cout << "testing SessionHelper connect after router shutdown... " << flush;
-            _factory->setRouterHost("localhost");
+            _factory->setRouterHost(host);
             _factory->setPort(12347);
             _factory->setProtocol(protocol);
             _session = _factory->connect("userid", "abc123");
diff --git a/cpp/test/Glacier2/sessionHelper/run.py b/cpp/test/Glacier2/sessionHelper/run.py
index 0e234083923..dbba0aa4d9a 100755
--- a/cpp/test/Glacier2/sessionHelper/run.py
+++ b/cpp/test/Glacier2/sessionHelper/run.py
@@ -26,8 +26,8 @@ args =  ' --Ice.Warn.Dispatch=0' + \
         ' --Ice.Warn.Connections=0' + \
         ' --Glacier2.SessionTimeout="30"' + \
         ' --Glacier2.Client.Endpoints="default -p 12347"' + \
-        ' --Glacier2.Server.Endpoints="default -h 127.0.0.1"' \
-        ' --Ice.Admin.Endpoints="default -h 127.0.0.1 -p 12348"' + \
+        ' --Glacier2.Server.Endpoints="default"' \
+        ' --Ice.Admin.Endpoints="default -p 12348"' + \
         ' --Ice.Admin.InstanceName=Glacier2' + \
         ' --Glacier2.CryptPasswords="' + os.path.join(os.getcwd(), "passwords") + '"'
 
diff --git a/cs/allTests.py b/cs/allTests.py
index e91097ca766..1fcb16a8d63 100755
--- a/cs/allTests.py
+++ b/cs/allTests.py
@@ -72,7 +72,7 @@ tests = [
     ("IceBox/admin", ["core", "noipv6", "nosilverlight", "nomx"]),
     ("IceBox/configuration", ["core", "noipv6", "nosilverlight", "nomx"]),
     ("Glacier2/router", ["service", "nosilverlight"]),
-    ("Glacier2/sessionHelper", ["service", "nosilverlight", "noipv6"]),
+    ("Glacier2/sessionHelper", ["core", "nosilverlight"]),
     ("IceGrid/simple", ["service", "nosilverlight"]),
     ("IceSSL/configuration", ["once", "novista", "nomono", "nocompact", "nosilverlight"]),
     ]
diff --git a/cs/src/Glacier2/SessionFactoryHelper.cs b/cs/src/Glacier2/SessionFactoryHelper.cs
index 7ddb9e5e73f..f298e22c2f4 100644
--- a/cs/src/Glacier2/SessionFactoryHelper.cs
+++ b/cs/src/Glacier2/SessionFactoryHelper.cs
@@ -359,8 +359,9 @@ public class SessionFactoryHelper
         sb.Append("\":");        
         sb.Append(_protocol + " -p ");
         sb.Append(getPortInternal());
-        sb.Append(" -h ");
+        sb.Append(" -h \"");
         sb.Append(_routerHost);
+        sb.Append("\"");
         if(_timeout > 0)
         {
             sb.Append(" -t ");
diff --git a/cs/test/Glacier2/sessionHelper/Client.cs b/cs/test/Glacier2/sessionHelper/Client.cs
index 6935cdfe67c..fb4559ac1a6 100644
--- a/cs/test/Glacier2/sessionHelper/Client.cs
+++ b/cs/test/Glacier2/sessionHelper/Client.cs
@@ -170,6 +170,7 @@ public class Client
         public override int run(string[] args)
         {
             String protocol = communicator().getProperties().getPropertyWithDefault("Ice.Default.Protocol", "tcp");
+            String host = communicator().getProperties().getPropertyWithDefault("Ice.Default.Host", "127.0.0.1");
             _factory = new Glacier2.SessionFactoryHelper(_initData, new SessionCalback1());
 
             //
@@ -206,7 +207,7 @@ public class Client
             {
                 Console.Out.Write("testing SessionHelper connect... ");
                 Console.Out.Flush();
-                _factory.setRouterHost("127.0.0.1");
+                _factory.setRouterHost(host);
                 _factory.setPort(12347);
                 _factory.setProtocol(protocol);
                 _session = _factory.connect("userid", "abc123");
@@ -337,7 +338,7 @@ public class Client
                 Ice.ObjectPrx processBase;
                 {
                     Console.Out.Write("testing stringToProxy for process object... ");
-                    processBase = communicator().stringToProxy("Glacier2/admin -f Process:default -h 127.0.0.1 -p 12348");
+                    processBase = communicator().stringToProxy("Glacier2/admin -f Process:default -h \"" + host + "\" -p 12348");
                     Console.Out.WriteLine("ok");
                 }
 
@@ -369,7 +370,7 @@ public class Client
                 Console.Out.Write("testing SessionHelper connect after router shutdown... ");
                 Console.Out.Flush();
 
-                _factory.setRouterHost("127.0.0.1");
+                _factory.setRouterHost(host);
                 _factory.setPort(12347);
                 _factory.setProtocol(protocol);
                 _session = _factory.connect("userid", "abc123");
diff --git a/cs/test/Glacier2/sessionHelper/run.py b/cs/test/Glacier2/sessionHelper/run.py
index 0e234083923..66a08d5d442 100755
--- a/cs/test/Glacier2/sessionHelper/run.py
+++ b/cs/test/Glacier2/sessionHelper/run.py
@@ -26,8 +26,8 @@ args =  ' --Ice.Warn.Dispatch=0' + \
         ' --Ice.Warn.Connections=0' + \
         ' --Glacier2.SessionTimeout="30"' + \
         ' --Glacier2.Client.Endpoints="default -p 12347"' + \
-        ' --Glacier2.Server.Endpoints="default -h 127.0.0.1"' \
-        ' --Ice.Admin.Endpoints="default -h 127.0.0.1 -p 12348"' + \
+        ' --Glacier2.Server.Endpoints=default' \
+        ' --Ice.Admin.Endpoints="default -p 12348"' + \
         ' --Ice.Admin.InstanceName=Glacier2' + \
         ' --Glacier2.CryptPasswords="' + os.path.join(os.getcwd(), "passwords") + '"'
 
diff --git a/java/allTests.py b/java/allTests.py
index 64cc105e72d..00b27d483e0 100755
--- a/java/allTests.py
+++ b/java/allTests.py
@@ -81,7 +81,7 @@ tests = [
     ("Freeze/evictor", ["once"]),
     ("Freeze/fileLock", ["once"]),
     ("Glacier2/router", ["service"]),
-    ("Glacier2/sessionHelper", ["service", "noipv6"]),
+    ("Glacier2/sessionHelper", ["core"]),
     ("IceDiscovery/simple", ["service"]),
     ("IceGrid/simple", ["service"]),
     ("IceSSL/configuration", ["once"])
diff --git a/java/src/Glacier2/src/main/java/Glacier2/SessionFactoryHelper.java b/java/src/Glacier2/src/main/java/Glacier2/SessionFactoryHelper.java
index 6a88abc435f..29947ae26ea 100644
--- a/java/src/Glacier2/src/main/java/Glacier2/SessionFactoryHelper.java
+++ b/java/src/Glacier2/src/main/java/Glacier2/SessionFactoryHelper.java
@@ -349,8 +349,9 @@ public class SessionFactoryHelper
         sb.append("\":");
         sb.append(_protocol + " -p ");
         sb.append(getPortInternal());
-        sb.append(" -h ");
+        sb.append(" -h \"");
         sb.append(_routerHost);
+        sb.append("\"");
         if(_timeout > 0)
         {
             sb.append(" -t ");
diff --git a/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java b/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java
index e80eac3b70d..a3366e56433 100644
--- a/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java
+++ b/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java
@@ -54,6 +54,8 @@ public class Client extends test.Util.Application
     public int run(String[] args)
     {
         String protocol = communicator().getProperties().getPropertyWithDefault("Ice.Default.Protocol", "tcp");
+        String host = communicator().getProperties().getPropertyWithDefault("Ice.Default.Host", "127.0.0.1");
+        
         _factory = new Glacier2.SessionFactoryHelper(_initData, new Glacier2.SessionCallback()
             {
                 @Override
@@ -168,7 +170,7 @@ public class Client extends test.Util.Application
         {
             out.print("testing SessionHelper connect... ");
             out.flush();
-            _factory.setRouterHost("127.0.0.1");
+            _factory.setRouterHost(host);
             _factory.setPort(12347);
             _factory.setProtocol(protocol);
             _session = _factory.connect("userid", "abc123");
@@ -212,7 +214,7 @@ public class Client extends test.Util.Application
 
             out.print("testing stringToProxy for server object... ");
             out.flush();
-            Ice.ObjectPrx base = _session.communicator().stringToProxy("callback:tcp -p 12010");
+            Ice.ObjectPrx base = _session.communicator().stringToProxy("callback:default -p 12010");
             out.println("ok");
 
             out.print("pinging server after session creation... ");
@@ -289,7 +291,7 @@ public class Client extends test.Util.Application
             Ice.ObjectPrx processBase;
             {
                 out.print("testing stringToProxy for process object... ");
-                processBase = communicator().stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348");
+                processBase = communicator().stringToProxy("Glacier2/admin -f Process:default -h \"" + host + "\" -p 12348");
                 out.println("ok");
             }
 
@@ -382,7 +384,7 @@ public class Client extends test.Util.Application
             out.print("testing SessionHelper connect after router shutdown... ");
             out.flush();
 
-            _factory.setRouterHost("127.0.0.1");
+            _factory.setRouterHost(host);
             _factory.setPort(12347);
             _factory.setProtocol(protocol);
             _session = _factory.connect("userid", "abc123");
diff --git a/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java b/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java
index 0429387cb80..5d043e27165 100644
--- a/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java
+++ b/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java
@@ -14,7 +14,7 @@ public class Server extends test.Util.Application
     public int
     run(String[] args)
     {
-        communicator().getProperties().setProperty("CallbackAdapter.Endpoints", "tcp -p 12010");
+        communicator().getProperties().setProperty("CallbackAdapter.Endpoints", "default -p 12010");
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter");
         adapter.add(new CallbackI(), communicator().stringToIdentity("callback"));
         adapter.activate();
diff --git a/java/test/src/main/java/test/Glacier2/sessionHelper/run.py b/java/test/src/main/java/test/Glacier2/sessionHelper/run.py
index ddb8006f352..f5bfff385c0 100755
--- a/java/test/src/main/java/test/Glacier2/sessionHelper/run.py
+++ b/java/test/src/main/java/test/Glacier2/sessionHelper/run.py
@@ -27,8 +27,8 @@ args =  ' --Ice.Warn.Dispatch=0' + \
         ' --Ice.Warn.Connections=0' + \
         ' --Glacier2.SessionTimeout="30"' + \
         ' --Glacier2.Client.Endpoints="default -p 12347"' + \
-        ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1"' \
-        ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348"' + \
+        ' --Glacier2.Server.Endpoints="default"' \
+        ' --Ice.Admin.Endpoints="default -p 12348"' + \
         ' --Ice.Admin.InstanceName=Glacier2' + \
         ' --Glacier2.CryptPasswords="' + os.path.join(os.getcwd(), "passwords") + '"'