Changeset 6025

Timestamp:

Jun 12, 2019 5:04:32 AM (5 years ago)

Author:

ming

Message:

Re #2198:

• Do not return IPv6 address for loop transport
• Fixed failed PJSIP test because of result count mismatch due to the additional IPv6 address

Location:

pjproject/trunk/pjsip/src

Files:

• pjsip/sip_resolve.c (modified) (1 diff)
• test/dns_test.c (modified) (1 diff)

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

@@ -284 +284 @@
                 }
 
-                if (af == pj_AF_INET6() || PJSIP_MAX_RESOLVED_ADDRESSES > 1)
+                if (af == pj_AF_INET6() ||
+                    (type != PJSIP_TRANSPORT_LOOP_DGRAM &&
+                     PJSIP_MAX_RESOLVED_ADDRESSES > 1))
                 {
                     /* Generate a synthesized IPv6 address, if possible. */

pjproject/trunk/pjsip/src/test/dns_test.c

@@ -363 +363 @@
         unsigned i;
 
-        if (ref->count != result.servers.count) {
+        /* Result may have double the number of addresses, for IPv4 and IPv6 */
+        if (ref->count != result.servers.count &&
+            2*ref->count != result.servers.count)
+        {
             PJ_LOG(3,(THIS_FILE, "  test_resolve() error 10: result count mismatch"));
             return 10;