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

4 files changed, 8 insertions, 7 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") + '"'