Changeset 5308

Timestamp:

May 19, 2016 6:55:16 AM (8 years ago)

Author:

ming

Message:

Fixed #1921: Add support to handle IPv6 transports in pjsua_transport API and transport keep alive

Also:

• add more detailed transport info for TCP and TLS transport
• fixed pjsua sample app which tries to get IPv4 local address from IPv6 transport.

Location:

pjproject/trunk

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (1 diff)
• pjsip/include/pjsip/sip_transport.h (modified) (1 diff)
• pjsip/src/pjsip/sip_transport_tcp.c (modified) (2 diffs)
• pjsip/src/pjsip/sip_transport_tls.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_acc.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (7 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -1665 +1665 @@
         if (app_config.udp_cfg.port == 0) {
             pjsua_transport_info ti;
-            pj_sockaddr_in *a;
 
             pjsua_transport_get_info(transport_id, &ti);
-            a = (pj_sockaddr_in*)&ti.local_addr;
-
-            tcp_cfg.port = pj_ntohs(a->sin_port);
+            tcp_cfg.port = pj_sockaddr_get_port(&ti.local_addr);
         }
     }

pjproject/trunk/pjsip/include/pjsip/sip_transport.h

@@ -995 +995 @@
     char                   *type_name;      /**< Type string name.      */
     unsigned                flag;           /**< Transport flag.        */
+    char                   *info;           /**< Transport info/description.*/
 
     pj_sockaddr             local_addr;     /**< Bound address.         */

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

@@ -252 +252 @@
                                         )
 {
+    enum { INFO_LEN = 100 };
+    char local_addr[PJ_INET6_ADDRSTRLEN+10];
     pj_pool_t *pool;
     pj_sock_t sock = PJ_INVALID_SOCKET;
@@ -474 +476 @@
 
 #endif
+
+    /* 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, "tcp %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) {

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

@@ -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;
@@ -546 +548 @@
         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) {

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -1945 +1945 @@
     /* Send raw packet */
     status = pjsip_tpmgr_send_raw(pjsip_endpt_get_tpmgr(pjsua_var.endpt),
-                                  PJSIP_TRANSPORT_UDP, &tp_sel,
+                                  acc->ka_transport->key.type, &tp_sel,
                                   NULL, acc->cfg.ka_data.ptr, 
                                   acc->cfg.ka_data.slen, 
@@ -2012 +2012 @@
         if (/*pjsua_var.stun_srv.ipv4.sin_family == 0 ||*/
             acc->cfg.ka_interval == 0 ||
-            param->rdata->tp_info.transport->key.type != PJSIP_TRANSPORT_UDP)
+            (param->rdata->tp_info.transport->key.type & PJSIP_TRANSPORT_UDP)!=
+             PJSIP_TRANSPORT_UDP)
         {
             /* Keep alive is not necessary */

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -2448 +2448 @@
     PJSUA_LOCK();
 
-    if (t->type == PJSIP_TRANSPORT_UDP) {
+    if ((t->type & PJSIP_TRANSPORT_UDP) == PJSIP_TRANSPORT_UDP) {
 
         pjsip_transport *tp = t->data.tp;
@@ -2469 +2469 @@
         status = PJ_SUCCESS;
 
-    } else if (t->type == PJSIP_TRANSPORT_TCP ||
-               t->type == PJSIP_TRANSPORT_TLS)
+    } else if ((t->type & PJSIP_TRANSPORT_TCP) == PJSIP_TRANSPORT_TCP ||
+               (t->type & PJSIP_TRANSPORT_TLS) == PJSIP_TRANSPORT_TLS)
     {
 
@@ -2482 +2482 @@
         info->id = id;
         info->type = t->type;
-        info->type_name = (t->type==PJSIP_TRANSPORT_TCP)? pj_str("TCP"):
-                                                          pj_str("TLS");
-        info->info = (t->type==PJSIP_TRANSPORT_TCP)? pj_str("TCP transport"):
-                                                     pj_str("TLS transport");
+        info->type_name = pj_str(factory->type_name);
+        info->info = pj_str(factory->info);
         info->flag = factory->flag;
         info->addr_len = sizeof(factory->local_addr);
@@ -2535 +2533 @@
 {
     pj_status_t status;
+    pjsip_transport_type_e tp_type;
 
     /* Make sure id is in range. */
@@ -2542 +2541 @@
     /* Make sure that transport exists */
     PJ_ASSERT_RETURN(pjsua_var.tpdata[id].data.ptr != NULL, PJ_EINVAL);
+
+    tp_type = pjsua_var.tpdata[id].type & ~PJSIP_TRANSPORT_IPV6;
 
     /* Note: destroy() may not work if there are objects still referencing
@@ -2547 +2548 @@
      */
     if (force) {
-        switch (pjsua_var.tpdata[id].type) {
+        switch (tp_type) {
         case PJSIP_TRANSPORT_UDP:
             status = pjsip_transport_shutdown(pjsua_var.tpdata[id].data.tp);
@@ -2580 +2581 @@
          * descriptor.
          */
-        switch (pjsua_var.tpdata[id].type) {
+        switch (tp_type) {
         case PJSIP_TRANSPORT_UDP:
             return pjsip_transport_shutdown(pjsua_var.tpdata[id].data.tp);