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

Timestamp:

04/01/05 18:25:32 (8 years ago)

Author:

aprilp

Message:

* Duplicated auth server list in NAT table to fix the issue

of using an auth server on port 80, since port 80 was being systematically
redirected to 2060 otherwise.

* Released 1.1.1

Files:

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

trunk/wifidog/src/fw_iptables.c

@@ -158 +158 @@
 {
     iptables_do_command("-t filter -F " TABLE_WIFIDOG_AUTHSERVERS);
+    iptables_do_command("-t nat -F " TABLE_WIFIDOG_AUTHSERVERS);
 }
 
@@ -171 +172 @@
             if (auth_server->last_ip && strcmp(auth_server->last_ip, "0.0.0.0") != 0) {
                 iptables_do_command("-t filter -A " TABLE_WIFIDOG_AUTHSERVERS " -d %s -j ACCEPT", auth_server->last_ip);
+                iptables_do_command("-t nat -A " TABLE_WIFIDOG_AUTHSERVERS " -d %s -j ACCEPT", auth_server->last_ip);
             }
     }
@@ -221 +223 @@
                         iptables_do_command("-t nat -N " TABLE_WIFIDOG_WIFI_TO_INTERNET);
                         iptables_do_command("-t nat -N " TABLE_WIFIDOG_UNKNOWN);
+                        iptables_do_command("-t nat -N " TABLE_WIFIDOG_AUTHSERVERS);
 
                         /* Assign links and rules to these new chains */
@@ -233 +236 @@
                         iptables_do_command("-t nat -A " TABLE_WIFIDOG_WIFI_TO_INTERNET " -j " TABLE_WIFIDOG_UNKNOWN);
 
+                        iptables_do_command("-t nat -A " TABLE_WIFIDOG_UNKNOWN " -j " TABLE_WIFIDOG_AUTHSERVERS);
                         iptables_do_command("-t nat -A " TABLE_WIFIDOG_UNKNOWN " -p tcp --dport 80 -j REDIRECT --to-ports %d", gw_port);
 
@@ -302 +306 @@
     iptables_do_command("-t mangle -X " TABLE_WIFIDOG_INCOMING);
 
-         /*
-          *
-          * Everything in the NAT table
-          *
-          */
-         debug(LOG_DEBUG, "Destroying chains in the NAT table");
-         iptables_fw_destroy_mention("nat", "PREROUTING", TABLE_WIFIDOG_OUTGOING);
+        /*
+         *
+         * Everything in the NAT table
+         *
+         */
+        debug(LOG_DEBUG, "Destroying chains in the NAT table");
+        iptables_fw_destroy_mention("nat", "PREROUTING", TABLE_WIFIDOG_OUTGOING);
+        iptables_do_command("-t nat -F " TABLE_WIFIDOG_AUTHSERVERS);
     iptables_do_command("-t nat -F " TABLE_WIFIDOG_OUTGOING);
     iptables_do_command("-t nat -F " TABLE_WIFIDOG_WIFI_TO_ROUTER);
     iptables_do_command("-t nat -F " TABLE_WIFIDOG_WIFI_TO_INTERNET);
     iptables_do_command("-t nat -F " TABLE_WIFIDOG_UNKNOWN);
+        iptables_do_command("-t nat -X " TABLE_WIFIDOG_AUTHSERVERS);
     iptables_do_command("-t nat -X " TABLE_WIFIDOG_OUTGOING);
     iptables_do_command("-t nat -X " TABLE_WIFIDOG_WIFI_TO_ROUTER);