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

Timestamp:

Aug 7, 2015 9:00:52 AM (9 years ago)

Author:

ming

Message:

Fixed #1878: Compile time option for TCP/TLS transport to not create a listener

File:

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

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

@@ -340 +340 @@
     }
 
-    pool = pjsip_endpt_create_pool(endpt, "tlslis", POOL_LIS_INIT, 
+    pool = pjsip_endpt_create_pool(endpt, "tlstp", POOL_LIS_INIT, 
                                    POOL_LIS_INC);
     PJ_ASSERT_RETURN(pool, PJ_ENOMEM);
@@ -355 +355 @@
         pjsip_transport_get_flag_from_type(listener->factory.type);
 
-    pj_ansi_strcpy(listener->factory.obj_name, "tlslis");
+    pj_ansi_strcpy(listener->factory.obj_name, "tlstp");
     if (is_ipv6)
         pj_ansi_strcat(listener->factory.obj_name, "6");
@@ -420 +420 @@
                             &lis_on_destroy);
 
+#if !(defined(PJSIP_TLS_TRANSPORT_DONT_CREATE_LISTENER) && \
+      PJSIP_TLS_TRANSPORT_DONT_CREATE_LISTENER != 0)
+
     ssock_param.grp_lock = listener->grp_lock;
 
@@ -426 +429 @@
     if (status != PJ_SUCCESS)
         goto on_error;
+
+#endif
 
     /* Bind address may be different than factory.local_addr because
@@ -439 +444 @@
         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 */
@@ -481 +489 @@
     }
 
+#endif
+
     /* If published host/IP is specified, then use that address as the
      * listener advertised address.
@@ -519 +529 @@
     pj_ansi_snprintf(listener->factory.obj_name, 
                      sizeof(listener->factory.obj_name),
-                     "tlslis:%d",  listener->factory.addr_name.port);
+                     "tlstp:%d",  listener->factory.addr_name.port);
 
     /* Register to transport manager */
@@ -570 +580 @@
         pj_pool_t *pool = listener->factory.pool;
 
-        PJ_LOG(4,(listener->factory.obj_name,  "SIP TLS listener destroyed"));
+        PJ_LOG(4,(listener->factory.obj_name,  "SIP TLS transport destroyed"));
 
         listener->factory.pool = NULL;