Changeset 451

Timestamp:

02/12/05 15:53:11 (8 years ago)

Author:

minaguib

Message:

Insignificant

Location:

trunk/wifidog/src

Files:

• firewall.c (modified) (2 diffs)
• ping_thread.c (modified) (1 diff)
• util.c (modified) (1 diff)

trunk/wifidog/src/firewall.c

@@ -110 +110 @@
 {
     FILE           *proc;
-    char            *ip, *mac;
+         char ip[16];
+         char mac[18];
          char * reply;
 
@@ -116 +117 @@
         return NULL;
     }
-    if (!(ip = malloc(16))) {
-                 debug(LOG_CRIT, "Cannot allocate 16 bytes of memory for IP, Banzai!");
-                 exit(1);
-         }
-    if (!(mac = malloc(18))) {
-                 debug(LOG_CRIT, "Cannot allocate 18 bytes of memory for MAC, Banzai!");
-                 exit(1);
-         }
 
     /* Skip first line */
          while (!feof(proc) && fgetc(proc) != '\n');
 
-         /* Find ip, put mac in reply */
+         /* Find ip, copy mac in reply */
          reply = NULL;
     while (!feof(proc) && (fscanf(proc, " %15[0-9.] %*s %*s %17[A-F0-9:] %*s %*s", ip, mac) == 2)) {
                   if (strcmp(ip, req_ip) == 0) {
-                                reply = mac;
+                                reply = strdup(mac);
                                 break;
                   }
     }
-
-    free(ip);
-         if (!reply)
-                 free(mac);
 
     fclose(proc);

trunk/wifidog/src/ping_thread.c

@@ -193 +193 @@
         }
         if ((fh = fopen("/proc/loadavg", "r"))) {
-                fscanf(fh, "%*s %f", &sys_load);
+                fscanf(fh, "%f", &sys_load);
                 fclose(fh);
         }
 
-        snprintf(request, sizeof(request) - 1, "GET %sping/?gw_id=%s&sys_uptime=%lu&sys_memfree=%u&sys_load=%f HTTP/1.0\n"
+        /*
+         * Prep & send request
+         */
+        snprintf(request, sizeof(request) - 1, "GET %sping/?gw_id=%s&sys_uptime=%lu&sys_memfree=%u&sys_load=%.2f HTTP/1.0\n"
                         "User-Agent: WiFiDog %s\n"
                         "Host: %s\n"

trunk/wifidog/src/util.c

@@ -103 +103 @@
         h_addr = (struct in_addr *)malloc(sizeof(struct in_addr));
         
-        if (h_addr == NULL)
-                return NULL;
+        if (h_addr == NULL) {
+                debug(LOG_CRIT, "Failed to allocate memory for in_addr");
+                exit(1);
+        }
         
         LOCK_GHBN();