From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [RFC PATCH 8/8] QoS: Add CAKE profile to commmand line Date: Thu, 02 Dec 2021 12:37:48 +0000 Message-ID: <20211202123748.2525617-8-michael.tremer@ipfire.org> In-Reply-To: <20211202123748.2525617-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0001914512744038752==" List-Id: --===============0001914512744038752== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Michael Tremer --- config/qos/makeqosscripts.pl | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl index 442324b98..cc91124df 100644 --- a/config/qos/makeqosscripts.pl +++ b/config/qos/makeqosscripts.pl @@ -54,7 +54,10 @@ my $classfile =3D "/var/ipfire/qos/classes"; my $level7file =3D "/var/ipfire/qos/level7config"; my $portfile =3D "/var/ipfire/qos/portconfig"; my $tosfile =3D "/var/ipfire/qos/tosconfig"; -my @cake_options =3D (); +my @cake_options =3D ( + # RED is by default connected to the Internet + "internet" +); =20 # Define iptables MARKs my $QOS_INC_MASK =3D 0x0000ff00; @@ -81,6 +84,12 @@ $qossettings{'VALID'} =3D 'yes'; =20 &General::readhash("${General::swroot}/qos/settings", \%qossettings); =20 +# Default to "conservative +unless (defined $qossettings{'CAKE_PROFILE'}) { + $qossettings{'CAKE_PROFILE'} =3D "conservative"; +} +push(@cake_options, $qossettings{'CAKE_PROFILE'}); + 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 --=20 2.30.2 --===============0001914512744038752==--