Changeset 5995 for pjproject/trunk/pjsip/src/pjsip/sip_resolve.c

Timestamp:

May 17, 2019 9:37:18 AM (5 years ago)

Author:

ming

Message:

Fixed #2198: SIP resolve to return both IPv4 and IPv6 synthesized addresses (if any) for IPv4 address literals.

• Also included in this changeset: ipv6 option of sample pjsua_app will now try IPv6 STUN, bind the account to IPv6 transport and set the IPv6 media

File:

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

pjproject/trunk/pjsip/src/pjsip/sip_resolve.c

@@ -277 +277 @@
             svr_addr.count = 1;
             if (ip_addr_ver == 4) {
-                if (af == pj_AF_INET6()) {
+                if (af == pj_AF_INET()) {
+                    pj_sockaddr_init(pj_AF_INET(), &svr_addr.entry[0].addr, 
+                                     NULL, 0);
+                    pj_inet_pton(pj_AF_INET(), &target->addr.host,
+                                 &svr_addr.entry[0].addr.ipv4.sin_addr);
+                }
+
+                if (af == pj_AF_INET6() || PJSIP_MAX_RESOLVED_ADDRESSES > 1)
+                {
                     /* Generate a synthesized IPv6 address, if possible. */
                     unsigned int count = 1;
@@ -288 +296 @@
                         ai[0].ai_addr.addr.sa_family == pj_AF_INET6())
                     {
+                        unsigned idx = 0;
+                        
+                        if (target->type == PJSIP_TRANSPORT_UNSPECIFIED) {
+                            idx = 1;
+                            svr_addr.count++;
+                        }
                         pj_sockaddr_init(pj_AF_INET6(),
-                                         &svr_addr.entry[0].addr,
+                                         &svr_addr.entry[idx].addr,
                                          NULL, 0);
-                        svr_addr.entry[0].addr.ipv6.sin6_addr =
+                        svr_addr.entry[idx].addr.ipv6.sin6_addr =
                             ai[0].ai_addr.ipv6.sin6_addr;
-                    } else {
-                        pj_sockaddr_init(pj_AF_INET(),
-                                         &svr_addr.entry[0].addr, NULL, 0);
-                        pj_inet_pton(pj_AF_INET(), &target->addr.host,
-                                     &svr_addr.entry[0].addr.ipv4.sin_addr);
+                    } else if (af == pj_AF_INET6()) {
+                        svr_addr.count = 0;
+                        status = PJ_ERESOLVE;
+                        goto on_error;
                     }
-                } else {
-                    pj_sockaddr_init(pj_AF_INET(), &svr_addr.entry[0].addr, 
-                                     NULL, 0);
-                    pj_inet_pton(pj_AF_INET(), &target->addr.host,
-                                 &svr_addr.entry[0].addr.ipv4.sin_addr);
                 }
             } else {