Changeset 176

Timestamp:

08/09/04 17:48:54 (9 years ago)

Author:

alexcv

Message:

WiFiDog will now read multiple AuthServer? line in the config file but it
will only use the first one.

Location:

trunk/wifidog

Files:

• ChangeLog (modified) (1 diff)
• src/auth.c (modified) (1 diff)
• src/centralserver.c (modified) (3 diffs)
• src/conf.c (modified) (7 diffs)
• src/conf.h (modified) (2 diffs)
• src/fw_iptables.c (modified) (2 diffs)
• wifidog.conf (modified) (1 diff)

trunk/wifidog/ChangeLog

@@ -1 +1 @@
 # $Header$
+2004-08-09 Alexandre Carmel-Veilleux <acv@acv.ca>
+        * WiFiDog now can read multiple auth servers (only uses the first one
+however.)
+
 2004-08-06 Alexandre Carmel-Veilleux <acv@acv.ca>
         * AuthservPath no longer mandatory in config file.

trunk/wifidog/src/auth.c

@@ -194 +194 @@
                 client->fw_connection_state = FW_MARK_KNOWN;
                 fw_allow(client->ip, client->mac, FW_MARK_KNOWN);
-                _http_redirect(client->fd, "http://%s/wifidog/portal/?gw_id=%s", config_get_config()->authserv_hostname, config_get_config()->gw_id);
+                _http_redirect(client->fd, "http://%s/wifidog/portal/?gw_id=%s", config_get_config()->auth_servers->authserv_hostname, config_get_config()->gw_id);
                 break;
         case AUTH_VALIDATION_FAILED:

trunk/wifidog/src/centralserver.c

@@ -68 +68 @@
         s_config *config = config_get_config();
 
-        if ((he = gethostbyname(config->authserv_hostname)) == NULL) {
+        if ((he = gethostbyname(config->auth_servers->authserv_hostname)) == NULL) {
                 debug(LOG_ERR, "Failed to resolve %s via gethostbyname(): "
-                        "%s", config->authserv_hostname, strerror(errno));
+                        "%s", config->auth_servers->authserv_hostname, strerror(errno));
                 return(-1);
         }
@@ -80 +80 @@
 
         their_addr.sin_family = AF_INET;
-        their_addr.sin_port = htons(config->authserv_port);
+        their_addr.sin_port = htons(config->auth_servers->authserv_port);
         their_addr.sin_addr = *((struct in_addr *)he->h_addr);
         memset(&(their_addr.sin_zero), '\0', sizeof(their_addr.sin_zero));
 
         debug(LOG_INFO, "Connecting to auth server %s on port %d", 
-                config->authserv_hostname, config->authserv_port);
+                config->auth_servers->authserv_hostname, 
+                config->auth_servers->authserv_port);
 
         if (connect(sockfd, (struct sockaddr *)&their_addr,
@@ -100 +101 @@
                 "Host: %s\n"
                 "\n",
-            config->authserv_path, request_type, ip, mac, token, incoming, outgoing, VERSION, config->authserv_hostname);
+            config->authserv_path, request_type, ip, mac, 
+            token, incoming, outgoing, VERSION, 
+            config->auth_servers->authserv_hostname);
         send(sockfd, buf, strlen(buf), 0);
 

trunk/wifidog/src/conf.c

@@ -60 +60 @@
         oGatewayAddress,
         oGatewayPort,
-        oAuthservHostname,
-        oAuthservPort,
+        oAuthServer,
         oAuthservPath,
         oAuthservLoginUrl,
@@ -86 +85 @@
         { "gatewayaddress",     oGatewayAddress },
         { "gatewayport",        oGatewayPort },
-        { "authservhostname",   oAuthservHostname },
-        { "authservport",       oAuthservPort },
+        { "authserver",         oAuthServer },
         { "authservpath",       oAuthservPath },
         { "authservloginurl",   oAuthservLoginUrl },
@@ -99 +97 @@
 };
 
+static OpCodes config_parse_token(const char *cp, const char *filename, int linenum);
 static void config_notnull(void *parm, char *parmname);
 static int parse_boolean_value(char *);
+static void new_auth_server(char *, int);
 
 /** Accessor for the current gateway configuration
@@ -124 +124 @@
         config.gw_address = NULL;
         config.gw_port = DEFAULT_GATEWAYPORT;
-        config.authserv_hostname = NULL;
-        config.authserv_port = DEFAULT_AUTHSERVPORT;
+        config.auth_servers = NULL;
         config.authserv_path = strdup(DEFAULT_AUTHSERVPATH);
         config.authserv_loginurl = NULL;
@@ -235 +234 @@
                                         sscanf(p1, "%d", &config.gw_port);
                                         break;
-                                case oAuthservHostname:
-                                        config.authserv_hostname = 
-                                                strdup(p1);
+                                case oAuthServer:
+                                        /* Check for the presence of more then
+                                         * one argument. */
+                                        if (p2 != NULL && (*(p2 + 1) != '\n')
+                                                       && (*(p2 + 1) != '\0')) {
+                                                p2++;
+                                                new_auth_server(p1, atoi(p2));
+                                        } else {
+                                                new_auth_server(p1, DEFAULT_AUTHSERVPORT);
+                                        }
                                         break;
                                 case oHTTPDName:
@@ -307 +313 @@
         config_notnull(config.gw_interface, "GatewayInterface");
         config_notnull(config.gw_address, "GatewayAddress");
-        config_notnull(config.authserv_hostname, "AuthservHostname");
+        config_notnull(config.auth_servers, "AuthServer");
         config_notnull(config.authserv_loginurl, "AuthservLoginUrl");
 
@@ -328 +334 @@
 }
 
+/** @internal
+    Register a new auth server.
+*/
+static void
+new_auth_server(char *host, int port)
+{
+        t_auth_serv     *new, *tmp;
+
+        debug(LOG_DEBUG, "Adding %s:%d to the auth server list", host, port);
+
+        /* Allocate memory */
+        new = (t_auth_serv *)malloc(sizeof(t_auth_serv));
+        if (new == NULL) {
+                debug(LOG_ERR, "Could not allocate memory for auth server "
+                                "configuration");
+                exit(1);
+        }
+        
+        /* Fill in struct */
+        new->authserv_hostname = strdup(host);
+        new->authserv_port = port;
+        new->next = NULL;
+        
+        /* If it's the first, add to config, else append to last server */
+        if (config.auth_servers == NULL) {
+                config.auth_servers = new;
+        } else {
+                for (tmp = config.auth_servers; tmp->next != NULL;
+                                tmp = tmp->next);
+                tmp->next = new;
+        }
+        
+        debug(LOG_DEBUG, "Auth server added");
+}

trunk/wifidog/src/conf.h

@@ -46 +46 @@
 /*@}*/ 
 
+typedef struct _auth_serv_t {
+    char *authserv_hostname;    /**< @brief Hostname of the central server */
+    int authserv_port;      /**< @brief Port the central server listens on */
+    struct _auth_serv_t *next;
+} t_auth_serv;
+
 /**
  * Configuration structure
@@ -62 +68 @@
                                      server */
     int gw_port;                /**< @brief Port the webserver will run on */
-    char *authserv_hostname;    /**< @brief Hostname of the central server */
-    int authserv_port;          /**< @brief Port the central server listens on */
+
+    t_auth_serv *auth_servers;  /**< @brief Auth servers list */
     char *authserv_path;        /**< @brief Path to the authentication script on
                                      the central server */

trunk/wifidog/src/fw_iptables.c

@@ -81 +81 @@
     iptables_do_command("-t nat -N " TABLE_WIFIDOG_VALIDATE);
     iptables_do_command("-t nat -A " TABLE_WIFIDOG_VALIDATE " -d %s -j ACCEPT", config->gw_address);
-    iptables_do_command("-t nat -A " TABLE_WIFIDOG_VALIDATE " -d %s -j ACCEPT", config->authserv_hostname);
+    iptables_do_command("-t nat -A " TABLE_WIFIDOG_VALIDATE " -d %s -j ACCEPT", config->auth_servers->authserv_hostname);
     iptables_do_command("-t nat -A " TABLE_WIFIDOG_VALIDATE " -p udp --dport 67 -j ACCEPT");
     iptables_do_command("-t nat -A " TABLE_WIFIDOG_VALIDATE " -p tcp --dport 67 -j ACCEPT");
@@ -97 +97 @@
     iptables_do_command("-t nat -N " TABLE_WIFIDOG_UNKNOWN);
     iptables_do_command("-t nat -A " TABLE_WIFIDOG_UNKNOWN " -d %s -j ACCEPT", config->gw_address);
-    iptables_do_command("-t nat -A " TABLE_WIFIDOG_UNKNOWN " -d %s -j ACCEPT", config->authserv_hostname);
+    iptables_do_command("-t nat -A " TABLE_WIFIDOG_UNKNOWN " -d %s -j ACCEPT", config->auth_servers->authserv_hostname);
     iptables_do_command("-t nat -A " TABLE_WIFIDOG_UNKNOWN " -p udp --dport 67 -j ACCEPT");
     iptables_do_command("-t nat -A " TABLE_WIFIDOG_UNKNOWN " -p tcp --dport 67 -j ACCEPT");

trunk/wifidog/wifidog.conf

@@ -60 +60 @@
 GatewayAddress 10.0.0.1
 
-# Parm: AuthservHostname
+# Parm: AuthServer
 # Default: NONE
 # Mandatory
 #
-# Set this to the hostname or IP of your auth server
-AuthservHostname yourauthserv.com
+# Set this to the hostname or IP of your auth server and optionally as
+# a second argument, the port it listens on.
+# AuthServer yourauthserv.com 8080
+AuthServer yourauthserv.com
 
 # Parm: AuthservPath