Changeset 5369

Timestamp:

Jun 29, 2016 9:19:01 AM (8 years ago)

Author:

nanang

Message:

Re #1926: Fixed bug of premature app callback invocation in DNS A+AAAA resolution when DNS A record is available in the cache.

File:

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

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

@@ -218 +218 @@
      * explicitly set.
      */
+#if defined(PJ_HAS_IPV6) && PJ_HAS_IPV6==1
     if ((ip_addr_ver == 6) || (type & PJSIP_TRANSPORT_IPV6))
         af = pj_AF_INET6();
     else if (ip_addr_ver == 4)
         af = pj_AF_INET();
+#else
+    /* IPv6 is disabled, will resolving IPv6 address be useful? */
+    af = pj_AF_INET();
+#endif
 
     /* Set the transport type if not explicitly specified. 
@@ -431 +436 @@
         /* Resolve DNS A record if address family is not fixed to IPv6 */
         if (af != pj_AF_INET6()) {
+
+            /* If there will be DNS AAAA query too, let's setup a dummy one
+             * here, otherwise app callback may be called immediately (before
+             * DNS AAAA query is sent) when DNS A record is available in the
+             * cache.
+             */
+            if (af == pj_AF_UNSPEC())
+                query->object6 = (pj_dns_async_query*)0x1;
+
             status = pj_dns_resolver_start_query(resolver->res, 
                                                  &query->naptr[0].name,