Changeset 5471 for pjproject/trunk/pjlib-util/src/pjlib-util/srv_resolver.c

Timestamp:

Oct 27, 2016 5:47:06 AM (7 years ago)

Author:

ming

Message:

Fixed #1974: Various fixes for DNS IPv6

File:

• pjproject/trunk/pjlib-util/src/pjlib-util/srv_resolver.c (modified) (3 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util/srv_resolver.c

@@ -188 +188 @@
         }
         if (srv->q_aaaa) {
-            pj_dns_resolver_cancel_query(srv->q_aaaa, PJ_FALSE);
+            /* Check if it is a dummy query. */
+            if (srv->q_aaaa != (pj_dns_async_query*)0x1) {
+                pj_dns_resolver_cancel_query(srv->q_aaaa, PJ_FALSE);
+                has_pending = PJ_TRUE;
+            }
             srv->q_aaaa = NULL;
-            has_pending = PJ_TRUE;
         }
     }
@@ -486 +489 @@
         srv->common_aaaa.type = PJ_DNS_TYPE_AAAA;
         srv->parent = query_job;
+        srv->q_a = NULL;
+        srv->q_aaaa = NULL;
 
         status = PJ_SUCCESS;
@@ -492 +497 @@
         if ((query_job->option & PJ_DNS_SRV_RESOLVE_AAAA_ONLY) == 0)
         {
+            if ((query_job->option & PJ_DNS_SRV_RESOLVE_AAAA) != 0) {
+                /* 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.
+                 */
+                srv->q_aaaa = (pj_dns_async_query*)0x1;
+            }
             status = pj_dns_resolver_start_query(query_job->resolver,
                                                  &srv->target_name,