Changeset 742 for pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c

Timestamp:

Sep 26, 2006 1:21:02 PM (18 years ago)

Author:

bennylp

Message:

Added support for specifying IP address in PJSUA-LIB/pjsua.
This option can be used for example to select the IP
interface of SIP/RTP/RTCP transports, or to specify the
public IP address of NAT/router in case port forwarding is
used.

For SIP transports, this feature works for both UDP and
TCP transports.

Changes:

• added public_ip field in pjsua_transport_config, and change SIP and media transport creation to consider this option.
• added --ip-addr option in pjsua
• added pjsip_tcp_transport_start2() which allows specifying alternate TCP published address when creating TCP transports.

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c (modified) (11 diffs)

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

@@ -70 +70 @@
 {
     pjsip_tpfactory          factory;
-    char                     obj_name[PJ_MAX_OBJ_NAME];
     pj_bool_t                is_registered;
     pjsip_endpoint          *endpt;
@@ -185 +184 @@
  * TCP listener.
  */
-PJ_DEF(pj_status_t) pjsip_tcp_transport_start( pjsip_endpoint *endpt,
+PJ_DEF(pj_status_t) pjsip_tcp_transport_start2(pjsip_endpoint *endpt,
                                                const pj_sockaddr_in *local,
+                                               const pjsip_host_port *a_name,
                                                unsigned async_cnt,
                                                pjsip_tpfactory **p_factory)
@@ -201 +201 @@
     PJ_ASSERT_RETURN(endpt && async_cnt, PJ_EINVAL);
 
+    /* Verify that address given in a_name (if any) is valid */
+    if (a_name && a_name->host.slen) {
+        pj_sockaddr_in tmp;
+
+        status = pj_sockaddr_in_init(&tmp, &a_name->host, 
+                                     (pj_uint16_t)a_name->port);
+        if (status != PJ_SUCCESS || tmp.sin_addr.s_addr == PJ_INADDR_ANY ||
+            tmp.sin_addr.s_addr == PJ_INADDR_NONE)
+        {
+            /* Invalid address */
+            return PJ_EINVAL;
+        }
+    }
 
     pool = pjsip_endpt_create_pool(endpt, "tcplis", POOL_LIS_INIT, 
@@ -215 +228 @@
     listener->sock = PJ_INVALID_SOCKET;
 
-    pj_ansi_strcpy(listener->obj_name, "tcp");
+    pj_ansi_strcpy(listener->factory.obj_name, "tcplis");
 
     status = pj_lock_create_recursive_mutex(pool, "tcplis", 
@@ -246 +259 @@
         goto on_error;
 
-    /* If the address returns 0.0.0.0, use the first interface address
-     * as the transport's address.
+    /* If published host/IP is specified, then use that address as the
+     * listener advertised address.
      */
-    if (listener_addr->sin_addr.s_addr == 0) {
-        pj_in_addr hostip;
-
-        status = pj_gethostip(&hostip);
-        if (status != PJ_SUCCESS)
-            goto on_error;
-
-        listener_addr->sin_addr = hostip;
-    }
-
-    pj_ansi_snprintf(listener->obj_name, sizeof(listener->obj_name), 
-                     "tcp:%d",  (int)pj_ntohs(listener_addr->sin_port));
-
-    /* Save the address name */
-    sockaddr_to_host_port(listener->factory.pool, 
-                          &listener->factory.addr_name, listener_addr);
+    if (a_name && a_name->host.slen) {
+        /* Copy the address */
+        listener->factory.addr_name = *a_name;
+        pj_strdup(listener->factory.pool, &listener->factory.addr_name.host, 
+                  &a_name->host);
+        listener->factory.addr_name.port = a_name->port;
+
+    } else {
+        /* No published address is given, use the bound address */
+
+        /* If the address returns 0.0.0.0, use the default
+         * interface address as the transport's address.
+         */
+        if (listener_addr->sin_addr.s_addr == 0) {
+            pj_in_addr hostip;
+
+            status = pj_gethostip(&hostip);
+            if (status != PJ_SUCCESS)
+                goto on_error;
+
+            listener_addr->sin_addr = hostip;
+        }
+
+        /* Save the address name */
+        sockaddr_to_host_port(listener->factory.pool, 
+                              &listener->factory.addr_name, listener_addr);
+    }
+
+    /* If port is zero, get the bound port */
+    if (listener->factory.addr_name.port == 0) {
+        listener->factory.addr_name.port = pj_ntohs(listener_addr->sin_port);
+    }
+
+    pj_ansi_snprintf(listener->factory.obj_name, 
+                     sizeof(listener->factory.obj_name),
+                     "tcplis:%d",  listener->factory.addr_name.port);
+
 
     /* Start listening to the address */
@@ -320 +354 @@
     }
 
-    PJ_LOG(4,(listener->obj_name, 
-             "SIP TCP listener ready for incoming connections at %s:%d",
-             pj_inet_ntoa(listener_addr->sin_addr), 
-             (int)pj_ntohs(listener_addr->sin_port)));
+    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));
 
     /* Return the pointer to user */
@@ -333 +368 @@
     lis_destroy(&listener->factory);
     return status;
+}
+
+
+/*
+ * This is the public API to create, initialize, register, and start the
+ * TCP listener.
+ */
+PJ_DEF(pj_status_t) pjsip_tcp_transport_start( pjsip_endpoint *endpt,
+                                               const pj_sockaddr_in *local,
+                                               unsigned async_cnt,
+                                               pjsip_tpfactory **p_factory)
+{
+    return pjsip_tcp_transport_start2(endpt, local, NULL, async_cnt, p_factory);
 }
 
@@ -374 +422 @@
         pj_pool_t *pool = listener->factory.pool;
 
-        PJ_LOG(4,(listener->obj_name,  "SIP TCP listener destroyed"));
+        PJ_LOG(4,(listener->factory.obj_name,  "SIP TCP listener destroyed"));
 
         listener->factory.pool = NULL;
@@ -856 +904 @@
              * Error in accept().
              */
-            tcp_perror(listener->obj_name, "Error in accept()", status);
+            tcp_perror(listener->factory.obj_name, "Error in accept()", 
+                       status);
 
             /*
@@ -866 +915 @@
             ++err_cnt;
             if (err_cnt >= 10) {
-                PJ_LOG(1, (listener->obj_name, 
+                PJ_LOG(1, (listener->factory.obj_name, 
                            "Too many errors, listener stopping"));
             }
@@ -883 +932 @@
             }
 
-            PJ_LOG(4,(listener->obj_name, 
+            PJ_LOG(4,(listener->factory.obj_name, 
                       "TCP listener %.*s:%d: got incoming TCP connection "
                       "from %s:%d, sock=%d",