From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 27 Oct 2011 12:39:19 +0000 (+0000)
Subject: Add QoS firewall stop script generation
X-Git-Tag: reboot~15762
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=825658977f19c135acadc1ae741e376f796446a5;p=oweals%2Fopenwrt.git

Add QoS firewall stop script generation

To prevent code duplication for clearing QoS firewall rules, support
"firewall stop" arguments to generate.sh to generate the necessary
script commands.  Make use of this from qos-stop.

Signed-off-by: Kevin Locke <klocke@digitalenginesoftware.com>

SVN-Revision: 28623
---

diff --git a/package/qos-scripts/files/usr/bin/qos-stop b/package/qos-scripts/files/usr/bin/qos-stop
index d0243bea13..7f654d8587 100755
--- a/package/qos-scripts/files/usr/bin/qos-stop
+++ b/package/qos-scripts/files/usr/bin/qos-stop
@@ -3,5 +3,4 @@ for iface in $(tc qdisc show | grep -E '(hfsc|ingress)' | awk '{print $5}'); do
 	tc qdisc del dev "$iface" ingress 2>&- >&-
 	tc qdisc del dev "$iface" root 2>&- >&-
 done
-iptables -t mangle -F
-iptables -t mangle -X
+/usr/lib/qos/generate.sh firewall stop | sh
diff --git a/package/qos-scripts/files/usr/lib/qos/generate.sh b/package/qos-scripts/files/usr/lib/qos/generate.sh
index 093967f7a1..a983d159ae 100755
--- a/package/qos-scripts/files/usr/lib/qos/generate.sh
+++ b/package/qos-scripts/files/usr/lib/qos/generate.sh
@@ -486,6 +486,13 @@ case "$1" in
 		start_interfaces
 	;;
 	firewall)
-		start_firewall
+		case "$2" in
+			stop)
+				stop_firewall
+			;;
+			start|"")
+				start_firewall
+			;;
+		esac
 	;;
 esac