Changeset 5471

Timestamp:

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

Author:

ming

Message:

Fixed #1974: Various fixes for DNS IPv6

Location:

pjproject/trunk

Files:

• pjlib-util/src/pjlib-util/resolver.c (modified) (3 diffs)
• pjlib-util/src/pjlib-util/srv_resolver.c (modified) (3 diffs)
• pjsip/src/pjsip/sip_resolve.c (modified) (3 diffs)

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

@@ -857 +857 @@
     struct res_key key;
     struct cached_res *cache;
-    pj_dns_async_query *q;
+    pj_dns_async_query *q, *p_q = NULL;
     pj_uint32_t hval;
     pj_status_t status = PJ_SUCCESS;
@@ -870 +870 @@
     /* Check type */
     PJ_ASSERT_RETURN(type > 0 && type < 0xFFFF, PJ_EINVAL);
-
-    if (p_query)
-        *p_query = NULL;
 
     /* Build resource key for looking up hash tables */
@@ -992 +989 @@
                    0, q->hbufkey, q);
 
+    p_q = q;
+
+on_return:
     if (p_query)
-        *p_query = q;
-
-on_return:
+        *p_query = p_q;
+
     pj_mutex_unlock(resolver->mutex);
     return status;

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,

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

@@ -454 +454 @@
 
         /* Resolve DNS AAAA record if address family is not fixed to IPv4 */
-        if (af != pj_AF_INET()) {
+        if (af != pj_AF_INET() && status == PJ_SUCCESS) {
             status = pj_dns_resolver_start_query(resolver->res, 
                                                  &query->naptr[0].name,
@@ -532 +532 @@
             ++srv->count;
         }
-
-    } else {
-
+    }
+    
+    if (status != PJ_SUCCESS) {
         char errmsg[PJ_ERR_MSG_SIZE];
 
@@ -595 +595 @@
             ++srv->count;
         }
-
-    } else {
-
+    }
+    
+    if (status != PJ_SUCCESS) {
         char errmsg[PJ_ERR_MSG_SIZE];