From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 13/17] QoS: Drop tc filter rules to move marked packets into the correct class Date: Mon, 14 Oct 2019 16:46:23 +0000 Message-ID: <20191014164627.18516-13-michael.tremer@ipfire.org> In-Reply-To: <20191014164627.18516-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6520127967729075310==" List-Id: --===============6520127967729075310== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is no longer necessary since we are now using CLASSIFY Signed-off-by: Michael Tremer --- config/qos/makeqosscripts.pl | 47 +----------------------------------- 1 file changed, 1 insertion(+), 46 deletions(-) diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl index 7d680151b..f73fe2938 100644 --- a/config/qos/makeqosscripts.pl +++ b/config/qos/makeqosscripts.pl @@ -131,12 +131,6 @@ case "\$1" in tc -s class show dev $qossettings{'IMQ_DEV'} exit 0 ;; - filter) - echo "[filter]" - tc -s filter show dev $qossettings{'RED_DEV'} - tc -s filter show dev $qossettings{'IMQ_DEV'} - exit 0 - ;; iptables) echo "[iptables]" iptables -t mangle -n -L QOS-OUT -v -x 2> /dev/null @@ -147,7 +141,6 @@ case "\$1" in esac \$0 \$1 qdisc \$0 \$1 class - \$0 \$1 filter \$0 \$1 iptables exit 0 ;; @@ -230,25 +223,6 @@ foreach $subclassentry (sort @subclasses) { print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 1:$qossettings{'SC= LASS'} handle $qossettings{'SCLASS'}: fq_codel $fqcodel_options\n"; } } -print "\n\t### FILTER TRAFFIC INTO CLASSES\n"; -foreach $classentry (sort @classes) -{ - @classline =3D split( /\;/, $classentry ); - if ($qossettings{'RED_DEV'} eq $classline[0]) { - $qossettings{'DEVICE'} =3D $classline[0]; - $qossettings{'CLASS'} =3D $classline[1]; - print "\ttc filter add dev $qossettings{'DEVICE'} parent 1:0 prio 0 protoc= ol ip handle $qossettings{'CLASS'} fw flowid 1:$qossettings{'CLASS'}\n"; - } -} -foreach $subclassentry (sort @subclasses) { - @subclassline =3D split( /\;/, $subclassentry ); - if ($qossettings{'RED_DEV'} eq $subclassline[0]) { - $qossettings{'DEVICE'} =3D $subclassline[0]; - $qossettings{'CLASS'} =3D $subclassline[1]; - $qossettings{'SCLASS'} =3D $subclassline[2]; - print "\ttc filter add dev $qossettings{'DEVICE'} parent 1:0 prio 0 protoc= ol ip handle $qossettings{'SCLASS'} fw flowid 1:$qossettings{'SCLASS'}\n"; - } -} print <