Changeset 5344 for pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

Timestamp:

Jun 15, 2016 1:59:14 AM (8 years ago)

Author:

ming

Message:

Re #1930: Revert back the change to comment do_handshake() in on_accept_complete() committed in r5343.

File:

• pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c (modified) (1 diff)

pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

@@ -1969 +1969 @@
     ssock->ssl_state = SSL_STATE_HANDSHAKING;
     SSL_set_accept_state(ssock->ossl_ssl);
-    //To avoid race condition, we don't need to do it here and
-    //let the handshake happen in ssock->asock's callback instead.
-    //status = do_handshake(ssock);
+    status = do_handshake(ssock);
 
 on_return:
-    if (ssock && status != PJ_SUCCESS) {
-        //on_handshake_complete(ssock, status);
-        close_sockets(ssock);
+    if (ssock && status != PJ_EPENDING) {
+        on_handshake_complete(ssock, status);
     }