Changeset 1389

Timestamp:

02/27/09 12:39:30 (4 years ago)

Author:

benoitg

Message:

* Fix #488 and #493 (arp_get() in firewall.c couldn't parse lowercase mac's from /proc/net/arp) with patch fromjch@…. Otherwise wifidog wouldn't work with recent openwrt and Ubuntu.

Location:

trunk/wifidog

Files:

• ChangeLog (modified) (1 diff)
• NEWS (modified) (1 diff)
• src/firewall.c (modified) (6 diffs)

trunk/wifidog/ChangeLog

@@ -1 +1 @@
 # $Id$
-
+2009-02-27 Benoit Gr�goire  <bock@step.polymtl.ca>
+        * Fix #488 and #493 (arp_get() in firewall.c couldn't parse lowercase mac's from /proc/net/arp) with patch from jch@pps.jussieu.fr.  Otherwise wifidog wouldn't work with recent openwrt and Ubuntu.
+        
 2008-09-30 Wichert Akkerman <wichert@wiggy.net>
         * Add exitcode to iptables failure errors.

trunk/wifidog/NEWS

@@ -1 +1 @@
 # $Id$
+WiFiDog 1.1.5:
+        * First supported version on OpenWRT kamikaze
+
 WiFiDog 1.1.4:
         * Fix incorrect firewal rule deletion introduced in 1.1.3rc1.  Caused the incoming byte count reported to be incorrect for users that logged in a second time on a gateway that wasn't restarted in between.

trunk/wifidog/src/firewall.c

@@ -136 +136 @@
          /* 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)) {
+    while (!feof(proc) && (fscanf(proc, " %15[0-9.] %*s %*s %17[A-Fa-f0-9:] %*s %*s", ip, mac) == 2)) {
                   if (strcmp(ip, req_ip) == 0) {
                                 reply = safe_strdup(mac);
@@ -249 +249 @@
         /* Ping the client, if he responds it'll keep activity on the link.
          * However, if the firewall blocks it, it will not help.  The suggested
-         * way to deal witht his is to keep the DHCP lease time extremely 
+         * way to deal witht his is to keep the DHCP lease time extremely
          * short:  Shorter than config->checkinterval * config->clienttimeout */
         icmp_ping(ip);
@@ -257 +257 @@
         }
             LOCK_CLIENT_LIST();
-        
+
         if (!(p1 = client_list_find(ip, mac))) {
             debug(LOG_ERR, "Node %s was freed while being re-validated!", ip);
@@ -354 +354 @@
         struct sockaddr_in saddr;
 #if defined(__linux__) || defined(__NetBSD__)
-        struct { 
+        struct {
                 struct ip ip;
                 struct icmp icmp;
@@ -379 +379 @@
 
         while (j >> 16)
-                j = (j & 0xffff) + (j >> 16);  
+                j = (j & 0xffff) + (j >> 16);
 
         packet.icmp.icmp_cksum = (j == 0xffff) ? j : ~j;
@@ -415 +415 @@
     /* Some rand() implementations have less randomness in low bits
      * than in high bits, so we only pay attention to the high ones.
-     * But most implementations don't touch the high bit, so we 
+     * But most implementations don't touch the high bit, so we
      * ignore that one.
      **/