From d6591a78fd80c17e09b45bc76b972806d25772a4 Mon Sep 17 00:00:00 2001
From: Jose <jose@zeroc.com>
Date: Tue, 2 Jun 2015 22:35:59 +0200
Subject: WinRT connection info fixes

---
 cpp/src/Ice/winrt/StreamTransceiver.cpp | 9 +++++++--
 cpp/src/Ice/winrt/StreamTransceiver.h   | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'cpp/src')

diff --git a/cpp/src/Ice/winrt/StreamTransceiver.cpp b/cpp/src/Ice/winrt/StreamTransceiver.cpp
index 7cf9946ed9c..76a0f3fb7f0 100644
--- a/cpp/src/Ice/winrt/StreamTransceiver.cpp
+++ b/cpp/src/Ice/winrt/StreamTransceiver.cpp
@@ -159,6 +159,7 @@ IceInternal::StreamTransceiver::startWrite(Buffer& buf)
                         else
                         {
                             _write.count = 0;
+                            _verified = true;
                         }
                         _completedHandler(SocketOperationConnect);
                     });
@@ -296,7 +297,9 @@ IceInternal::StreamTransceiver::getInfo() const
     Ice::IPConnectionInfoPtr info;
     if(_instance->secure())
     {
-        info = new IceSSL::ConnectionInfo();
+        IceSSL::ConnectionInfoPtr sslInfo = new IceSSL::ConnectionInfo();
+        sslInfo->verified = _verified;
+        info = sslInfo;
     }
     else
     {
@@ -312,6 +315,7 @@ IceInternal::StreamTransceiver::getWSInfo(const Ice::HeaderDict& headers) const
     if(_instance->secure())
     {
         IceSSL::WSSConnectionInfoPtr info = new IceSSL::WSSConnectionInfo();
+        info->verified = _verified;
         fillConnectionInfo(info);
         info->headers = headers;
         return info;
@@ -340,7 +344,8 @@ IceInternal::StreamTransceiver::StreamTransceiver(const ProtocolInstancePtr& ins
     NativeInfo(fd),
     _instance(instance),
     _state(connected ? StateConnected : StateNeedConnect),
-    _desc(connected ? fdToString(_fd) : string())
+    _desc(connected ? fdToString(_fd) : string()),
+    _verified(false)
 {
     StreamSocket^ streamSocket = safe_cast<StreamSocket^>(_fd);
     _writer = ref new DataWriter(streamSocket->OutputStream);
diff --git a/cpp/src/Ice/winrt/StreamTransceiver.h b/cpp/src/Ice/winrt/StreamTransceiver.h
index 6d7effd8e49..2fc822868f0 100644
--- a/cpp/src/Ice/winrt/StreamTransceiver.h
+++ b/cpp/src/Ice/winrt/StreamTransceiver.h
@@ -70,6 +70,7 @@ private:
 
     State _state;
     std::string _desc;
+    bool _verified;
     Address _connectAddr;
 
     AsyncInfo _read;
-- 
cgit v1.2.3