Changeset 5152 for pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.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_tcp.c (modified) (12 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c

@@ -259 +259 @@
     pj_sockaddr *listener_addr;
     int addr_len;
+    pj_bool_t has_listener = PJ_FALSE;
     pj_status_t status;
 
@@ -279 +280 @@
     }
 
-    pool = pjsip_endpt_create_pool(endpt, "tcplis", POOL_LIS_INIT, 
+    pool = pjsip_endpt_create_pool(endpt, "tcptp", POOL_LIS_INIT, 
                                    POOL_LIS_INC);
     PJ_ASSERT_RETURN(pool, PJ_ENOMEM);
@@ -298 +299 @@
               sizeof(cfg->sockopt_params));
 
-    pj_ansi_strcpy(listener->factory.obj_name, "tcplis");
+    pj_ansi_strcpy(listener->factory.obj_name, "tcptp");
     if (listener->factory.type==PJSIP_TRANSPORT_TCP6)
         pj_ansi_strcat(listener->factory.obj_name, "6");
@@ -307 +308 @@
         goto on_error;
 
+#if !(defined(PJSIP_TCP_TRANSPORT_DONT_CREATE_LISTENER) && \
+      PJSIP_TCP_TRANSPORT_DONT_CREATE_LISTENER != 0)
 
     /* Create socket */
@@ -333 +336 @@
         status = pj_sock_setsockopt_params(sock, &cfg->sockopt_params);
 
+#else
+    PJ_UNUSED_ARG(addr_len);
+#endif
+
     /* Bind address may be different than factory.local_addr because
      * factory.local_addr will be resolved below.
@@ -341 +348 @@
     listener_addr = &listener->factory.local_addr;
     pj_sockaddr_cp(listener_addr, &cfg->bind_addr);
+
+#if !(defined(PJSIP_TCP_TRANSPORT_DONT_CREATE_LISTENER) && \
+      PJSIP_TCP_TRANSPORT_DONT_CREATE_LISTENER != 0)
 
     status = pj_sock_bind(sock, listener_addr, 
@@ -352 +362 @@
     if (status != PJ_SUCCESS)
         goto on_error;
+
+#endif
 
     /* If published host/IP is specified, then use that address as the
@@ -393 +405 @@
     pj_ansi_snprintf(listener->factory.obj_name, 
                      sizeof(listener->factory.obj_name),
-                     "tcplis:%d",  listener->factory.addr_name.port);
-
+                     "tcptp:%d",  listener->factory.addr_name.port);
+
+
+#if !(defined(PJSIP_TCP_TRANSPORT_DONT_CREATE_LISTENER) && \
+      PJSIP_TCP_TRANSPORT_DONT_CREATE_LISTENER != 0)
 
     /* Start listening to the address */
@@ -409 +424 @@
         asock_cfg.async_cnt = cfg->async_cnt;
 
+#endif
+
     /* Create group lock */
     status = pj_grp_lock_create(pool, NULL, &listener->grp_lock);
@@ -422 +439 @@
     pj_bzero(&listener_cb, sizeof(listener_cb));
     listener_cb.on_accept_complete = &on_accept_complete;
+
+#if !(defined(PJSIP_TCP_TRANSPORT_DONT_CREATE_LISTENER) && \
+      PJSIP_TCP_TRANSPORT_DONT_CREATE_LISTENER != 0)
+
     status = pj_activesock_create(pool, sock, pj_SOCK_STREAM(), &asock_cfg,
                                   pjsip_endpt_get_ioqueue(endpt), 
                                   &listener_cb, listener,
                                   &listener->asock);
+
+#endif
 
     /* Register to transport manager */
@@ -440 +463 @@
     }
 
+#if !(defined(PJSIP_TCP_TRANSPORT_DONT_CREATE_LISTENER) && \
+      PJSIP_TCP_TRANSPORT_DONT_CREATE_LISTENER != 0)
+
     /* Start pending accept() operations */
     status = pj_activesock_start_accept(listener->asock, pool);
     if (status != PJ_SUCCESS)
         goto on_error;
-
-    PJ_LOG(4,(listener->factory.obj_name, 
-             "SIP TCP listener ready for incoming connections at %.*s:%d",
-             (int)listener->factory.addr_name.host.slen,
-             listener->factory.addr_name.host.ptr,
-             listener->factory.addr_name.port));
+        
+    has_listener = PJ_TRUE;
+
+#endif
+
+    if (has_listener) {
+        PJ_LOG(4,(listener->factory.obj_name, 
+                 "SIP TCP listener ready for incoming connections at %.*s:%d",
+                 (int)listener->factory.addr_name.host.slen,
+                 listener->factory.addr_name.host.ptr,
+                 listener->factory.addr_name.port));
+    } else {
+        PJ_LOG(4,(listener->factory.obj_name, "SIP TCP is ready "
+                  "(client only)"));    
+    }
 
     /* Return the pointer to user */
@@ -519 +554 @@
         pj_pool_t *pool = listener->factory.pool;
 
-        PJ_LOG(4,(listener->factory.obj_name,  "SIP TCP listener destroyed"));
+        PJ_LOG(4,(listener->factory.obj_name,  "SIP TCP transport destroyed"));
 
         listener->factory.pool = NULL;