Changeset 5214 for pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c

Timestamp:

Dec 11, 2015 4:59:56 AM (8 years ago)

Author:

ming

Message:

Fixed #1901: crash when async_cnt is set to a value greater than one for SIP TLS transport

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c

@@ -315 +315 @@
     pj_uint32_t sip_ssl_proto;
     struct tls_listener *listener;
-    pj_ssl_sock_param ssock_param;
+    pj_ssl_sock_param ssock_param, newsock_param;
     pj_sockaddr *listener_addr;
     pj_bool_t has_listener;
@@ -472 +472 @@
     has_listener = PJ_FALSE;
 
-    status = pj_ssl_sock_start_accept(listener->ssock, pool, 
+    pj_memcpy(&newsock_param, &ssock_param, sizeof(newsock_param));
+    newsock_param.async_cnt = 1;
+    newsock_param.cb.on_data_read = &on_data_read;
+    newsock_param.cb.on_data_sent = &on_data_sent;
+    status = pj_ssl_sock_start_accept2(listener->ssock, pool, 
                           (pj_sockaddr_t*)listener_addr, 
-                          pj_sockaddr_get_len((pj_sockaddr_t*)listener_addr));
+                          pj_sockaddr_get_len((pj_sockaddr_t*)listener_addr),
+                          &newsock_param);
     if (status == PJ_SUCCESS || status == PJ_EPENDING) {
         pj_ssl_sock_info info;