From 093d6a9cdabc5b10338c86a199380cfa220b3fd1 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 7 Mar 2012 11:47:52 +0000 Subject: [PATCH] multiwan package: use less iptables -F Hi Even if "qos-scripts" package isn't installed, multiwan is flushing all the mangle chains. This patch correct this behavior to let people use mangle table if qos-scripts is not there (to use there own qos script ...) Info: For the moment the qos management of the multiwan package is broken (it's speaks about IMQ, instead of IFB) The package version go from 1.0.20 to 1.0.21 (and not 1.0.19) because there is this patch also pending (http://patchwork.openwrt.org/patch/1740/) Signed-off-by: Etienne CHAMPETIER SVN-Revision: 30833 --- net/multiwan/Makefile | 2 +- net/multiwan/files/usr/bin/multiwan | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/net/multiwan/Makefile b/net/multiwan/Makefile index 76c61d83b5..bed8e6f63d 100644 --- a/net/multiwan/Makefile +++ b/net/multiwan/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=multiwan -PKG_VERSION:=1.0.20 +PKG_VERSION:=1.0.21 PKG_RELEASE:=1 include $(INCLUDE_DIR)/package.mk diff --git a/net/multiwan/files/usr/bin/multiwan b/net/multiwan/files/usr/bin/multiwan index c2fb3ab26e..75b2a2fc83 100755 --- a/net/multiwan/files/usr/bin/multiwan +++ b/net/multiwan/files/usr/bin/multiwan @@ -257,10 +257,10 @@ clear_rules() { local restore_single=$1 local group - iptables -t mangle -F PREROUTING - iptables -t mangle -F FORWARD - iptables -t mangle -F POSTROUTING - iptables -t mangle -F OUTPUT + iptables -t mangle -D PREROUTING -j MultiWan + iptables -t mangle -D FORWARD -j MultiWan + iptables -t mangle -D OUTPUT -j MultiWan + iptables -t mangle -D POSTROUTING -j MultiWan iptables -t mangle -F MultiWan iptables -t mangle -X MultiWan iptables -t mangle -F MultiWanRules @@ -285,6 +285,10 @@ clear_rules() { done if [ ! -z "$CHKFORQOS" ]; then + iptables -t mangle -F PREROUTING + iptables -t mangle -F FORWARD + iptables -t mangle -F OUTPUT + iptables -t mangle -F POSTROUTING iptables -t mangle -F MultiWanQoS iptables -t mangle -X MultiWanQoS -- 2.30.2