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

Timestamp:

Dec 24, 2014 5:46:51 AM (9 years ago)

Author:

nanang

Message:

Ticket #1809: Fixed DNS SRV resolver bug that application callback may be called twice.

File:

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

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

@@ -406 +406 @@
 static pj_status_t resolve_hostnames(pj_dns_srv_async_query *query_job)
 {
-    unsigned i;
+    unsigned i, err_cnt = 0;
     pj_status_t err=PJ_SUCCESS, status;
 
@@ -421 +421 @@
         srv->parent = query_job;
 
+        /* See also #1809: dns_callback() will be invoked synchronously when response
+         * is available in the cache, and var 'query_job->host_resolved' will get
+         * incremented within the dns_callback(), which will cause this function
+         * returning false error, so don't use that variable for counting errors.
+         */
         status = pj_dns_resolver_start_query(query_job->resolver,
                                              &srv->target_name,
@@ -428 +433 @@
         if (status != PJ_SUCCESS) {
             query_job->host_resolved++;
+            err_cnt++;
             err = status;
         }
     }
     
-    return (query_job->host_resolved == query_job->srv_cnt) ? err : PJ_SUCCESS;
+    return (err_cnt == query_job->srv_cnt) ? err : PJ_SUCCESS;
 }