From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH v2 13/15] QoS: Drop support for setting TOS bits per class
Date: Mon, 21 Oct 2019 20:45:37 +0200
Message-ID: <20191021184539.12758-13-michael.tremer@ipfire.org>
In-Reply-To: <20191021184539.12758-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5448183130567283042=="
List-Id: <development.lists.ipfire.org>

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

This is useless since no ISP will evaluate those settings
any more and it has a rather large impact on throughput.

Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 config/qos/makeqosscripts.pl | 26 +-------------------------
 html/cgi-bin/qos.cgi         | 12 ------------
 2 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index 6f307c743..96c784c89 100644
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -134,7 +134,6 @@ case "\$1" in
 		echo "[iptables]"
 		iptables -t mangle -n -L QOS-OUT -v -x 2> /dev/null
 		iptables -t mangle -n -L QOS-INC -v -x 2> /dev/null
-		iptables -t mangle -n -L QOS-TOS -v -x 2> /dev/null
 		exit 0
 	  ;;
 	esac
@@ -211,9 +210,7 @@ print <<END
=20
 	### ADD QOS-OUT CHAIN TO THE MANGLE TABLE IN IPTABLES
 	iptables -t mangle -N QOS-OUT
-	iptables -t mangle -N QOS-TOS
 	iptables -t mangle -I POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-OUT
-	iptables -t mangle -A POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-TOS
=20
 	### Don't change mark on traffic for the ipsec tunnel
 	iptables -t mangle -A QOS-OUT -m mark --mark 50 -j RETURN
@@ -431,7 +428,6 @@ 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 QOS-INC
-	iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -j QOS-TOS
=20
 	# If the packet is already marked, then skip the processing
 	iptables -t mangle -A QOS-INC -m mark ! --mark 0 -j RETURN
@@ -518,22 +514,6 @@ print <<END
 	# Save mark in connection tracking
 	iptables -t mangle -A QOS-INC -j CONNMARK --save-mark
=20
-	### SETTING TOS BITS
-END
-;
-	foreach $classentry (sort @classes)
-	{
-		@classline =3D split( /\;/, $classentry );
-		$qossettings{'CLASS'} =3D $classline[1];
-		$qossettings{'TOS'} =3D abs $classline[7] * 2;
-		if ($qossettings{'TOS'} ne "0") {
-			print "\tiptables -t mangle -A QOS-TOS -m mark --mark $qossettings{'CLASS=
'} -j TOS --set-tos $qossettings{'TOS'}\n";
-			print "\tiptables -t mangle -A QOS-TOS -m mark --mark $qossettings{'CLASS=
'} -j RETURN\n";
-		}
-	}
-
-print <<END
-
 	## STARTING COLLECTOR
 	/usr/local/bin/qosd $qossettings{'RED_DEV'} >/dev/null 2>&1
 	/usr/local/bin/qosd $qossettings{'IMQ_DEV'} >/dev/null 2>&1
@@ -568,15 +548,11 @@ print <<END
 	iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -p esp -j=
 RETURN >/dev/null 2>&1
 	iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -p ip -j =
RETURN >/dev/null 2>&1
 	iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-O=
UT >/dev/null 2>&1
-	iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-T=
OS >/dev/null 2>&1
+	iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j QOS-IN=
C >/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
-	iptables -t mangle --delete PREROUTING -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
-	iptables -t mangle --delete-chain QOS-TOS >/dev/null 2>&1
 	# remove l7-filter
 	iptables -t mangle --delete PREROUTING -m layer7 --l7proto unset
=20
diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 320eef67d..8211a3ca0 100644
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -883,18 +883,6 @@ END
 		<tr><td width=3D'33%' align=3D'right'>Ceilburst:
 		    <td width=3D'33%' align=3D'left'><input type=3D'text' size=3D'20' name=
=3D'CBURST' maxlength=3D'8' value=3D"$qossettings{'CBURST'}" />
 		    <td width=3D'33%' align=3D'center'>&nbsp;
-END
-;
-			$selected{'TOS'}{$qossettings{'TOS'}} =3D "selected=3D'selected'";
-print <<END
-		<tr><td width=3D'33%' align=3D'right'>TOS-Bit:
-		    <td width=3D'33%' align=3D'left'><select name=3D'TOS'>
-				<option value=3D'0' $selected{'TOS'}{'0'}>$Lang::tr{'disabled'} (0)</opt=
ion>
-				<option value=3D'8' $selected{'TOS'}{'8'}>$Lang::tr{'min delay'} (8)</op=
tion>
-				<option value=3D'4' $selected{'TOS'}{'4'}>$Lang::tr{'max throughput'} (4=
)</option>
-				<option value=3D'2' $selected{'TOS'}{'2'}>$Lang::tr{'max reliability'} (=
2)</option>
-				<option value=3D'1' $selected{'TOS'}{'1'}>$Lang::tr{'min costs'} (1)</op=
tion></select>
-		    <td width=3D'33%' align=3D'center'>&nbsp;
 		<tr><td width=3D'33%' align=3D'right'>$Lang::tr{'remark'}:
 		    <td width=3D'66%' colspan=3D'2' align=3D'left'><input type=3D'text' na=
me=3D'REMARK' size=3D'40' maxlength=3D'40' value=3D"$qossettings{'REMARK'}" />
 		<tr><td width=3D'33%' align=3D'right'><img src=3D'/blob.gif' alt=3D'*' />&=
nbsp;$Lang::tr{'required field'}
--=20
2.12.2


--===============5448183130567283042==--