From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 10 Feb 2009 06:58:32 +0000 (+0100)
Subject: Change QOS of incoming traffic to match local Nat IP Addresses
X-Git-Tag: v2.5-beta1~178
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d1c42ad86c63742ce411ee804aebfd9f85840ae;p=people%2Fpmueller%2Fipfire-2.x.git

Change QOS of incoming traffic to match local Nat IP Addresses
---

diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index 6b0afd3e65..dc31c5acad 100644
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -502,9 +502,9 @@ print <<END
 
 	### ADD QOS-INC CHAIN TO THE MANGLE TABLE IN IPTABLES
 	iptables -t mangle -N QOS-INC
-	iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -j IMQ --todev 0
-	iptables -t mangle -I PREROUTING -i $qossettings{'RED_DEV'} -j QOS-INC
-	iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -j QOS-TOS
+	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 QOS-INC
+	iptables -t mangle -i FORWARD -i $qossettings{'RED_DEV'} -j QOS-TOS
 
 	### SET TOS
 END
@@ -655,15 +655,15 @@ 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 PREROUTING -i $qossettings{'RED_DEV'} -j IMQ --todev 0 >/dev/null 2>&1
+	iptables -t mangle --delete POSTROUTING -m mark ! --mark 0 -o ! $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
 	iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-TOS >/dev/null 2>&1
 	iptables -t mangle --flush  QOS-OUT >/dev/null 2>&1
 	iptables -t mangle --delete-chain QOS-OUT >/dev/null 2>&1
-	iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j QOS-INC >/dev/null 2>&1
-	iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j QOS-TOS >/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 --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
diff --git a/config/rootfiles/core/27/files b/config/rootfiles/core/27/files
index 28b9521d0e..6accc6767f 100644
--- a/config/rootfiles/core/27/files
+++ b/config/rootfiles/core/27/files
@@ -27,3 +27,5 @@ var/ipfire/updatexlrator/updxlrator-lib.pl
 srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/updatexlrator.cgi
 var/ipfire/langs
+lib/modules/2.6.25.19-ipfire/kernel/drivers/net/imq.ko
+var/ipfire/qos/bin/makeqosscripts.pl
diff --git a/config/rootfiles/core/27/update.sh b/config/rootfiles/core/27/update.sh
index 35600116f6..c8e847c3c4 100644
--- a/config/rootfiles/core/27/update.sh
+++ b/config/rootfiles/core/27/update.sh
@@ -2,6 +2,9 @@
 . /opt/pakfire/lib/functions.sh
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 extract_files
+[ -e /var/ipfire/qos/enable ] && qosctrl stop
+qosctrl generate
+[ -e /var/ipfire/qos/enable ] && qosctrl start
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 sysctl -p
 /etc/init.d/squid restart