Changeset 5308 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

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.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c (modified) (7 diffs)

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);