applications/luci-splash: Always insert the mangling rules, not just when bandwidth...

diff --git a/applications/luci-splash/root/etc/init.d/luci_splash b/applications/luci-splash/root/etc/init.d/luci_splash
index fe80628823863da42d34f606bfc19d4ecf96fd2c..d2628c86fe62c2ee6534ca4e5a4f5c516738c604 100755 (executable)
--- a/applications/luci-splash/root/etc/init.d/luci_splash
+++ b/applications/luci-splash/root/etc/init.d/luci_splash
@@ -245,18 +245,16 @@ start() {
        fi
 
        ### Add QoS chain
-       [ "$LIMIT_UP" -gt 0 -a "$LIMIT_DOWN" -gt 0 ] && {
-               iptables -t mangle -N luci_splash_mark_out
-               iptables -t mangle -N luci_splash_mark_in
-               iptables -t mangle -I PREROUTING  -j luci_splash_mark_out
-               iptables -t mangle -I POSTROUTING -j luci_splash_mark_in
-               if [ "$HAS_IPV6" = 1 ]; then
-                       ip6tables -t mangle -N luci_splash_mark_out
-                       ip6tables -t mangle -N luci_splash_mark_in
-                       ip6tables -t mangle -I PREROUTING  -j luci_splash_mark_out
-                       ip6tables -t mangle -I POSTROUTING -j luci_splash_mark_in
-               fi
-       }
+    iptables -t mangle -N luci_splash_mark_out
+    iptables -t mangle -N luci_splash_mark_in
+    iptables -t mangle -I PREROUTING  -j luci_splash_mark_out
+    iptables -t mangle -I POSTROUTING -j luci_splash_mark_in
+    if [ "$HAS_IPV6" = 1 ]; then
+        ip6tables -t mangle -N luci_splash_mark_out
+        ip6tables -t mangle -N luci_splash_mark_in
+        ip6tables -t mangle -I PREROUTING  -j luci_splash_mark_out
+        ip6tables -t mangle -I POSTROUTING -j luci_splash_mark_in
+    fi
 
        ### Find active mac addresses
        MACS=""

diff --git a/applications/luci-splash/root/usr/sbin/luci-splash b/applications/luci-splash/root/usr/sbin/luci-splash
index bf32d635e8d33ea84e5159e12d129fdfb7800d5e..34b2e9c420f4b56b0ceaac9a8f2c4b7c39832bc1 100755 (executable)
--- a/applications/luci-splash/root/usr/sbin/luci-splash
+++ b/applications/luci-splash/root/usr/sbin/luci-splash
@@ -304,9 +304,11 @@ end
 
 -- Add an iptables rule
 function add_lease_rule(mac, ipaddr)
-       if limit_up > 0 and limit_down > 0 then
-               os.execute("iptables -t mangle -I luci_splash_mark_out -m mac --mac-source %q -j MARK --set-mark 79" % mac)
-               os.execute("iptables -t mangle -I luci_splash_mark_in -d %q -j MARK --set-mark 80" % ipaddr)
+    os.execute("iptables -t mangle -I luci_splash_mark_out -m mac --mac-source %q -j MARK --set-mark 79" % mac)
+    os.execute("iptables -t mangle -I luci_splash_mark_in -d %q -j MARK --set-mark 80" % ipaddr)
+       if has_ipv6 then
+        os.execute("ip6tables -t mangle -I luci_splash_mark_out -m mac --mac-source %q -j MARK --set-mark 79" % mac)
+        os.execute("ip6tables -t mangle -I luci_splash_mark_in -d %q -j MARK --set-mark 80" % ipaddr)
        end