Changeset 1375

Timestamp:

09/30/08 06:20:06 (2 months ago)

Author:

wichert

Message:

Include the gateway id in the firewall table names. Fixes #466

Files:

• trunk/wifidog/ChangeLog (modified) (1 diff)
• trunk/wifidog/src/fw_iptables.c (modified) (6 diffs)
• trunk/wifidog/src/fw_iptables.h (modified) (1 diff)
• trunk/wifidog/wifidog.conf (modified) (1 diff)

trunk/wifidog/ChangeLog

@@ -2 +2 @@
-
-2008-09-30 Wichert Akkerman <wichert@wiggy.net>
+        * Include the gateway id in the firewall table names. Fixes ticket #466
-        * URL encode the token before transmitting (it was already decoded).
-          Fixes ticket #473

trunk/wifidog/src/fw_iptables.c

@@ -60 +60 @@
-static int fw_quiet = 0;
-
+/** @internal
+ * @brief Insert $ID$ with the gateway's id in a string.
+ *
+ * This function can replace the input string with a new one. It assumes
+ * the input string is dynamically allocted and can be free()ed safely.
+ *
+ * This function must be called with the CONFIG_LOCK held.
+ */
+static void
+iptables_insert_gateway_id(char **input)
+{
+        char *token;
+        const s_config *config;
+        char *buffer;
+
+        if (strstr(*input, "$ID$")==NULL)
+                return;
+
+
+        while ((token=strstr(*input, "$ID$"))!=NULL)
+                /* This string may look odd but it's standard POSIX and ISO C */
+                memcpy(token, "%1$s", 4);
+
+        config = config_get_config();
+        safe_asprintf(&buffer, *input, config->gw_id);
+
+        free(*input);
+        *input=buffer;
+}
+
-/** @internal 
- * */
@@ -65 +95 @@
-iptables_do_command(const char *format, ...)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -190 +221 @@
-{
-        const s_config *config;
-        char * gw_interface = NULL;
-        char * gw_address = NULL;
-        char * ext_interface = NULL;
-        int gw_port = 0;
-        t_trusted_mac *p;
-
+
-        fw_quiet = 0;
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        if (ext_interface == NULL) {
+                UNLOCK_CONFIG();
-                debug(LOG_ERR, "FATAL: no external interface");
-                /* XXX leaks safe_strdup()'d strings */
-                return 0;
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -417 +441 @@
-
-        safe_asprintf(&command, "iptables -t %s -L %s -n --line-numbers -v", table, chain);
+        iptables_insert_gateway_id(&command);
-
-        if ((p = popen(command, "r"))) {
@@ -491 +516 @@
-    /* Look for outgoing traffic */
-    safe_asprintf(&script, "%s %s", "iptables", "-v -n -x -t mangle -L " TABLE_WIFIDOG_OUTGOING);
+    iptables_insert_gateway_id(&script);
-    output = popen(script, "r");
-    free(script);
@@ -529 +555 @@
-    /* Look for incoming traffic */
-    safe_asprintf(&script, "%s %s", "iptables", "-v -n -x -t mangle -L " TABLE_WIFIDOG_INCOMING);
+    iptables_insert_gateway_id(&script);
-    output = popen(script, "r");
-    free(script);

trunk/wifidog/src/fw_iptables.h

@@ -32 +32 @@
-/*@{*/ 
-/**Iptable table names used by WifiDog */
-
-
-
-
-
-
-
-
-
-
-
+$ID$_
+$ID$_
+$ID$_
+$ID$_
+$ID$_
+$ID$_
+$ID$_
+$ID$_
+$ID$_
+$ID$_
+$ID$_
-/*@}*/ 
-

trunk/wifidog/wifidog.conf

@@ -7 +7 @@
-#
-# Set this to the node ID on the auth server
-
-
+
+
+
-# If none is supplied, the mac address of the GatewayInterface interface will be used,
-# without the : separators