applications/luci-splash: prevent duplicate firewall rules after boot

diff --git a/applications/luci-splash/root/etc/init.d/luci_splash b/applications/luci-splash/root/etc/init.d/luci_splash
index fe451d0..ad47a25 100755 (executable)
--- a/applications/luci-splash/root/etc/init.d/luci_splash
+++ b/applications/luci-splash/root/etc/init.d/luci_splash
@@ -25,6 +25,12 @@ iface_add() {
        iptables -t nat -A luci_splash_prerouting -s "$NETWORK/$PREFIX" -d "$ipaddr" -p tcp -m multiport ! --dport 22,80,443 -j luci_splash_portal
 }
 
        iptables -t nat -A luci_splash_prerouting -s "$NETWORK/$PREFIX" -d "$ipaddr" -p tcp -m multiport ! --dport 22,80,443 -j luci_splash_portal
 }
 

+iface_del() {
+       config_get zone "$1" zone                                                                
+       [ -n "$zone" ] || return 0
+       while iptables -t nat -D prerouting_${zone} -j luci_splash_prerouting 2>&-; do :; done
+}
+

 blacklist_add() {
        local cfg="$1"
        
 blacklist_add() {
        local cfg="$1"
        


@@ -39,6 +45,11 @@ whitelist_add() {
        [ -n "$mac" ] && iptables -t nat -I luci_splash_leases -m mac --mac-source "$mac" -j RETURN
 }
 
        [ -n "$mac" ] && iptables -t nat -I luci_splash_leases -m mac --mac-source "$mac" -j RETURN
 }
 

+boot() {
+       ### We are started by the firewall include
+       exit 0
+}
+

 start() {
        ### Read chains from config
        include /lib/network
 start() {
        ### Read chains from config
        include /lib/network


@@ -75,12 +86,6 @@ start() {
        start-stop-daemon -S -m -p /var/run/luci-splashd.pid -b -q -x /usr/bin/luci-splashd
 }
 
        start-stop-daemon -S -m -p /var/run/luci-splashd.pid -b -q -x /usr/bin/luci-splashd
 }
 

-iface_del() {
-       config_get zone "$1" zone                                                                
-       [ -n "$zone" ] || return 0
-       while iptables -t nat -D prerouting_${zone} -j luci_splash_prerouting 2>&-; do :; done
-}
-

 stop() {
        ### Clear interface rules
        config_load luci_splash
 stop() {
        ### Clear interface rules
        config_load luci_splash