Changeset 445 for trunk/wifidog/src/fw_iptables.c

Timestamp:

02/12/05 01:46:22 (8 years ago)

Author:

minaguib

Message:

Extra sanity checking the ip we read from the iptables output

Files:

• trunk/wifidog/src/fw_iptables.c (modified) (5 diffs)

trunk/wifidog/src/fw_iptables.c

@@ -35 +35 @@
 #include <string.h>
 #include <pthread.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 
 #include "common.h"
@@ -351 +354 @@
     unsigned long int counter;
     t_client *p1;
+         struct in_addr tempaddr;
 
     /* Look for outgoing traffic */
@@ -368 +372 @@
         rc = fscanf(output, "%*s %lu %*s %*s %*s %*s %*s %s %*s %*s %*s %*s %*s 0x%*u", &counter, ip);
         if (2 == rc && EOF != rc) {
+                          /* Sanity*/
+                          if (!inet_aton(ip, &tempaddr)) {
+                                  debug(LOG_WARNING, "I was supposed to read an IP address but instead got [%s] - ignoring it", ip);
+                                  continue;
+                          }
             debug(LOG_DEBUG, "Outgoing %s Bytes=%ld", ip, counter);
             LOCK_CLIENT_LIST();
@@ -400 +409 @@
         rc = fscanf(output, "%*s %lu %*s %*s %*s %*s %*s %s %*s", &counter, ip);
         if (2 == rc && EOF != rc) {
+                          /* Sanity*/
+                          if (!inet_aton(ip, &tempaddr)) {
+                                  debug(LOG_WARNING, "I was supposed to read an IP address but instead got [%s] - ignoring it", ip);
+                                  continue;
+                          }
             debug(LOG_DEBUG, "WIFI2FW %s Bytes=%ld", ip, counter);
             LOCK_CLIENT_LIST();
@@ -432 +446 @@
         rc = fscanf(output, "%*s %lu %*s %*s %*s %*s %*s %*s %s", &counter, ip);
         if (2 == rc && EOF != rc) {
+                          /* Sanity*/
+                          if (!inet_aton(ip, &tempaddr)) {
+                                  debug(LOG_WARNING, "I was supposed to read an IP address but instead got [%s] - ignoring it", ip);
+                                  continue;
+                          }
             debug(LOG_DEBUG, "Incoming %s Bytes=%ld", ip, counter);
             LOCK_CLIENT_LIST();