Changeset 5513 for pjproject/branches/projects/uwp/pjsip/src/pjsip/sip_transport_tls.c

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjsip/src/pjsip/sip_transport_tls.c (modified) (14 diffs)

pjproject/branches/projects/uwp/pjsip/src/pjsip/sip_transport_tls.c

@@ -171 +171 @@
     pj_strerror(status, errmsg, sizeof(errmsg));
 
-    PJ_LOG(1,(sender, "%s: %s [code=%d]", title, errmsg, status));
+    PJ_LOG(3,(sender, "%s: %s [code=%d]", title, errmsg, status));
 }
 
@@ -310 +310 @@
                                                 pjsip_tpfactory **p_factory)
 {
+    enum { INFO_LEN = 100 };
+    char local_addr[PJ_INET6_ADDRSTRLEN+10];
     pj_pool_t *pool;
     pj_bool_t is_ipv6;
@@ -315 +317 @@
     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;
@@ -376 +378 @@
     ssock_param.sock_af = af;
     ssock_param.cb.on_accept_complete = &on_accept_complete;
-    ssock_param.cb.on_data_read = &on_data_read;
-    ssock_param.cb.on_data_sent = &on_data_sent;
     ssock_param.async_cnt = async_cnt;
     ssock_param.ioqueue = pjsip_endpt_get_ioqueue(endpt);
+    ssock_param.timer_heap = pjsip_endpt_get_timer_heap(endpt);    
     ssock_param.require_client_cert = listener->tls_setting.require_client_cert;
     ssock_param.timeout = listener->tls_setting.timeout;
@@ -391 +392 @@
     ssock_param.ciphers_num = listener->tls_setting.ciphers_num;
     ssock_param.ciphers = listener->tls_setting.ciphers;
+    ssock_param.curves_num = listener->tls_setting.curves_num;
+    ssock_param.curves = listener->tls_setting.curves;
+    ssock_param.sigalgs = listener->tls_setting.sigalgs;
+    ssock_param.entropy_type = listener->tls_setting.entropy_type;
+    ssock_param.entropy_path = listener->tls_setting.entropy_path;
     ssock_param.reuse_addr = listener->tls_setting.reuse_addr;
     ssock_param.qos_type = listener->tls_setting.qos_type;
@@ -444 +450 @@
         pj_sockaddr_init(af, &listener->bound_addr, NULL, 0);
     }
-
-#if !(defined(PJSIP_TLS_TRANSPORT_DONT_CREATE_LISTENER) && \
-      PJSIP_TLS_TRANSPORT_DONT_CREATE_LISTENER != 0)
 
     /* Check if certificate/CA list for SSL socket is set */
@@ -462 +465 @@
         if (status != PJ_SUCCESS)
             goto on_error;
-
+     }
+
+#if !(defined(PJSIP_TLS_TRANSPORT_DONT_CREATE_LISTENER) && \
+      PJSIP_TLS_TRANSPORT_DONT_CREATE_LISTENER != 0)
+
+     if (listener->cert) {
         status = pj_ssl_sock_set_certificate(listener->ssock, pool, 
                                              listener->cert);
@@ -474 +482 @@
     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;
@@ -543 +556 @@
         goto on_error;
     }
+
+    /* Set transport info. */
+    if (listener->factory.info == NULL) {
+        listener->factory.info = (char*) pj_pool_alloc(listener->factory.pool,
+                                                       INFO_LEN);
+    }
+    pj_sockaddr_print(listener_addr, local_addr, sizeof(local_addr), 3);
+    pj_ansi_snprintf( 
+        listener->factory.info, INFO_LEN, "tls %s [published as %.*s:%d]",
+        local_addr,
+        (int)listener->factory.addr_name.host.slen,
+        listener->factory.addr_name.host.ptr,
+        listener->factory.addr_name.port);
 
     if (has_listener) {
@@ -740 +766 @@
     tls->base.do_shutdown = &tls_shutdown;
     tls->base.destroy = &tls_destroy_transport;
+    tls->base.factory = &listener->factory;
 
     tls->ssock = ssock;
@@ -1037 +1064 @@
     ssock_param.async_cnt = 1;
     ssock_param.ioqueue = pjsip_endpt_get_ioqueue(listener->endpt);
+    ssock_param.timer_heap = pjsip_endpt_get_timer_heap(listener->endpt);
     ssock_param.server_name = remote_name;
     ssock_param.timeout = listener->tls_setting.timeout;
@@ -1048 +1076 @@
     ssock_param.ciphers_num = listener->tls_setting.ciphers_num;
     ssock_param.ciphers = listener->tls_setting.ciphers;
+    ssock_param.curves_num = listener->tls_setting.curves_num;
+    ssock_param.curves = listener->tls_setting.curves;
+    ssock_param.sigalgs = listener->tls_setting.sigalgs;
+    ssock_param.entropy_type = listener->tls_setting.entropy_type;
+    ssock_param.entropy_path = listener->tls_setting.entropy_path;
     ssock_param.qos_type = listener->tls_setting.qos_type;
     ssock_param.qos_ignore_error = listener->tls_setting.qos_ignore_error;
@@ -1292 +1325 @@
         /* Start keep-alive timer */
         if (pjsip_cfg()->tls.keep_alive_interval) {
-            pj_time_val delay = {pjsip_cfg()->tls.keep_alive_interval, 0};
+            pj_time_val delay = {0};        
+            delay.sec = pjsip_cfg()->tls.keep_alive_interval;
             pjsip_endpt_schedule_timer(listener->endpt, 
                                        &tls->ka_timer, 
@@ -1766 +1800 @@
     /* Start keep-alive timer */
     if (pjsip_cfg()->tls.keep_alive_interval) {
-        pj_time_val delay = { pjsip_cfg()->tls.keep_alive_interval, 0 };
+        pj_time_val delay = {0};            
+        delay.sec = pjsip_cfg()->tls.keep_alive_interval;
         pjsip_endpt_schedule_timer(tls->base.endpt, &tls->ka_timer, 
                                    &delay);