From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 4/6] QoS: Drop support for hardcoded ACK rules
Date: Mon, 04 Oct 2021 18:52:20 +0100
Message-ID: <20211004175222.9208-4-michael.tremer@ipfire.org>
In-Reply-To: <20211004175222.9208-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1115384852375250125=="
List-Id: <development.lists.ipfire.org>

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

This feature has to go in order to take advantage of CONNMARK which will
drastically decrease CPU load when passing packets.

We no longer will see every packet in the QOS-INC chain in order to
change classification of that packet. It is also party counter-intuitive
to have parts of one connection in one class and the corresponding ACK
packets in another.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 config/qos/makeqosscripts.pl | 27 ---------------------------
 html/cgi-bin/qos.cgi         | 22 ++--------------------
 2 files changed, 2 insertions(+), 47 deletions(-)

diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index 5bdd5b811..230dc3265 100644
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -72,7 +72,6 @@ $qossettings{'DEF_OUT_SPD'} =3D '';
 $qossettings{'DEF_INC_SPD'} =3D '';
 $qossettings{'DEFCLASS_INC'} =3D '';
 $qossettings{'DEFCLASS_OUT'} =3D '';
-$qossettings{'ACK'} =3D '';
 $qossettings{'RED_DEV'} =3D `cat /var/ipfire/red/iface`;
 $qossettings{'IMQ_DEV'} =3D 'imq0';
 $qossettings{'TOS'} =3D '';
@@ -80,7 +79,6 @@ $qossettings{'VALID'} =3D 'yes';
=20
 &General::readhash("${General::swroot}/qos/settings", \%qossettings);
=20
-my $ACK_MARK =3D ($qossettings{'ACK'} << $QOS_OUT_SHIFT) . "/$QOS_OUT_MASK";
 my $DEF_OUT_MARK =3D ($qossettings{'DEFCLASS_OUT'} << $QOS_OUT_SHIFT) . "/$Q=
OS_OUT_MASK";
 my $DEF_INC_MARK =3D ($qossettings{'DEFCLASS_INC'} << $QOS_INC_SHIFT) . "/$Q=
OS_INC_MASK";
=20
@@ -224,31 +222,6 @@ print <<END
 	### Don't change mark on traffic for the ipsec tunnel
 	iptables -t mangle -A QOS-OUT -m mark --mark 50 -j RETURN
=20
-	### MARK ACKs
-	iptables -t mangle -A QOS-OUT -p tcp --tcp-flags SYN,RST SYN -j MARK --set-=
xmark $ACK_MARK
-	iptables -t mangle -A QOS-OUT -p tcp --tcp-flags SYN,RST SYN -j RETURN
-
-	iptables -t mangle -A QOS-OUT -p icmp -m length --length 40:100 -j MARK --s=
et-xmark $ACK_MARK
-	iptables -t mangle -A QOS-OUT -p icmp -m length --length 40:100 -j RETURN
-
-	iptables -t mangle -A QOS-OUT -p tcp --syn -m length --length 40:68 -j MARK=
 --set-xmark $ACK_MARK
-	iptables -t mangle -A QOS-OUT -p tcp --syn -m length --length 40:68 -j RETU=
RN
-
-	iptables -t mangle -A QOS-OUT -p tcp --tcp-flags ALL SYN,ACK -m length --le=
ngth 40:68 -j MARK --set-xmark $ACK_MARK
-	iptables -t mangle -A QOS-OUT -p tcp --tcp-flags ALL SYN,ACK -m length --le=
ngth 40:68 -j RETURN
-
-	iptables -t mangle -A QOS-OUT -p tcp --tcp-flags ALL ACK -m length --length=
 40:100 -j MARK --set-xmark $ACK_MARK
-	iptables -t mangle -A QOS-OUT -p tcp --tcp-flags ALL ACK -m length --length=
 40:100 -j RETURN
-
-	iptables -t mangle -A QOS-OUT -p tcp --tcp-flags ALL RST -j MARK --set-xmar=
k $ACK_MARK
-	iptables -t mangle -A QOS-OUT -p tcp --tcp-flags ALL RST -j RETURN
-
-	iptables -t mangle -A QOS-OUT -p tcp --tcp-flags ALL ACK,RST -j MARK --set-=
xmark $ACK_MARK
-	iptables -t mangle -A QOS-OUT -p tcp --tcp-flags ALL ACK,RST -j RETURN
-
-	iptables -t mangle -A QOS-OUT -p tcp --tcp-flags ALL ACK,FIN -j MARK --set-=
xmark $ACK_MARK
-	iptables -t mangle -A QOS-OUT -p tcp --tcp-flags ALL ACK,FIN -j RETURN
-
 	### SET TOS
 END
 ;
diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index ab427879e..c2ff4a08d 100644
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -68,7 +68,6 @@ $qossettings{'DEF_OUT_SPD'} =3D '';
 $qossettings{'DEF_INC_SPD'} =3D '';
 $qossettings{'DEFCLASS_INC'} =3D '';
 $qossettings{'DEFCLASS_OUT'} =3D '';
-$qossettings{'ACK'} =3D '';
 $qossettings{'RED_DEV'} =3D 'ppp0';
 $qossettings{'IMQ_DEV'} =3D 'imq0';
 $qossettings{'VALID'} =3D 'yes';
@@ -518,7 +517,6 @@ END
 		}
 		$qossettings{'DEFCLASS_INC'} =3D "210";
 		$qossettings{'DEFCLASS_OUT'} =3D "110";
-		$qossettings{'ACK'} =3D"101";
 		$qossettings{'ENABLED'} =3D 'on';
 		&General::writehash("${General::swroot}/qos/settings", \%qossettings);
 		&General::system("/usr/local/bin/qosctrl", "generate");
@@ -660,7 +658,7 @@ END
 END
 ;
 	}
-	if (($qossettings{'DEFCLASS_OUT'} ne '') && ($qossettings{'DEFCLASS_INC'} n=
e '')&& ($qossettings{'ACK'} ne '')) {
+	if (($qossettings{'DEFCLASS_OUT'} ne '') && ($qossettings{'DEFCLASS_INC'} n=
e '')) {
 		print <<END
 		<form method=3D'post' action=3D'$ENV{'SCRIPT_NAME'}'>
 		<table width=3D'66%'>
@@ -668,7 +666,6 @@ END
 		<tr><td width=3D'50%' align=3D'right'>$Lang::tr{'downlink std class'}: 	<t=
d width=3D'30%' align=3D'left'>$qossettings{'DEFCLASS_INC'}
 		    <td width=3D'20%' rowspan=3D'3' align=3D'center' valign=3D'middle'><in=
put type=3D'submit' name=3D'ACTIONDEF' value=3D'$Lang::tr{'modify'}' />
 		<tr><td width=3D'50%' align=3D'right'>$Lang::tr{'uplink std class'}: 	<td =
width=3D'30%' align=3D'left'>$qossettings{'DEFCLASS_OUT'}
-		<tr><td width=3D'50%' align=3D'right'>ACKs:				<td width=3D'30%' align=3D'=
left'>$qossettings{'ACK'}
 	 	<tr><td colspan=3D'3' width=3D'100%'><hr />
 		<tr><td colspan=3D'3' width=3D'100%' align=3D'center'>
 		</table>
@@ -692,7 +689,7 @@ if ( ($qossettings{'OUT_SPD'} eq '') || ($qossettings{'IN=
C_SPD'} eq '') ) {
 	exit
 }
=20
-if ( ($qossettings{'DEFCLASS_INC'} eq '') || ($qossettings{'DEFCLASS_OUT'} e=
q '') || ($qossettings{'ACK'} eq '') ) {
+if ( ($qossettings{'DEFCLASS_INC'} eq '') || ($qossettings{'DEFCLASS_OUT'} e=
q '') ) {
 	&changedefclasses();
 	&Header::closebigbox();
 	&Header::closepage();
@@ -742,21 +739,6 @@ END
 			else { print "<option selected value=3D'$c'>$c</option>\n"; }
 		}
 		print <<END
-		</select><td width=3D'33%' align=3D'center'>&nbsp;
-		</table>
-		<hr />
-		<table width=3D'66%'>
-		<tr><td width=3D'100%' colspan=3D'3'>$Lang::tr{'enter ack class'}
-		<tr><td width=3D'33%' align=3D'right'>ACKs:<td width=3D'33%' align=3D'left=
'><select name=3D'ACK'>
-END
-;
-		for ( $c =3D 100 ; $c <=3D 120 ; $c++ )
-		{
-			if ( $qossettings{'ACK'} ne $c )
-			{ print "<option value=3D'$c'>$c</option>\n"; }
-			else {	print "<option selected value=3D'$c'>$c</option>\n"; }
-		}
-		print <<END
 		</select><td width=3D'33%' align=3D'center'><input type=3D'submit' name=3D=
'ACTION' value=3D"$Lang::tr{'save'}" />
 		</table>
 		</form>
--=20
2.31.0


--===============1115384852375250125==--