From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject:
 [PATCH 03/17] Revert "Make IMQ Switchable between PREROUTING and POSTROUTING"
Date: Mon, 14 Oct 2019 16:46:13 +0000
Message-ID: <20191014164627.18516-3-michael.tremer@ipfire.org>
In-Reply-To: <20191014164627.18516-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5728623541370746664=="
List-Id: <development.lists.ipfire.org>

--===============5728623541370746664==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This reverts commit 88b8ffac6b258e7b7687eb26111134bf435e23ca.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 config/qos/makeqosscripts.pl | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index b2ceb5773..d327ddf1a 100644
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -75,7 +75,6 @@ $qossettings{'RED_DEV'} =3D `cat /var/ipfire/red/iface`;
 $qossettings{'IMQ_DEV'} =3D 'imq0';
 $qossettings{'TOS'} =3D '';
 $qossettings{'VALID'} =3D 'yes';
-$qossettings{'IMQ_MODE'} =3D 'PREROUTING';
=20
 &General::readhash("${General::swroot}/qos/settings", \%qossettings);
=20
@@ -512,9 +511,6 @@ foreach $subclassentry (sort @subclasses) {
 		print "\ttc filter add dev $qossettings{'DEVICE'} parent 2:0 prio 0 protoc=
ol ip handle $qossettings{'SCLASS'} fw flowid 2:$qossettings{'SCLASS'}\n";
 	}
 }
-
-if ( $qossettings{'IMQ_MODE'} eq 'POSTROUTING' )
-{
 print <<END
=20
 	### ADD QOS-INC CHAIN TO THE MANGLE TABLE IN IPTABLES
@@ -528,24 +524,6 @@ print <<END
 	### SET TOS
 END
 ;
-}
-else
-{
-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'} -p ah -j RETURN
-	iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -p esp -j RETURN
-	iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -p ip -j RETURN
-	iptables -t mangle -I PREROUTING -i $qossettings{'RED_DEV'} -j QOS-INC
-	iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -j QOS-TOS
-
-	### SET TOS
-END
-;
-}
-
   	foreach $tosruleentry (sort @tosrules)
   	{
   		@tosruleline =3D split( /\;/, $tosruleentry );
@@ -710,10 +688,8 @@ print <<END
 	iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-T=
OS >/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 FORWARD -i $qossettings{'RED_DEV'} -j QOS-INC >=
/dev/null 2>&1
-	iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-TOS >=
/dev/null 2>&1
-	iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j QOS-IN=
C >/dev/null 2>&1
-	iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j QOS-TO=
S >/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
--=20
2.20.1


--===============5728623541370746664==--