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

Timestamp:

Jul 26, 2019 5:40:42 AM (5 years ago)

Author:

nanang

Message:

Fix #2216: reverted back changes in ticket #2198: r6025, r5998, r5995.

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_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() ||
-                    (type != PJSIP_TRANSPORT_LOOP_DGRAM &&
-                     PJSIP_MAX_RESOLVED_ADDRESSES > 1))
-                {
+                if (af == pj_AF_INET6()) {
                     /* Generate a synthesized IPv6 address, if possible. */
                     unsigned int count = 1;
@@ -298 +288 @@
                         ai[0].ai_addr.addr.sa_family == pj_AF_INET6())
                     {
-                        unsigned idx = 0;
-                        
-                        if (af != pj_AF_INET6()) {
-                            /* Return IPv4 and IPv6 addresses */
-                            idx = 1;
-                            svr_addr.count++;
-                        }
                         pj_sockaddr_init(pj_AF_INET6(),
-                                         &svr_addr.entry[idx].addr,
+                                         &svr_addr.entry[0].addr,
                                          NULL, 0);
-                        svr_addr.entry[idx].addr.ipv6.sin6_addr =
+                        svr_addr.entry[0].addr.ipv6.sin6_addr =
                             ai[0].ai_addr.ipv6.sin6_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 {
+                    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 {