From df3d84780e2c4ec4724b2262456a1d5cc39eb789 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 20 Feb 2009 04:15:54 +0000 Subject: [PATCH] applications/luci-splash: prevent duplicate firewall rules after boot --- .../luci-splash/root/etc/init.d/luci_splash | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/applications/luci-splash/root/etc/init.d/luci_splash b/applications/luci-splash/root/etc/init.d/luci_splash index fe451d08d..ad47a2590 100755 --- 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 } +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" @@ -39,6 +45,11 @@ whitelist_add() { [ -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 @@ -75,12 +86,6 @@ start() { 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 -- 2.25.1