Changeset 3346 for pjproject/trunk

Timestamp:

Oct 14, 2010 10:56:02 AM (14 years ago)

Author:

bennylp

Message:

Misc (re #1134): fixed failed unit tests due to changes in DNS resolver code in r3344

File:

• pjproject/trunk/pjlib-util/src/pjlib-util/resolver.c (modified) (4 diffs)

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

@@ -843 +843 @@
 {
     enum { MAX_SEARCH = 20 };
-    pj_str_t hostname, alias = {NULL, 0};
+    pj_str_t hostname, alias = {NULL, 0}, *resname;
     unsigned bufstart = 0;
     unsigned bufleft = sizeof(rec->buf_);
@@ -889 +889 @@
         return PJLIB_UTIL_EDNSNOANSWERREC;
 
+    resname = &hostname;
+
     /* Keep following CNAME records. */
     while (pkt->ans[ansidx].type == PJ_DNS_TYPE_CNAME &&
            search_cnt++ < MAX_SEARCH)
     {
+        resname = &pkt->ans[ansidx].rdata.cname.name;
+
         if (!alias.slen)
-            alias = pkt->ans[ansidx].rdata.cname.name;
-
-        for (i=ansidx+1; i < pkt->hdr.anscount; ++i) {
-            if (pj_stricmp(&pkt->ans[ansidx].rdata.cname.name,
-                           &pkt->ans[i].name)==0)
-            {
+            alias = *resname;
+
+        for (i=0; i < pkt->hdr.anscount; ++i) {
+            if (pj_stricmp(resname, &pkt->ans[i].name)==0) {
                 break;
             }
@@ -905 +907 @@
 
         if (i==pkt->hdr.anscount)
-            return PJLIB_UTIL_EDNSINANSWER;
+            return PJLIB_UTIL_EDNSNOANSWERREC;
 
         ansidx = i;
@@ -929 +931 @@
     }
 
-    /* Retrieve the IP address. */
-    if (rec->addr_count < PJ_DNS_MAX_IP_IN_A_REC) {
-        rec->addr[rec->addr_count++].s_addr =
-            pkt->ans[i].rdata.a.ip_addr.s_addr;
+    /* Get the IP addresses. */
+    for (i=0; i < pkt->hdr.anscount; ++i) {
+        if (pkt->ans[i].type == PJ_DNS_TYPE_A &&
+            pj_stricmp(&pkt->ans[i].name, resname)==0 &&
+            rec->addr_count < PJ_DNS_MAX_IP_IN_A_REC)
+        {
+            rec->addr[rec->addr_count++].s_addr =
+                pkt->ans[i].rdata.a.ip_addr.s_addr;
+        }
     }