qos/imq is now in input and forward tables

diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index d12e8b39d99f73d098dd018d1811a178d1d6c23a..e4ce34f8aa27160d665b5a75474da56d26bb8883 100644 (file)
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -502,10 +502,14 @@ print <<END
 
        ### ADD QOS-INC CHAIN TO THE MANGLE TABLE IN IPTABLES
        iptables -t mangle -N QOS-INC
-       iptables -t mangle -A POSTROUTING -m mark ! --mark 0 -o ! $qossettings{'RED_DEV'} -j IMQ --todev 0
+       iptables -t mangle -A FORWARD -i $qossettings{'RED_DEV'} -j IMQ --todev 0
        iptables -t mangle -I FORWARD -i $qossettings{'RED_DEV'} -j QOS-INC
        iptables -t mangle -A FORWARD -i $qossettings{'RED_DEV'} -j QOS-TOS
 
+       iptables -t mangle -A INPUT -i $qossettings{'RED_DEV'} -j IMQ --todev 0
+       iptables -t mangle -I INPUT -i $qossettings{'RED_DEV'} -j QOS-INC
+       iptables -t mangle -A INPUT -i $qossettings{'RED_DEV'} -j QOS-TOS
+
        ### SET TOS
 END
 ;
@@ -655,7 +659,8 @@ print <<END
        tc qdisc del dev $qossettings{'IMQ_DEV'} root >/dev/null 2>&1
        # STOP IMQ-DEVICE
        ip link set $qossettings{'IMQ_DEV'} down >/dev/null 2>&1
-       iptables -t mangle --delete POSTROUTING -m mark ! --mark 0 -o ! $qossettings{'RED_DEV'} -j IMQ --todev 0
+       iptables -t mangle --delete FORWATD -i $qossettings{'RED_DEV'} -j IMQ --todev 0
+       iptables -t mangle --delete INPUT -i $qossettings{'RED_DEV'} -j IMQ --todev 0
        # rmmod imq # this crash on 2.6.25.xx
        # REMOVE & FLUSH CHAINS
        iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-OUT >/dev/null 2>&1
@@ -664,6 +669,8 @@ print <<END
        iptables -t mangle --delete-chain QOS-OUT >/dev/null 2>&1
        iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-INC
        iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-TOS
+       iptables -t mangle --delete INPUT -i $qossettings{'RED_DEV'} -j QOS-INC
+       iptables -t mangle --delete INPUT -i $qossettings{'RED_DEV'} -j QOS-TOS
        iptables -t mangle --flush  QOS-INC >/dev/null 2>&1
        iptables -t mangle --delete-chain QOS-INC >/dev/null 2>&1
        iptables -t mangle --flush  QOS-TOS >/dev/null 2>&1