Changeset 1305

Timestamp:

11/01/07 16:04:20 (6 years ago)

Author:

benoitg

Message:

• Apply portability patches by David Young <dyoung@…>. These have been reviewed, but not tested.

Location:

trunk/wifidog

Files:

• ChangeLog (modified) (1 diff)
• libhttpd/api.c (modified) (2 diffs)
• libhttpd/httpd.h (modified) (1 diff)
• libhttpd/protocol.c (modified) (1 diff)
• src/auth.c (modified) (2 diffs)
• src/auth.h (modified) (1 diff)
• src/centralserver.c (modified) (2 diffs)
• src/centralserver.h (modified) (1 diff)
• src/conf.c (modified) (4 diffs)
• src/conf.h (modified) (1 diff)
• src/debug.c (modified) (1 diff)
• src/firewall.c (modified) (5 diffs)
• src/fw_iptables.c (modified) (1 diff)
• src/gateway.c (modified) (3 diffs)
• src/ping_thread.c (modified) (1 diff)
• src/util.c (modified) (6 diffs)
• src/wdctl_thread.c (modified) (2 diffs)

trunk/wifidog/ChangeLog

@@ -1 +1 @@
 # $Id$
+2007-11-01 Benoit Gr�goire  <bock@step.polymtl.ca>
+        * Apply portability patches by David Young <dyoung@pobox.com>.  These have been reviewed, but not tested.
+
 2007-10-18 Benoit Gr�goire  <bock@step.polymtl.ca>
         * fw_iptables.c: From Philippe April:  reverted change made in 1241 so we properly remove the entry from mangle.WiFiDog_Incoming when kicking out users, it was affecting statistics 

trunk/wifidog/libhttpd/api.c

@@ -413 +413 @@
                         */
                         cp = cp2 = buf;
-                        while(isalpha(*cp2))
+                        while(isalpha((unsigned char)*cp2))
                                 cp2++;
                         *cp2 = 0;
@@ -871 +871 @@
                         cp = varName;
                         count2 = 0;
-                        while(*tmp&&(isalnum(*tmp)||*tmp == '_')&&count2 < 80)
+                        while (*tmp && (isalnum((unsigned char)*tmp) || *tmp == '_') &&
+                               count2 < 80)
                         {
                                 *cp++ = *tmp++;

trunk/wifidog/libhttpd/httpd.h

@@ -32 +32 @@
 
 #define LIB_HTTPD_H 1
+
+#include <sys/time.h>
 
 #if !defined(__ANSI_PROTO)

trunk/wifidog/libhttpd/protocol.c

@@ -408 +408 @@
 {
         struct  tm *timePtr;
-
-        if (clock == 0)
-                clock = time(NULL);
-        timePtr = gmtime((time_t*)&clock);
+        time_t t;
+
+        t = (clock == 0) ? time(NULL) : clock;
+        timePtr = gmtime(&t);
         strftime(ptr, HTTP_TIME_STRING_LEN,"%a, %d %b %Y %T GMT",timePtr);
 }

trunk/wifidog/src/auth.c

@@ -96 +96 @@
         t_client        *client;
         t_authresponse  auth_response;
-        char    *ip,
-                *mac,
+        char    *mac,
                 *token;
         char *urlFragment = NULL;
@@ -108 +107 @@
 
         if (client == NULL) {
-                debug(LOG_ERR, "Could not find client for %s", ip);
+                debug(LOG_ERR, "Could not find client for %s", r->clientAddr);
                 UNLOCK_CLIENT_LIST();
                 return;

trunk/wifidog/src/auth.h

@@ -27 +27 @@
 #ifndef _AUTH_H_
 #define _AUTH_H_
+
+#include "httpd.h"
 
 /**

trunk/wifidog/src/centralserver.c

@@ -25 +25 @@
  */
 
+#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -46 +47 @@
 #include "debug.h"
 #include "centralserver.h"
+#include "firewall.h"
 #include "../config.h"
 

trunk/wifidog/src/centralserver.h

@@ -28 +28 @@
 #define _CENTRALSERVER_H_
 
+#include "auth.h"
+
 /** @brief Ask the central server to login a client */
 #define REQUEST_TYPE_LOGIN     "login"

trunk/wifidog/src/conf.c

@@ -131 +131 @@
 };
 
+static void config_notnull(void *parm, char *parmname);
+static int parse_boolean_value(char *);
+static void parse_auth_server(FILE *, char *, int *);
+static int _parse_firewall_rule(char *ruleset, char *leftover);
+static void parse_firewall_ruleset(char *, FILE *, char *, int *);
+
 static OpCodes config_parse_token(const char *cp, const char *filename, int linenum);
 
@@ -480 +486 @@
         /* lower case */
         for (i = 0; *(leftover + i) != '\0'
-                        && (*(leftover + i) = tolower(*(leftover + i))); i++);
+                        && (*(leftover + i) = tolower((unsigned char)*(leftover + i))); i++);
         
         token = leftover;
@@ -512 +518 @@
                 TO_NEXT_WORD(leftover, finished);
                 for (i = 0; *(port + i) != '\0'; i++)
-                        if (!isdigit(*(port + i)))
+                        if (!isdigit((unsigned char)*(port + i)))
                                 all_nums = 0; /*< No longer only digits */
                 if (!all_nums) {
@@ -536 +542 @@
                 all_nums = 1;
                 for (i = 0; *(mask + i) != '\0'; i++)
-                        if (!isdigit(*(mask + i)) && (*(mask + i) != '.')
+                        if (!isdigit((unsigned char)*(mask + i)) && (*(mask + i) != '.')
                                         && (*(mask + i) != '/'))
                                 all_nums = 0; /*< No longer only digits */

trunk/wifidog/src/conf.h

@@ -174 +174 @@
 t_firewall_rule *get_ruleset(char *);
 
-static void config_notnull(void *parm, char *parmname);
-static int parse_boolean_value(char *);
-static void parse_auth_server(FILE *, char *, int *);
-static int _parse_firewall_rule(char *ruleset, char *leftover);
-static void parse_firewall_ruleset(char *, FILE *, char *, int *);
 void parse_trusted_mac_list(char *);
 

trunk/wifidog/src/debug.c

@@ -30 +30 @@
 #include <stdarg.h>
 #include <time.h>
+#include <unistd.h>
 
 #include "conf.h"

trunk/wifidog/src/firewall.c

@@ -58 +58 @@
 #endif
 
+#if defined(__NetBSD__)
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+#include <netinet/ip_icmp.h>
+#endif
+
 #include "httpd.h"
 #include "safe.h"
@@ -106 +112 @@
 }
 
+/* XXX DCY */
 /**
  * Get an IP's MAC address from the ARP cache.
@@ -157 +164 @@
              setsockopt(icmp_fd, SOL_SOCKET, SO_DONTROUTE, &zeroopt, sizeof(zeroopt)) == -1) {
         debug(LOG_ERR, "Cannot create ICMP raw socket.");
-        return;
+        return 0;
     }
 
@@ -342 +349 @@
 }
 
-void icmp_ping(char *host) {
-  struct sockaddr_in saddr;
-#ifdef __linux__
-  struct { 
-    struct ip ip;
-    struct icmp icmp;
-  } packet;
+void
+icmp_ping(char *host)
+{
+        struct sockaddr_in saddr;
+#if defined(__linux__) || defined(__NetBSD__)
+        struct { 
+                struct ip ip;
+                struct icmp icmp;
+        } packet;
 #endif
-  unsigned int i, j;
-  int opt = 2000;
-  unsigned short id = rand16();
-
-  saddr.sin_family = AF_INET;
-  saddr.sin_port = 0;
-  inet_aton(host, &saddr.sin_addr);
-#ifdef HAVE_SOCKADDR_SA_LEN
-  saddr.sin_len = sizeof(struct sockaddr_in);
+        unsigned int i, j;
+        int opt = 2000;
+        unsigned short id = rand16();
+
+        memset(&saddr, 0, sizeof(saddr));
+        saddr.sin_family = AF_INET;
+        inet_aton(host, &saddr.sin_addr);
+#if defined(HAVE_SOCKADDR_SA_LEN) || defined(__NetBSD__)
+        saddr.sin_len = sizeof(struct sockaddr_in);
 #endif
 
-  memset(&(saddr.sin_zero), '\0', sizeof(saddr.sin_zero));
-
-#ifdef __linux__
-  memset(&packet.icmp, 0, sizeof(packet.icmp));
-  packet.icmp.icmp_type = ICMP_ECHO;
-  packet.icmp.icmp_id = id;
-  for (j = 0, i = 0; i < sizeof(struct icmp) / 2; i++)
-    j += ((unsigned short *)&packet.icmp)[i];
-  while (j>>16)
-    j = (j & 0xffff) + (j >> 16);  
-  packet.icmp.icmp_cksum = (j == 0xffff) ? j : ~j;
-
-  if (setsockopt(icmp_fd, SOL_SOCKET, SO_RCVBUF, &opt, sizeof(opt)) == -1) {
-      debug(LOG_ERR, "setsockopt(): %s", strerror(errno));
-  }
-  if (sendto(icmp_fd, (char *)&packet.icmp, sizeof(struct icmp), 0, (struct sockaddr *)&saddr, sizeof(saddr)) == -1) {
-      debug(LOG_ERR, "sendto(): %s", strerror(errno));
-  }
-  opt = 1;
-  if (setsockopt(icmp_fd, SOL_SOCKET, SO_RCVBUF, &opt, sizeof(opt)) == -1) {
-      debug(LOG_ERR, "setsockopt(): %s", strerror(errno));
-  }
+#if defined(__linux__) || defined(__NetBSD__)
+        memset(&packet.icmp, 0, sizeof(packet.icmp));
+        packet.icmp.icmp_type = ICMP_ECHO;
+        packet.icmp.icmp_id = id;
+
+        for (j = 0, i = 0; i < sizeof(struct icmp) / 2; i++)
+                j += ((unsigned short *)&packet.icmp)[i];
+
+        while (j >> 16)
+                j = (j & 0xffff) + (j >> 16);  
+
+        packet.icmp.icmp_cksum = (j == 0xffff) ? j : ~j;
+
+        if (setsockopt(icmp_fd, SOL_SOCKET, SO_RCVBUF, &opt, sizeof(opt)) == -1)
+                debug(LOG_ERR, "setsockopt(): %s", strerror(errno));
+
+        if (sendto(icmp_fd, (char *)&packet.icmp, sizeof(struct icmp), 0,
+                   (const struct sockaddr *)&saddr, sizeof(saddr)) == -1)
+                debug(LOG_ERR, "sendto(): %s", strerror(errno));
+
+        opt = 1;
+        if (setsockopt(icmp_fd, SOL_SOCKET, SO_RCVBUF, &opt, sizeof(opt)) == -1)
+                debug(LOG_ERR, "setsockopt(): %s", strerror(errno));
 #endif
 
-  return;
+        return;
 }
 
@@ -392 +402 @@
 
   if (!been_seeded) {
-    int fd, n = 0;
-    unsigned int c = 0, seed = 0;
-    char sbuf[sizeof(seed)];
-    char *s;
+    unsigned int seed = 0;
     struct timeval now;
 

trunk/wifidog/src/fw_iptables.c

@@ -207 +207 @@
          UNLOCK_CONFIG();
     
+        if (ext_interface == NULL) {
+                debug(LOG_ERR, "FATAL: no external interface");
+                /* XXX leaks safe_strdup()'d strings */
+                return 0;
+        }
          /*
           *

trunk/wifidog/src/gateway.c

@@ -270 +270 @@
 {
         static  pthread_mutex_t sigterm_mutex = PTHREAD_MUTEX_INITIALIZER;
-        s_config *config = config_get_config();
 
         debug(LOG_INFO, "Handler for termination caught signal %d", s);
@@ -368 +367 @@
         request *r;
         void **params;
-    FILE *fh;
 
     /* Set the time when wifidog started */
@@ -420 +418 @@
         fw_destroy();
         /* Then initialize it */
-        fw_init();
+        if (!fw_init()) {
+                debug(LOG_ERR, "FATAL: Failed to initialize firewall");
+                exit(1);
+        }
 
         /* Start clean up thread */

trunk/wifidog/src/ping_thread.c

@@ -51 +51 @@
 #include "ping_thread.h"
 #include "util.h"
+#include "centralserver.h"
 
 static void ping(void);

trunk/wifidog/src/util.c

@@ -42 +42 @@
 #include <sys/ioctl.h>
 
+#if defined(__NetBSD__)
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <ifaddrs.h>
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <util.h>
+#endif
+
 #ifdef __linux__
 #include <net/if.h>
@@ -145 +154 @@
 }
 
-char *get_iface_ip(char *ifname) {
-#ifdef __linux__
-    struct ifreq if_data;
+char *
+get_iface_ip(char *ifname)
+{
+#if defined(__linux__)
+        struct ifreq if_data;
+        struct in_addr in;
+        char *ip_str;
+        int sockd;
+        u_int32_t ip;
+
+        /* Create a socket */
+        if ((sockd = socket (AF_INET, SOCK_PACKET, htons(0x8086))) < 0) {
+                debug(LOG_ERR, "socket(): %s", strerror(errno));
+                return NULL;
+        }
+
+        /* Get IP of internal interface */
+        strcpy (if_data.ifr_name, ifname);
+
+        /* Get the IP address */
+        if (ioctl (sockd, SIOCGIFADDR, &if_data) < 0) {
+                debug(LOG_ERR, "ioctl(): SIOCGIFADDR %s", strerror(errno));
+                return NULL;
+        }
+        memcpy ((void *) &ip, (void *) &if_data.ifr_addr.sa_data + 2, 4);
+        in.s_addr = ip;
+
+        ip_str = (char *)inet_ntoa(in);
+        close(sockd);
+        return safe_strdup(ip_str);
+#elif defined(__NetBSD__)
+        struct ifaddrs *ifa, *ifap;
+        char *str = NULL;
+
+        if (getifaddrs(&ifap) == -1) {
+                debug(LOG_ERR, "getifaddrs(): %s", strerror(errno));
+                return NULL;
+        }
+        /* XXX arbitrarily pick the first IPv4 address */
+        for (ifa = ifap; ifa != NULL; ifa = ifa->ifa_next) {
+                if (strcmp(ifa->ifa_name, ifname) == 0 &&
+                    ifa->ifa_addr->sa_family == AF_INET)
+                        break;
+        }
+        if (ifa == NULL) {
+                debug(LOG_ERR, "%s: no IPv4 address assigned");
+                goto out;
+        }
+        str = safe_strdup(inet_ntoa(
+            ((struct sockaddr_in *)ifa->ifa_addr)->sin_addr));
+out:
+        freeifaddrs(ifap);
+        return str;
+#else
+        return safe_strdup("0.0.0.0");
 #endif
-    struct in_addr in;
-    char *ip_str;
-    int sockd;
-    u_int32_t ip;
-
-#ifdef __linux__
-    
-    /* Create a socket */
-    if ((sockd = socket (AF_INET, SOCK_PACKET, htons(0x8086))) < 0) {
-        debug(LOG_ERR, "socket(): %s", strerror(errno));
-        return NULL;
-    }
-
-    /* Get IP of internal interface */
-    strcpy (if_data.ifr_name, ifname);
-
-    /* Get the IP address */
-    if (ioctl (sockd, SIOCGIFADDR, &if_data) < 0) {
-        debug(LOG_ERR, "ioctl(): SIOCGIFADDR %s", strerror(errno));
-        return NULL;
-    }
-    memcpy ((void *) &ip, (void *) &if_data.ifr_addr.sa_data + 2, 4);
-    in.s_addr = ip;
-
-    ip_str = (char *)inet_ntoa(in);
-    close(sockd);
-    return safe_strdup(ip_str);
-#else
-    return safe_strdup("0.0.0.0");
-#endif
-}
-
-char *get_iface_mac (char *ifname) {
-#ifdef __linux__
+}
+
+char *
+get_iface_mac(char *ifname)
+{
+#if defined(__linux__)
     int r, s;
     struct ifreq ifr;
@@ -203 +236 @@
 
     hwaddr = ifr.ifr_hwaddr.sa_data;
-    snprintf(mac, 13, "%02X%02X%02X%02X%02X%02X", 
+    close(s);
+    snprintf(mac, sizeof(mac), "%02X%02X%02X%02X%02X%02X", 
        hwaddr[0] & 0xFF,
        hwaddr[1] & 0xFF,
@@ -212 +246 @@
        );
        
-    close(s);
     return safe_strdup(mac);
+#elif defined(__NetBSD__)
+        struct ifaddrs *ifa, *ifap;
+        const char *hwaddr;
+        char mac[13], *str = NULL;
+        struct sockaddr_dl *sdl;
+
+        if (getifaddrs(&ifap) == -1) {
+                debug(LOG_ERR, "getifaddrs(): %s", strerror(errno));
+                return NULL;
+        }
+        for (ifa = ifap; ifa != NULL; ifa = ifa->ifa_next) {
+                if (strcmp(ifa->ifa_name, ifname) == 0 &&
+                    ifa->ifa_addr->sa_family == AF_LINK)
+                        break;
+        }
+        if (ifa == NULL) {
+                debug(LOG_ERR, "%s: no link-layer address assigned");
+                goto out;
+        }
+        sdl = (struct sockaddr_dl *)ifa->ifa_addr;
+        hwaddr = LLADDR(sdl);
+        snprintf(mac, sizeof(mac), "%02X%02X%02X%02X%02X%02X",
+            hwaddr[0] & 0xFF, hwaddr[1] & 0xFF,
+            hwaddr[2] & 0xFF, hwaddr[3] & 0xFF,
+            hwaddr[4] & 0xFF, hwaddr[5] & 0xFF);
+
+        str = safe_strdup(mac);
+out:
+        freeifaddrs(ifap);
+        return str;
 #else
     return NULL;
@@ -219 +282 @@
 }
 
-char *get_ext_iface (void) {
+char *
+get_ext_iface(void)
+{
 #ifdef __linux__
     FILE *input;
@@ -234 +299 @@
         input = fopen("/proc/net/route", "r");
         while (!feof(input)) {
+            /* XXX scanf(3) is unsafe, risks overrun */ 
             fscanf(input, "%s %s %*s %*s %*s %*s %*s %*s %*s %*s %*s\n", device, gw);
             if (strcmp(gw, "00000000") == 0) {

trunk/wifidog/src/wdctl_thread.c

@@ -51 +51 @@
 #include "client_list.h"
 #include "wdctl_thread.h"
+#include "gateway.h"
+#include "safe.h"
 
 /* Defined in clientlist.c */
@@ -235 +237 @@
         char    *sock_name;
         struct  sockaddr_un     sa_un;
-        int result;
         s_config * conf = NULL;
         t_client * client = NULL;