From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 22 Nov 2021 18:11:34 +0000 (+0000)
Subject: QoS: Add CAKE profile to commmand line
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6fddcfbec19706f1e385b425bef12a54dde667ce;p=people%2Fms%2Fipfire-2.x.git

QoS: Add CAKE profile to commmand line

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index b6a6bdf0b3..04bcb77abd 100644
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -54,7 +54,10 @@ my $classfile = "/var/ipfire/qos/classes";
 my $level7file = "/var/ipfire/qos/level7config";
 my $portfile = "/var/ipfire/qos/portconfig";
 my $tosfile = "/var/ipfire/qos/tosconfig";
-my @cake_options = ();
+my @cake_options = (
+	# RED is by default connected to the Internet
+	"internet"
+);
 
 # Define iptables MARKs
 my $QOS_INC_MASK = 0x0000ff00;
@@ -81,6 +84,12 @@ $qossettings{'VALID'} = 'yes';
 
 &General::readhash("${General::swroot}/qos/settings", \%qossettings);
 
+# Default to "conservative
+unless (defined $qossettings{'CAKE_PROFILE'}) {
+	$qossettings{'CAKE_PROFILE'} = "conservative";
+}
+push(@cake_options, $qossettings{'CAKE_PROFILE'});
+
 my $DEF_OUT_MARK = ($qossettings{'DEFCLASS_OUT'} << $QOS_OUT_SHIFT) . "/$QOS_OUT_MASK";
 my $DEF_INC_MARK = ($qossettings{'DEFCLASS_INC'} << $QOS_INC_SHIFT) . "/$QOS_INC_MASK";