Changeset 5559

Timestamp:

Feb 20, 2017 2:11:46 AM (7 years ago)

Author:

riza

Message:

Re #1994 (misc): Don't try to resolve a DNS SRV query that is already considered resolved.
Thanks to Richard Mudgett for the patch.

Location:

pjproject/trunk

Files:

• pjlib-util/src/pjlib-util/srv_resolver.c (modified) (6 diffs)
• pjsip/src/pjsip/sip_transport.c (modified) (1 diff)

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

@@ -408 +408 @@
         pj_in_addr addr;
         pj_in6_addr addr6;
-
-        if (query_job->srv[i].addr_cnt != 0) {
+        unsigned cnt = query_job->srv[i].addr_cnt;
+
+        if (cnt != 0) {
             /* IP address already resolved */
             continue;
@@ -418 +419 @@
                          &addr) == PJ_SUCCESS)
         {
-            unsigned cnt = query_job->srv[i].addr_cnt;
             pj_sockaddr_init(pj_AF_INET(), &query_job->srv[i].addr[cnt],
                              NULL, query_job->srv[i].port);
@@ -428 +428 @@
                                 &addr6) == PJ_SUCCESS)
         {
-            unsigned cnt = query_job->srv[i].addr_cnt;
             pj_sockaddr_init(pj_AF_INET6(), &query_job->srv[i].addr[cnt],
                              NULL, query_job->srv[i].port);
@@ -481 +480 @@
         struct srv_target *srv = &query_job->srv[i];
 
+        if (srv->addr_cnt != 0) {
+            /*
+             * This query is already counted as resolved because of the
+             * additional records in the SRV response or the target name
+             * is an IP address exception in build_server_entries().
+             */
+            continue;
+        }
+
         PJ_LOG(5, (query_job->objname, 
                    "Starting async DNS A query_job for %.*s",
@@ -494 +502 @@
         status = PJ_SUCCESS;
 
-        /* Start DNA A record query */
+        /* Start DNS A record query */
         if ((query_job->option & PJ_DNS_SRV_RESOLVE_AAAA_ONLY) == 0)
         {
@@ -512 +520 @@
         }
 
-        /* Start DNA AAAA record query */
+        /* Start DNS AAAA record query */
         if (status == PJ_SUCCESS &&
             (query_job->option & PJ_DNS_SRV_RESOLVE_AAAA) != 0)

pjproject/trunk/pjsip/src/pjsip/sip_transport.c

@@ -423 +423 @@
     tdata->pool = pool;
     tdata->mgr = mgr;
-    pj_memcpy(tdata->obj_name, pool->obj_name, PJ_MAX_OBJ_NAME);
+    pj_ansi_snprintf(tdata->obj_name, sizeof(tdata->obj_name), "tdta%p", tdata);
+    pj_memcpy(pool->obj_name, tdata->obj_name, sizeof(pool->obj_name));
 
     status = pj_atomic_create(tdata->pool, 0, &tdata->ref_cnt);