Changeset 904 in MondoRescue for trunk/mindi-busybox/networking/dnsd.c

Timestamp:

Oct 25, 2006, 1:51:57 AM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r890:902 $SVN_M/branches/stable

File:

• trunk/mindi-busybox/networking/dnsd.c (modified) (7 diffs)

trunk/mindi-busybox/networking/dnsd.c

@@ -29 +29 @@
 #define LOCK_FILE       "/var/run/dnsd.lock"
 #define LOG_FILE        "/var/log/dnsd.log"
+
+#define is_daemon()  (flags&16)
+#define is_verbose() (flags&32)
+//#define DEBUG 
+
 
 enum {
@@ -224 +229 @@
 {
     int i;
-    struct dns_entry *d=dnsentry;
-
-    do {
+    struct dns_entry *d = dnsentry;
+
+    if(d) do {
 #ifdef DEBUG
-        char *p,*q;
-        q = (char *)&(qs[1]);
-        p = &(d->name[1]);
-        fprintf(stderr, "\ntest: %d <%s> <%s> %d", strlen(p), p, q, strlen(q));
-#endif
-        if (type == REQ_A) { /* search by host name */
+        if(qs && d) {
+            char *p,*q;
+            q = (char *)&(qs[1]);
+            p = &(d->name[1]);
+            fprintf(stderr, "\n%s: %d/%d p:%s q:%s %d", 
+                __FUNCTION__, strlen(p), (int)(d->name[0]), 
+                p, q, strlen(q));
+        }
+#endif
+        if (type == REQ_A) {            /* search by host name */
             for(i = 1; i <= (int)(d->name[0]); i++)
                 if(tolower(qs[i]) != d->name[i])
-                    continue;
+                    break;
+            if(i > (int)(d->name[0])) {
 #ifdef DEBUG
-            fprintf(stderr, " OK");
-#endif
-            strcpy((char *)as, d->ip);
+                fprintf(stderr, " OK");
+#endif
+                strcpy((char *)as, d->ip);
 #ifdef DEBUG
-            fprintf(stderr, " %s ", as);
-#endif
-                    return 0;
-                }
-        else if (type == REQ_PTR) { /* search by IP-address */
+                fprintf(stderr, " as:%s\n", as);
+#endif
+                return 0;
+            }
+        } else 
+        if (type == REQ_PTR) {          /* search by IP-address */
             if (!strncmp((char*)&d->rip[1], (char*)&qs[1], strlen(d->rip)-1)) {
                 strcpy((char *)as, d->name);
@@ -282 +293 @@
 
     from = (void *)&head[1];    //  start of query string
-    next = answb = from + strlen((char *)&head[1]) + 1 + sizeof(struct dns_prop);   // where to append answer block
+    next = answb = from + strlen((char *)from) + 1 + sizeof(struct dns_prop);   // where to append answer block
 
     outr.rlen = 0;          // may change later
@@ -306 +317 @@
 
     // We have a standard query
-
-    log_message(LOG_FILE, (char *)head);
-    lookup_result = table_lookup(type, answstr, (uint8_t*)(&head[1]));
+    log_message(LOG_FILE, (char *)from);
+    lookup_result = table_lookup(type, answstr, (uint8_t*)from);
     if (lookup_result != 0) {
         outr.flags = 3 | 0x0400;    //name do not exist and auth
@@ -342 +352 @@
     next += outr.rlen;
 
-      empty_packet:
-
+empty_packet:
     flags = ntohs(head->flags);
     // clear rcode and RA, set responsebit and our new flags
@@ -365 +374 @@
 }
 
-#define is_daemon()  (flags&16)
-#define is_verbose() (flags&32)
-//#define DEBUG 1
 
 int dnsd_main(int argc, char **argv)
@@ -438 +444 @@
                      (void *)&fromlen);
             if(is_verbose())
-                fprintf(stderr, "\n--- Got UDP  ");
-            log_message(LOG_FILE, "\n--- Got UDP  ");
+                fprintf(stderr, "\n--- Got UDP size=%d ", r);
+            log_message(LOG_FILE, "\n--- Got UDP ");
 
             if (r < 12 || r > 512) {