- Removed old IceSSL::ConnectionInfo struct, it's now replaced with

  IceSSL::NativeConnectionInfo.
- Removed Ice::ConnectionInfo endpoint attribute.
- Added Ice::Connection::getEndpoint() method.
- Added Ice::ConnectionInfo adapterName and incoming attributes.
- Replaced Tcp and Udp prefixes with TCP and UDP in endpoint/info classes.
- Added IPEndpointInfo and IPConnectionInfo intermediate classes.
- Fixed 2058: deprecate ice_hash for Ice.Object & Ice.LocalObject, added ice_getHash
- Fixed bug where Ice::Endpoint comparison would only compare the endpoint object addresses rather than the endpoint attributes like in Java and C#.
- Added ice_getHash implementation for endpoints and cleaned up Reference::hash to use HashUtil.h helper methods.
- Added test/Ice/info and removed endpoint info test from test/Ice/proxy.

1 files changed, 11 insertions, 11 deletions

diff --git a/cpp/test/IceSSL/configuration/TestI.cpp b/cpp/test/IceSSL/configuration/TestI.cpp
index ac320a0f715..5c611d2a052 100644
--- a/cpp/test/IceSSL/configuration/TestI.cpp
+++ b/cpp/test/IceSSL/configuration/TestI.cpp
@@ -26,10 +26,10 @@ ServerI::noCert(const Ice::Current& c)
 {
     try
     {
-        IceSSL::ConnectionInfo info = IceSSL::getConnectionInfo(c.con);
-        test(info.certs.size() == 0);
+        IceSSL::NativeConnectionInfoPtr info = IceSSL::NativeConnectionInfoPtr::dynamicCast(c.con->getInfo());
+        test(info->nativeCerts.size() == 0);
     }
-    catch(const IceSSL::ConnectionInvalidException&)
+    catch(const Ice::LocalException&)
     {
         test(false);
     }
@@ -40,12 +40,12 @@ ServerI::checkCert(const string& subjectDN, const string& issuerDN, const Ice::C
 {
     try
     {
-        IceSSL::ConnectionInfo info = IceSSL::getConnectionInfo(c.con);
-        test(info.certs.size() == 2 &&
-             info.certs[0]->getSubjectDN() == IceSSL::DistinguishedName(subjectDN) &&
-             info.certs[0]->getIssuerDN() == IceSSL::DistinguishedName(issuerDN));
+        IceSSL::NativeConnectionInfoPtr info = IceSSL::NativeConnectionInfoPtr::dynamicCast(c.con->getInfo());
+        test(info->nativeCerts.size() == 2 &&
+             info->nativeCerts[0]->getSubjectDN() == IceSSL::DistinguishedName(subjectDN) &&
+             info->nativeCerts[0]->getIssuerDN() == IceSSL::DistinguishedName(issuerDN));
     }
-    catch(const IceSSL::ConnectionInvalidException&)
+    catch(const Ice::LocalException&)
     {
         test(false);
     }
@@ -56,10 +56,10 @@ ServerI::checkCipher(const string& cipher, const Ice::Current& c)
 {
     try
     {
-        IceSSL::ConnectionInfo info = IceSSL::getConnectionInfo(c.con);
-        test(info.cipher.compare(0, cipher.size(), cipher) == 0);
+        IceSSL::NativeConnectionInfoPtr info = IceSSL::NativeConnectionInfoPtr::dynamicCast(c.con->getInfo());
+        test(info->cipher.compare(0, cipher.size(), cipher) == 0);
     }
-    catch(const IceSSL::ConnectionInvalidException&)
+    catch(const Ice::LocalException&)
     {
         test(false);
     }