Changeset 5322

Timestamp:

May 26, 2016 6:03:43 AM (9 years ago)

Author:

ming

Message:

Re #1921: Fixed wrong checks in determining IPv6 transport types

Location:

pjproject/trunk/pjsip/src/pjsua-lib

Files:

• pjsua_acc.c (modified) (1 diff)
• pjsua_core.c (modified) (2 diffs)

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

@@ -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)!=
-             PJSIP_TRANSPORT_UDP)
+            (param->rdata->tp_info.transport->key.type &  
+             ~PJSIP_TRANSPORT_IPV6)!= PJSIP_TRANSPORT_UDP)
         {
             /* Keep alive is not necessary */

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

@@ -2449 +2449 @@
     PJSUA_LOCK();
 
-    if ((t->type & PJSIP_TRANSPORT_UDP) == PJSIP_TRANSPORT_UDP) {
+    if ((t->type & ~PJSIP_TRANSPORT_IPV6) == PJSIP_TRANSPORT_UDP) {
 
         pjsip_transport *tp = t->data.tp;
@@ -2470 +2470 @@
         status = PJ_SUCCESS;
 
-    } else if ((t->type & PJSIP_TRANSPORT_TCP) == PJSIP_TRANSPORT_TCP ||
-               (t->type & PJSIP_TRANSPORT_TLS) == PJSIP_TRANSPORT_TLS)
+    } else if ((t->type & ~PJSIP_TRANSPORT_IPV6) == PJSIP_TRANSPORT_TCP ||
+               (t->type & ~PJSIP_TRANSPORT_IPV6) == PJSIP_TRANSPORT_TLS)
     {