Changeset 5386 for pjproject

Timestamp:

Jul 15, 2016 10:16:58 AM (8 years ago)

Author:

ming

Message:

Re #1928 (misc): Re #1878 (Compile time option for TCP/TLS transport to not create a listener)

When not creating a TLS listener, still call pj_ssl_sock_set_certificate(), since it will later still be used by clients.

File:

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

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

@@ -446 +446 @@
     }
 
-#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 */
     if (listener->tls_setting.cert_file.slen ||
@@ -463 +460 @@
         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);