Changeset 5249

Timestamp:

Feb 29, 2016 8:24:58 AM (9 years ago)

Author:

ming

Message:

Re #1882 (misc): Various IPv6 fixes:

• For contact rewrite feature, when contact address is IPv6, it shouldn't be replaced with IPv4 address
• If tp_type is already of type IPv6, adding it with PJSIP_TRANSPORT_IPV6 will result in an invalid transport type
• Add check if pj_getaddrinfo() returns zero address.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c (modified) (3 diffs)

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

@@ -1646 +1646 @@
                                    &recv_addr);
     if (status == PJ_SUCCESS) {
-        /* Compare the addresses as sockaddr according to the ticket above */
-        matched = (uri->port == rport &&
+        /* Compare the addresses as sockaddr according to the ticket above,
+         * but only if they have the same family (ipv4 vs ipv4, or
+         * ipv6 vs ipv6)
+         */
+        matched = (contact_addr.addr.sa_family != recv_addr.addr.sa_family) ||
+                  (uri->port == rport &&
                    pj_sockaddr_cmp(&contact_addr, &recv_addr)==0);
     } else {
@@ -3100 +3104 @@
      */
     if (pj_strchr(&sip_uri->host, ':'))
-        tp_type = (pjsip_transport_type_e)(((int)tp_type) + PJSIP_TRANSPORT_IPV6);
+        tp_type = (pjsip_transport_type_e)(((int)tp_type) |
+                  PJSIP_TRANSPORT_IPV6);
 
     flag = pjsip_transport_get_flag_from_type(tp_type);
@@ -3165 +3170 @@
             af = (dinfo.type & PJSIP_TRANSPORT_IPV6)? PJ_AF_INET6 : PJ_AF_INET;
             status = pj_getaddrinfo(af, &dinfo.addr.host, &cnt, &ai);
+            if (cnt == 0) status = PJ_ENOTSUP;
         }