[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-client-cvs
Subject:    [Client-cvs] common/netio shim_socket.cpp,1.6.8.1,1.6.8.2
From:       henryxing () helixcommunity ! org
Date:       2012-02-09 7:53:48
[Download RAW message or body]

Update of /cvsroot/client/common/netio
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv20461

Modified Files:
      Tag: hxclient_3_1_0_atlas
	shim_socket.cpp 
Log Message:
integrate openssl in unix_net for HXC-72, only for unix/android platform, need update future

Index: shim_socket.cpp
===================================================================
RCS file: /cvsroot/client/common/netio/shim_socket.cpp,v
retrieving revision 1.6.8.1
retrieving revision 1.6.8.2
diff -u -d -r1.6.8.1 -r1.6.8.2
--- shim_socket.cpp	12 Sep 2007 06:05:12 -0000	1.6.8.1
+++ shim_socket.cpp	9 Feb 2012 07:53:44 -0000	1.6.8.2
@@ -109,6 +109,12 @@
             *ppvObj = (IHXUDPResponse*) this;
             retVal  = HXR_OK;
         }
+        else if (IsEqualIID(riid, IID_IHXTCPSecureSocket))
+        {
+            AddRef();
+            *ppvObj = (IHXTCPSecureSocket*) this;
+            retVal  = HXR_OK;
+        }
     }
 
     return retVal;
@@ -240,6 +246,13 @@
                     }
                 }
                 HX_RELEASE(pResp);
+                IHXTCPSecureSocket* pSecureSocket = NULL;
+                m_pTCPSocket->QueryInterface(IID_IHXTCPSecureSocket, (void**) &pSecureSocket);
+                if (pSecureSocket && m_bSecureSocket)
+                {
+                    pSecureSocket->SetSecure(TRUE);
+                }
+                HX_RELEASE(pSecureSocket);
             }
         }
         else if (t == HX_SOCK_TYPE_UDP)
@@ -783,6 +796,16 @@
     return retVal;
 }
 
+STDMETHODIMP
+CHXClientSocketShim::SetSecure(HXBOOL bSecure)
+{
+    HX_RESULT res = HXR_OK;
+
+    m_bSecureSocket = bSecure;
+
+    return res;
+}
+
 STDMETHODIMP CHXClientSocketShim::WriteReady(HX_RESULT status)
 {
     return HXR_NOTIMPL;
@@ -1080,6 +1103,7 @@
     m_bBigEndian        = TestBigEndian();
     m_bReadDonePending  = FALSE;
     m_pUDPConnectAddr   = NULL;
+    m_bSecureSocket     = FALSE;
 
     m_pContext->AddRef();
     m_pNetServices->AddRef();


_______________________________________________
Client-cvs mailing list
Client-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/client-cvs
[prev in list] [next in list] [prev in thread] [next in thread]