Changeset 533 for trunk

Timestamp:

Dec 20, 2017, 9:08:35 PM (7 years ago)

Author:

katerina

Message:

Fix for ticket #425 (bug in static dns resolver).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/sh_static.c (modified) (9 diffs)

trunk/docs/Changelog

@@ -6 +6 @@
         * better fix for RPMTOP detection
         * fix missing entry for yuleadmin.pl in RPM spec file
+        * fix bug in static dns resolver (reported by Piotr G.)
 
 4.2.3:

trunk/src/sh_static.c

@@ -908 +908 @@
 
 #undef DEBUG
-/*#define DEBUG*/
+/* #define DEBUG */
 
 #ifdef DEBUG
@@ -1000 +1000 @@
 
         do {
-
-                if (offset < INT_MAX)
+                l = data[offset];
+                if (offset < INT_MAX)
                         offset++;
                 else
                         return -1;
-
-                l = data[offset];
+                if (!l)
+                  break;
+                
+                DPRINTF("l[%d] = %d\n", offset, l);
 
                 if ((l & 0xc0) == (0xc0)) {
@@ -1023 +1025 @@
         } while (l);
 
+        DPRINTF("orig: %d now %d\n", orig_offset, offset);
         return offset - orig_offset;
 }
@@ -1265 +1268 @@
                 h.rd = 1;
 
-                DPRINTF("encoding header\n", h.rd);
+                DPRINTF("encoding header %d\n", h.rd);
 
                 i = __encode_header(&h, packet, PACKETSZ);
@@ -1714 +1717 @@
         char ** __nameserverXX;
 
+        DPRINTF("sh_gethostbyname_r: /%s/\n", name);
         __open_nameservers();
 
@@ -1814 +1818 @@
                         free(packet);
                         *h_errnop=HOST_NOT_FOUND;
+                        DPRINTF("host_not_found\n");
                         return TRY_AGAIN;
                 }
@@ -1830 +1835 @@
                         sizeof(char *)*(ALIAS_DIM) + 256/*namebuffer*/ + 32/* margin */];
         struct hostent *hp;
-
+        
+        DPRINTF("sh_gethostbyname: /%s/\n", name);
         sh_gethostbyname_r(name, &h, buf, sizeof(buf), &hp, &h_errno);
-
         return hp;
 }
@@ -1891 +1896 @@
         char ** __nameserverXX;
 
+        DPRINTF("sh_gethostbyaddr_r called\n");
         *result=NULL;
         if (!addr)
@@ -2061 +2067 @@
         struct hostent *hp;
 
+        DPRINTF("sh_gethostbyaddr called\n");
         sh_gethostbyaddr_r(addr, len, type, &h, buf, sizeof(buf), &hp, &h_errno);