Changeset 432

Timestamp:

02/06/05 18:18:17 (6 years ago)

Author:

minaguib

Message:

Insignificant code cleanup

Files:

• branches/CaptiveDNS/wifidog/src/dnsserver_thread.c (modified) (5 diffs)

branches/CaptiveDNS/wifidog/src/dnsserver_thread.c

@@ -43 +43 @@
 #include "dnsserver_thread.h"
 
-/** Accepts DNS requests, replies to all IN A requests with the internal IP address
+/** Accepts DNS requests: For certain hostnames replies with their real IP, for all others replies with the gateway's IP address
 @param arg NULL
 @todo This thread loops infinitely, need a watchdog to verify that it is still running?
@@ -218 +218 @@
                                         outputanswerheader.length = htons(sizeof(answerip));
 
-                                        /* Now we populate answerip with what we tell them
+                                        /* Now we populate answerip with what the answer should be
                                          */
                                         authhostname = config_get_config()->auth_servers->authserv_hostname;
@@ -227 +227 @@
                                                 authip = wd_gethostbyname(authhostname);
                                                 if (authip) {
+                                                        debug(LOG_DEBUG, "Requested IP is for the hostname of the active auth server");
                                                         memcpy(&answerip, authip, sizeof(answerip));
                                                         free(authip);
                                                 }
                                                 else {
+                                                        debug(LOG_NOTICE, "Requested IP is for the hostname of the active auth server but I failed to resolve it");
                                                         /* XXX: Failed to resolve auth server hostname - Loop back to us ?*/
                                                         inet_aton(config_get_config()->gw_address, &answerip);
@@ -239 +241 @@
                                                  * They're asking for something else - point them to us
                                                  */
+                                                debug(LOG_DEBUG, "Requested IP is for an arbitrary hostname");
                                                 inet_aton(config_get_config()->gw_address, &answerip);
                                         }
                                         
                                         /* Calculate size of output pieces together */
-                                        outputlength = sizeof(outputheader) + strlen(hostname) + 1 + sizeof(outputqueryfooter) + sizeof(outputanswerheader) + sizeof(answerip);
+                                        outputlength =
+                                                  sizeof(outputheader)
+                                                + strlen(hostname)
+                                                + 1
+                                                + sizeof(outputqueryfooter)
+                                                + sizeof(outputanswerheader)
+                                                + sizeof(answerip)
+                                                ;
+
                                         outputbuffer = malloc(outputlength);
                                         if (!outputbuffer) {
@@ -251 +262 @@
                                         else {
                                                 /*
-                                                 * XXX: dirty - must match above malloc size pieces for outputbuffer
+                                                 * Fill outputbuffer with the concatenated pieces
+                                                 * Be careful - anything added here must be accounted for in the above outputlength calculation
                                                  */
-                                                memcpy(outputbuffer, &outputheader, sizeof(outputheader));
-                                                memcpy(outputbuffer + sizeof(outputheader), hostname, strlen(hostname));
-                                                memcpy(outputbuffer + sizeof(outputheader) + strlen(hostname), "", 1);
-                                                memcpy(outputbuffer + sizeof(outputheader) + strlen(hostname) + 1, &outputqueryfooter, sizeof(outputqueryfooter));
-                                                memcpy(outputbuffer + sizeof(outputheader) + strlen(hostname) + 1 + sizeof(outputqueryfooter), &outputanswerheader, sizeof(outputanswerheader));
-                                                memcpy(outputbuffer + sizeof(outputheader) + strlen(hostname) + 1 + sizeof(outputqueryfooter) + sizeof(outputanswerheader), &answerip, sizeof(answerip));
+                                                temp = outputbuffer;
+
+                                                memcpy(temp, &outputheader, sizeof(outputheader));
+                                                temp += sizeof(outputheader);
+
+                                                memcpy(temp, hostname, strlen(hostname));
+                                                temp += strlen(hostname);
+
+                                                memcpy(temp, "", 1);
+                                                temp += 1;
+
+                                                memcpy(temp, &outputqueryfooter, sizeof(outputqueryfooter));
+                                                temp += sizeof(outputqueryfooter);
+
+                                                memcpy(temp, &outputanswerheader, sizeof(outputanswerheader));
+                                                temp += sizeof(outputanswerheader);
+
+                                                memcpy(temp, &answerip, sizeof(answerip));
+                                                temp += sizeof(answerip);
 
                                                 /*