Changeset 5636 for pjproject/trunk/pjsip/src/pjsip/sip_transport_udp.c

Timestamp:

Aug 2, 2017 2:51:59 AM (7 years ago)

Author:

ming

Message:

Fixed #2032: NAT64 support for IPv4 interoperability

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport_udp.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport_udp.c

@@ -701 +701 @@
     pj_pool_t *pool;
     struct udp_transport *tp;
-    const char *format, *ipv6_quoteb, *ipv6_quotee;
+    const char *format, *ipv6_quoteb = "", *ipv6_quotee = "";
     unsigned i;
     pj_status_t status;
@@ -710 +710 @@
     /* Object name. */
     if (type & PJSIP_TRANSPORT_IPV6) {
+        pj_in6_addr dummy6;
+
         format = "udpv6%p";
-        ipv6_quoteb = "[";
-        ipv6_quotee = "]";
+        /* We don't need to add quote if the transport type is IPv6, but
+         * actually translated to IPv4.
+         */
+        if (pj_inet_pton(pj_AF_INET6(), &a_name->host, &dummy6)==PJ_SUCCESS) {
+            ipv6_quoteb = "[";
+            ipv6_quotee = "]";
+        }
     } else {
         format = "udp%p";
-        ipv6_quoteb = ipv6_quotee = "";
     }