diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2015-01-08 12:19:48 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2015-01-08 12:19:48 -0330 |
| commit | 4ab0b1e065a21ff4a4b39270f9898d26ac4aac0d (patch) | |
| tree | cab68796af504ee4520c3c73dabb0754cbf72d81 /cpp/src/Ice/winrt/StreamTransceiver.cpp | |
| parent | Additional fix for ICE_HAS_BZIP2 macro (diff) | |
| download | ice-4ab0b1e065a21ff4a4b39270f9898d26ac4aac0d.tar.bz2 ice-4ab0b1e065a21ff4a4b39270f9898d26ac4aac0d.tar.xz ice-4ab0b1e065a21ff4a4b39270f9898d26ac4aac0d.zip | |
ICE-6196 added ProtocolInstance::secure()
Diffstat (limited to 'cpp/src/Ice/winrt/StreamTransceiver.cpp')
| -rw-r--r-- | cpp/src/Ice/winrt/StreamTransceiver.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/cpp/src/Ice/winrt/StreamTransceiver.cpp b/cpp/src/Ice/winrt/StreamTransceiver.cpp index 6721530fcd3..d2697418895 100644 --- a/cpp/src/Ice/winrt/StreamTransceiver.cpp +++ b/cpp/src/Ice/winrt/StreamTransceiver.cpp @@ -135,17 +135,16 @@ IceInternal::StreamTransceiver::startWrite(Buffer& buf) IAsyncAction^ action = safe_cast<StreamSocket^>(_fd)->ConnectAsync( _connectAddr.host, _connectAddr.port, - (_instance->type() == IceSSL::EndpointType || - _instance->type() == Ice::WSSEndpointType) ? - // - // SocketProtectionLevel::Tls12 is new in Windows 8.1 SDK - // + _instance->secure() ? + // + // SocketProtectionLevel::Tls12 is new in Windows 8.1 SDK + // #if defined(_MSC_VER) && _MSC_VER >= 1800 - SocketProtectionLevel::Tls12 : + SocketProtectionLevel::Tls12 : #else - SocketProtectionLevel::Ssl : + SocketProtectionLevel::Ssl : #endif - SocketProtectionLevel::PlainSocket); + SocketProtectionLevel::PlainSocket); if(!checkIfErrorOrCompleted(SocketOperationConnect, action)) { @@ -295,7 +294,7 @@ Ice::ConnectionInfoPtr IceInternal::StreamTransceiver::getInfo() const { Ice::IPConnectionInfoPtr info; - if(_instance->type() == IceSSL::EndpointType || _instance->type() == Ice::WSSEndpointType) + if(_instance->secure()) { info = new IceSSL::ConnectionInfo(); } |