From patchwork Thu Dec 2 12:37:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 4880 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4J4b8P439Nz3wt3 for ; Thu, 2 Dec 2021 12:37:57 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4J4b8P0rN2z1X5; Thu, 2 Dec 2021 12:37:57 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4J4b8P0hC2z30Hd; Thu, 2 Dec 2021 12:37:57 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4J4b8M3HJkz2xSB for ; Thu, 2 Dec 2021 12:37:55 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4J4b8L6JFDz1sh; Thu, 2 Dec 2021 12:37:54 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1638448674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=WVDNXPxMxsSf4gY/B+KD2wyXQATfDe3up8v7U7+h+z8=; b=nT0tY4ixvUDw8YTvPVyyLV6bYRnykTJNErlT5pDaC2QfmxJIXPuK5+7gza/Hq8x6H2W+vL 9TEaJEtOUDZ2jDBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1638448674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=WVDNXPxMxsSf4gY/B+KD2wyXQATfDe3up8v7U7+h+z8=; b=ubj3zrb3PqV4myASVjAD4DlwCec6wObm0Srp2NVPnjTNNVjjZkvb0NyO3BlC/Ouvg6wpst pDMJmx+78Hp7Q/QZzPa1+g8Azq1TSga8xPcF6vCabbT1221X41cozwRI4HbectXSQlQmZH VTx+FeJutvtClZyEG7KI7qne0WwPk4nRpJ8aqcFpnvs6xUUES8DDDhE+lhE5HiE+b15saN VK4ykdS1G8kDSvZC008I/U2FetGwPHcaY97H047gjlhF1cwJk+FEZGbdeESZFEhD9FhQbf 8ymHSukWAm+WP1MQc83hslD8nYiF6sXEqLfKLLlieAFZbJi2QUxq8LUUuMGlBw== From: Michael Tremer To: development@lists.ipfire.org Subject: [RFC PATCH 1/8] AQM: Use CAKE as default qdisc where appropriate instead of fq_codel Date: Thu, 2 Dec 2021 12:37:41 +0000 Message-Id: <20211202123748.2525617-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This script configures CAKE as default qdisc where appropriate: * It is not suitable to use any queue management on bridges/GRE/VTI/tun interfaces. * On Internet-facing interfaces, CAKE is configured in "internet" mode whereas on any zones except RED, it is configured in "metro" mode Signed-off-by: Michael Tremer --- config/udev/enable_codel | 65 ++++++++++++++++++++++++++++++++-------- 1 file changed, 52 insertions(+), 13 deletions(-) diff --git a/config/udev/enable_codel b/config/udev/enable_codel index 6cafd9b26..3ef9b0f59 100644 --- a/config/udev/enable_codel +++ b/config/udev/enable_codel @@ -21,9 +21,9 @@ # # ############################################################################ -LOG_FACILITY="codel" +LOG_FACILITY="aqm" -function log() { +log() { logger -t "${LOG_FACILITY}" $@ } @@ -32,19 +32,58 @@ if [ -z "${INTERFACE}" ]; then exit 1 fi -# Do nothing for the loopback device. -[ "${INTERFACE}" = "lo" ] && exit 0 - case "${ACTION}" in add|register) - # Change root qdisc to use fq_codel. - /sbin/tc qdisc add root dev ${INTERFACE} fq_codel - ret=$? - - if [ ${ret} -eq 0 ]; then - log "Codel AQM has been enabled on '${INTERFACE}'." - else - log "Codel AQM could not be enabled on '${INTERFACE}'. Error code: ${ret}" + TYPE="$( X-Patchwork-Id: 4881 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4J4b8Q3Ctmz3wtP for ; Thu, 2 Dec 2021 12:37:58 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4J4b8P1WNjz3f5; Thu, 2 Dec 2021 12:37:57 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4J4b8P1JC6z30Hn; Thu, 2 Dec 2021 12:37:57 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4J4b8M3vm0z2xVx for ; Thu, 2 Dec 2021 12:37:55 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4J4b8M2tjQz3PG; Thu, 2 Dec 2021 12:37:55 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1638448675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nPJhoNFjufJGQuSvmM0zlfJALBw7jG+CyTXYB2B0omM=; b=/01a7Ww7xrzl1dhTftCMTbgAccHXKtF3SphoD8w5PI2Aq6BuY61iGfnTnjkTO2OuMSuZ88 n3UMINpn6BZOFeDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1638448675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nPJhoNFjufJGQuSvmM0zlfJALBw7jG+CyTXYB2B0omM=; b=YS9BK3tDXTv7PesYnyOlb6Z+nnrFFpLRCsPX01hYPKE/rmMSlI1DXsosTRV2Nw83e9fHFv 5/+H5jgMMGEu0uOYfpWyHGH+lhhewW6qQeduXEvtWYvNVFNx8uVJaN/m3d5W8YhDGKx2Z5 wn+yJibfT0I5jVKY2uXFWqLIP0GeP/lI9/uAxF3TiIithpAyN1Qq1QWJoqmYedony7nIb6 0JdGz6c6MpcLGNi8TMtv6RMlCW/AAvSU34oVqwgPrkhLJ3fPgi+9/TV8yDHWtMrOnSXxfF 9BUedHvCHhgaXz1pFKUKHDY076exRVMtzlkm4xTX5AYHqDaL8z2JaKcpN77mow== From: Michael Tremer To: development@lists.ipfire.org Subject: [RFC PATCH 2/8] udev: Rename enable_codel to network-aqm Date: Thu, 2 Dec 2021 12:37:42 +0000 Message-Id: <20211202123748.2525617-2-michael.tremer@ipfire.org> In-Reply-To: <20211202123748.2525617-1-michael.tremer@ipfire.org> References: <20211202123748.2525617-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is a more generic term since CoDel is no longer being used Signed-off-by: Michael Tremer --- config/rootfiles/common/udev | 4 ++-- config/udev/99-aqm.rules | 2 ++ config/udev/99-codel.rules | 2 -- config/udev/{enable_codel => network-aqm} | 0 lfs/udev | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 config/udev/99-aqm.rules delete mode 100644 config/udev/99-codel.rules rename config/udev/{enable_codel => network-aqm} (100%) diff --git a/config/rootfiles/common/udev b/config/rootfiles/common/udev index 4a01f3eef..5c1267abe 100644 --- a/config/rootfiles/common/udev +++ b/config/rootfiles/common/udev @@ -31,9 +31,9 @@ lib/udev lib/udev/ata_id lib/udev/cdrom_id lib/udev/collect -lib/udev/enable_codel lib/udev/init-net-rules.sh lib/udev/mtd_probe +lib/udev/network-aqm lib/udev/network-hotplug-bridges lib/udev/network-hotplug-rename lib/udev/network-hotplug-vlan @@ -64,7 +64,7 @@ lib/udev/rules.d/75-probe_mtd.rules lib/udev/rules.d/78-sound-card.rules lib/udev/rules.d/80-drivers.rules lib/udev/rules.d/90-hwrng.rules -lib/udev/rules.d/99-codel.rules +lib/udev/rules.d/99-aqm.rules lib/udev/rules.d/99-offloading.rules lib/udev/scsi_id lib/udev/v4l_id diff --git a/config/udev/99-aqm.rules b/config/udev/99-aqm.rules new file mode 100644 index 000000000..69c909da7 --- /dev/null +++ b/config/udev/99-aqm.rules @@ -0,0 +1,2 @@ +# Call the AQM script +SUBSYSTEM=="net", RUN+="/lib/udev/network-aqm" diff --git a/config/udev/99-codel.rules b/config/udev/99-codel.rules deleted file mode 100644 index d6747ba04..000000000 --- a/config/udev/99-codel.rules +++ /dev/null @@ -1,2 +0,0 @@ -# Call the enable codel script. -SUBSYSTEM=="net", RUN+="/lib/udev/enable_codel" diff --git a/config/udev/enable_codel b/config/udev/network-aqm similarity index 100% rename from config/udev/enable_codel rename to config/udev/network-aqm diff --git a/lfs/udev b/lfs/udev index cfad0398b..3f526a3fa 100644 --- a/lfs/udev +++ b/lfs/udev @@ -126,11 +126,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) install -v -m 644 $(DIR_SRC)/config/udev/90-hwrng.rules \ /lib/udev/rules.d - # Install codel rules. - install -v -m 644 $(DIR_SRC)/config/udev/99-codel.rules \ + # Install AQM rules + install -v -m 644 $(DIR_SRC)/config/udev/99-aqm.rules \ /lib/udev/rules.d - install -m 755 $(DIR_SRC)/config/udev/enable_codel \ - /lib/udev/enable_codel + install -m 755 $(DIR_SRC)/config/udev/network-aqm \ + /lib/udev/network-aqm # Install offloading rules install -v -m 644 $(DIR_SRC)/config/udev/99-offloading.rules \ From patchwork Thu Dec 2 12:37:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 4882 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4J4b8Q5Q7Xz3wtT for ; Thu, 2 Dec 2021 12:37:58 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4J4b8P2pgfz3hk; Thu, 2 Dec 2021 12:37:57 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4J4b8P21YVz2ypP; Thu, 2 Dec 2021 12:37:57 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4J4b8M4Yngz2xSB for ; Thu, 2 Dec 2021 12:37:55 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4J4b8M3Vs0z1X5; Thu, 2 Dec 2021 12:37:55 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1638448675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=05Egxm8/JF3pGZcei3qiEEB8iWf1/CUBxbAalbZP+Wo=; b=8RWfFKoMig1LAOsTFcuuPXn4Cce1hk3oaxKAnzJWPN8IRKQTT1QiJdZAaUZKzIYFvFnT1N CFLSzpug5otZYhBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1638448675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=05Egxm8/JF3pGZcei3qiEEB8iWf1/CUBxbAalbZP+Wo=; b=pEiqtoMzBIuamw5S0xT3UniklEv/lIfR2X9Hit6epftKLGvfGOZCkXDOcUcNVj2h70D7Cl 4Ec7lAJi8Og0RzXBI78g/1BGTdCwKY0WgTLnbOWJO0JwxmfEfnZ/pewxbG8MmiJ6QIKDLe 3dCdkdt7PqWKkbrKoqn7FUvW3YPe+u4zSJoRRtdNzAJ3wghqh/GD6eYUNthk7729GhAVCD xMInvx/qR0Ui/DaaF5rdbRCeGXIM2k+iHTJKgvWexVrAyFvgLNY3yhSMeD5oqV671G843n sM5eRRZbbfs9HToBr7N65Y5IzYt31HMU8Bq9deCXCccCNoVqE59m4OQNq/ujeA== From: Michael Tremer To: development@lists.ipfire.org Subject: [RFC PATCH 3/8] QoS: Replace fq_codel by CAKE Date: Thu, 2 Dec 2021 12:37:43 +0000 Message-Id: <20211202123748.2525617-3-michael.tremer@ipfire.org> In-Reply-To: <20211202123748.2525617-1-michael.tremer@ipfire.org> References: <20211202123748.2525617-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is just swappin the qdisc without any further configuration. Signed-off-by: Michael Tremer --- config/qos/makeqosscripts.pl | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl index 3234ab366..442324b98 100644 --- a/config/qos/makeqosscripts.pl +++ b/config/qos/makeqosscripts.pl @@ -54,7 +54,7 @@ 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 $fqcodel_options = "limit 10240 quantum 1514"; +my @cake_options = (); # Define iptables MARKs my $QOS_INC_MASK = 0x0000ff00; @@ -200,7 +200,7 @@ foreach $classentry (sort @classes) if ($qossettings{'RED_DEV'} eq $classline[0]) { $qossettings{'DEVICE'} = $classline[0]; $qossettings{'CLASS'} = $classline[1]; - print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 1:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: fq_codel $fqcodel_options\n"; + print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 1:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: cake @cake_options\n"; } } print "\n\t### FILTER TRAFFIC INTO CLASSES\n"; @@ -371,7 +371,7 @@ foreach $classentry (sort @classes) if ($qossettings{'IMQ_DEV'} eq $classline[0]) { $qossettings{'DEVICE'} = $classline[0]; $qossettings{'CLASS'} = $classline[1]; - print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: fq_codel $fqcodel_options\n"; + print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: cake @cake_options\n"; } } print "\n\t### FILTER TRAFFIC INTO CLASSES\n"; @@ -494,10 +494,7 @@ print </dev/null 2>&1 tc qdisc del dev $qossettings{'RED_DEV'} ingress >/dev/null 2>&1 - tc qdisc add root dev $qossettings{'RED_DEV'} fq_codel >/dev/null 2>&1 - tc qdisc del dev $qossettings{'IMQ_DEV'} root >/dev/null 2>&1 - tc qdisc del dev $qossettings{'IMQ_DEV'} ingress >/dev/null 2>&1 - tc qdisc add root dev $qossettings{'IMQ_DEV'} fq_codel >/dev/null 2>&1 + INTERFACE="$qossettings{'RED_DEV'}" ACTION="add" /lib/udev/network-aqm &>/dev/null # STOP IMQ-DEVICE ip link set $qossettings{'IMQ_DEV'} down >/dev/null 2>&1 ip link del $qossettings{'IMQ_DEV'} >/dev/null 2>&1 From patchwork Thu Dec 2 12:37:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 4883 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4J4b8S1kgHz3wt3 for ; Thu, 2 Dec 2021 12:38:00 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4J4b8P6FYDz3gj; Thu, 2 Dec 2021 12:37:57 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4J4b8P2cFsz30J0; Thu, 2 Dec 2021 12:37:57 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4J4b8M5MJ3z2xVx for ; Thu, 2 Dec 2021 12:37:55 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4J4b8M48NRzjr; Thu, 2 Dec 2021 12:37:55 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1638448675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sJvk7rwMiD/8uK3J2XjBARAIdf/GGo3MCycvxys9SYc=; b=lGgwENd/Yjif2OOowIG4PCs1FWuBD+cXCaTJJBVrxIRgSUKA+Is54zWuJ0E+04IEmravJq T9xulo+YKcanCWCA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1638448675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sJvk7rwMiD/8uK3J2XjBARAIdf/GGo3MCycvxys9SYc=; b=tvQQxmvDJ8RwQXWdP2QcM5Wl6UsiUNT7V29QkNKWA877C2VL8vJHZtZ6/mhic95G6nXDjv NbLLuNx2nz+RYzY+wO48HT9z1W9HhbhSG65qWrUAMPXGjMBu8TtRWKIhkpq00Ifi3I/O+r iaRbtfI0HAW3AZ8btzpKGADljRfFxiC7ZQn7FoCJEIY730TBrxgAovd+S5Pm6WuRpdDC5r CImRacbzn/XVELXrN1N8oLy5bTRwHQkGU9DF2LKzvuYFMu4yNsaH2D2ASn0gSzv7v3gBx2 jGzgMSuCLWQmkVbuJXE9RG/FoR3s5SVNPOQRpcM6/T+VehCPzmi410ftSBENRA== From: Michael Tremer To: development@lists.ipfire.org Subject: [RFC PATCH 4/8] network-hotplug-bridges: Fix warning when address doesn't exist Date: Thu, 2 Dec 2021 12:37:44 +0000 Message-Id: <20211202123748.2525617-4-michael.tremer@ipfire.org> In-Reply-To: <20211202123748.2525617-1-michael.tremer@ipfire.org> References: <20211202123748.2525617-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Some devices do not have an address, which prints an error when reading it. Signed-off-by: Michael Tremer --- config/udev/network-hotplug-bridges | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/config/udev/network-hotplug-bridges b/config/udev/network-hotplug-bridges index bacf722ef..4b8764598 100644 --- a/config/udev/network-hotplug-bridges +++ b/config/udev/network-hotplug-bridges @@ -41,9 +41,8 @@ detect_zone() { # Try to find out if this INTERFACE is a slave of a zone local slave for slave in $(get_value "${zone}_SLAVES"); do - - #Compare if the mac address matches or if the name matches - if ([ "$( X-Patchwork-Id: 4884 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4J4b8S64V9z3wtP for ; Thu, 2 Dec 2021 12:38:00 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4J4b8Q12G8z3p6; Thu, 2 Dec 2021 12:37:58 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4J4b8P3G82z30J3; Thu, 2 Dec 2021 12:37:57 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4J4b8M5vG6z2xSB for ; Thu, 2 Dec 2021 12:37:55 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4J4b8M4xHmz1X5; Thu, 2 Dec 2021 12:37:55 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1638448675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gXpQ6GyM53hIgXs8HLMumgWzs13AkZ++bP9z2sVd8n8=; b=Fja6wW5PAO34SPFNqS9i1DAUwqku7Er9aGtbI+cCR1/ScsiL4xUiOObQ5WQ6QI4f8H4zrB znb1TgMUNVQiupBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1638448675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gXpQ6GyM53hIgXs8HLMumgWzs13AkZ++bP9z2sVd8n8=; b=TjIzbmL5y6b8uo68O9ZVgcrkUpA8Vme91z3+w/+76N+8BLNuTGhYepcUBnMIrELbz/4NT6 lvOGe9fr/IfTMMsRWqubKJwHx385FrCfhBLxAZJzl5rYowfvzU5ImsoL19keEWKRqPnLlF TnghKStbK5s5DyeOVPPr0+RjY8dzOKfIwtkm1c6RH8ywPDw8HyQGTNRXOK4N7YT4Hr/58W jUQM48zKMxmfPQKSZJHe49iX5D9SfE2q+Hds353oOtDlyik+CFK6xhQ2a1x6QFlDUQ+e1i MwY9+ce1DADB4otiYb1AHyaQ97K9jO7vGe9qaYhQl4AMFQnIusHOZfOpUH1RXQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [RFC PATCH 5/8] qos.cgi: Reindent change bandwidth window Date: Thu, 2 Dec 2021 12:37:45 +0000 Message-Id: <20211202123748.2525617-5-michael.tremer@ipfire.org> In-Reply-To: <20211202123748.2525617-1-michael.tremer@ipfire.org> References: <20211202123748.2525617-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- html/cgi-bin/qos.cgi | 45 ++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index eb4b2e637..a26617edd 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -749,26 +749,43 @@ END sub changebandwidth { &Header::openbox('100%', 'center', $Lang::tr{'bandwidthsettings'}); + if ($qossettings{'ENABLED'} eq 'on') { print "$Lang::tr{'bandwidtherror'}"; print "$Lang::tr{'back'}"; } else { - print < - - - - - - - - -
$Lang::tr{'down and up speed'}
$Lang::tr{'downlink speed'}:

$Lang::tr{'uplink speed'}:
- - $Lang::tr{'template warning'} + print < + + + + + + + + + + + + + + +
$Lang::tr{'down and up speed'}
$Lang::tr{'downlink speed'}: + + + +
+ +
+ +
$Lang::tr{'uplink speed'}: + +
+ + $Lang::tr{'template warning'} END -; } + &Header::closebox(); } From patchwork Thu Dec 2 12:37:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 4887 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4J4b8W49gjz3wt3 for ; Thu, 2 Dec 2021 12:38:03 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4J4b8Q1nPBz3Zh; Thu, 2 Dec 2021 12:37:58 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4J4b8P3t4Lz30Hh; Thu, 2 Dec 2021 12:37:57 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4J4b8M6zWSz2yfp for ; Thu, 2 Dec 2021 12:37:55 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4J4b8M5Vx9zjr; Thu, 2 Dec 2021 12:37:55 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1638448675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=787MJqLK6ZPVMP7aDoCqruIuumXSUPcIp7ONxzOjKxk=; b=bm4w0odlr5Mtdt/4N1oLzWBOieZ+Ai6tZErIjmUxSKCVfopnxSYg+Na13QmwH0zJfkfnAo 2HJIlIHk+PZeW2Dg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1638448675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=787MJqLK6ZPVMP7aDoCqruIuumXSUPcIp7ONxzOjKxk=; b=iAqzPoAcn1OUU8GfcVbiuyZcLyy30SFPES8lCdiOOdVnVx3a9sziBSk4Cpc5acOr54/nol BJgBg/3vQX4BmdAoqY0ufW9pAcOuQNPEpck9q9BI7MSNTytiIuQzQRgAVjgY+CdeWRxucn sEgBMV7Z7QAdTnE8yycbgmbJPOjnHgrcLGQ9aiD81+KYkr5bGYFkvb9DVYennMCcKAtMfu I65liS1akiyYcD65z45DlUAlfOovzsusmqM+c985X0yhEehkrVLejmm+lWDn4TsFpdX1UW P1KGhXQX/i8io+JMld+mm6mdb0Rw6F1YHBdcIZcCq9h0U1jlTFptPDX8WWWktw== From: Michael Tremer To: development@lists.ipfire.org Subject: [RFC PATCH 6/8] qos.cgi: Add control to change link-layer encapsulation Date: Thu, 2 Dec 2021 12:37:46 +0000 Message-Id: <20211202123748.2525617-6-michael.tremer@ipfire.org> In-Reply-To: <20211202123748.2525617-1-michael.tremer@ipfire.org> References: <20211202123748.2525617-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- doc/language_issues.de | 16 ++++++ doc/language_issues.en | 16 ++++++ doc/language_issues.es | 16 ++++++ doc/language_issues.fr | 16 ++++++ doc/language_issues.it | 16 ++++++ doc/language_issues.nl | 16 ++++++ doc/language_issues.pl | 16 ++++++ doc/language_issues.ru | 16 ++++++ doc/language_issues.tr | 16 ++++++ doc/language_missings | 128 +++++++++++++++++++++++++++++++++++++++++ html/cgi-bin/qos.cgi | 70 ++++++++++++++++++---- langs/en/cgi-bin/en.pl | 16 ++++++ 12 files changed, 348 insertions(+), 10 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index d0275b5ef..668612dd3 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -855,6 +855,21 @@ WARNING: translation string unused: zoneconf val vlan amount assignment error WARNING: translation string unused: zoneconf val vlan tag assignment error WARNING: translation string unused: zoneconf val vlan tag range error WARNING: translation string unused: zoneconf val zoneslave amount error +WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes) +WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes) +WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes) +WARNING: untranslated string: cake profile conservative 48 = Conservative (should work on all connections, 48 bytes) +WARNING: untranslated string: cake profile docsis 18 = DOCSIS (18 bytes) +WARNING: untranslated string: cake profile ethernet 38 = Ethernet (38 bytes) +WARNING: untranslated string: cake profile ethernet vlan 42 = Ethernet with VLAN (42 bytes) +WARNING: untranslated string: cake profile ipoa-llcsnap 16 = IP over ATM LLC SNAP (16 bytes) +WARNING: untranslated string: cake profile ipoa-vcmux 8 = IP over ATM VC-MUX (8 bytes) +WARNING: untranslated string: cake profile pppoa-llc 14 = PPPoA LLC (14 bytes) +WARNING: untranslated string: cake profile pppoa-vcmux 10 = PPPoA VC-MUX (10 bytes) +WARNING: untranslated string: cake profile pppoe-llcsnap 40 = PPPoE LLC SNAP (40 bytes) +WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes) +WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes) +WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation) WARNING: untranslated string: desired = Desired WARNING: untranslated string: disable = Disable WARNING: untranslated string: download apple profile = Download Apple Configuration Profile @@ -894,6 +909,7 @@ WARNING: untranslated string: guardian service = unknown string WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS server IP address(es) WARNING: untranslated string: ipsec invalid ip address or fqdn for rw endpoint = Invalid IP address or FQDN for Host-to-Net Endpoint WARNING: untranslated string: ipsec roadwarrior endpoint = Host-to-Net Endpoint +WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon WARNING: untranslated string: no entries = No entries at the moment. WARNING: untranslated string: optional = Optional diff --git a/doc/language_issues.en b/doc/language_issues.en index e2d131a8e..8fc632a03 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -372,6 +372,21 @@ WARNING: untranslated string: ca name = CA name WARNING: untranslated string: cached = cached WARNING: untranslated string: cached memory = Cached Memory WARNING: untranslated string: cached swap = Cached Swap +WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes) +WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes) +WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes) +WARNING: untranslated string: cake profile conservative 48 = Conservative (should work on all connections, 48 bytes) +WARNING: untranslated string: cake profile docsis 18 = DOCSIS (18 bytes) +WARNING: untranslated string: cake profile ethernet 38 = Ethernet (38 bytes) +WARNING: untranslated string: cake profile ethernet vlan 42 = Ethernet with VLAN (42 bytes) +WARNING: untranslated string: cake profile ipoa-llcsnap 16 = IP over ATM LLC SNAP (16 bytes) +WARNING: untranslated string: cake profile ipoa-vcmux 8 = IP over ATM VC-MUX (8 bytes) +WARNING: untranslated string: cake profile pppoa-llc 14 = PPPoA LLC (14 bytes) +WARNING: untranslated string: cake profile pppoa-vcmux 10 = PPPoA VC-MUX (10 bytes) +WARNING: untranslated string: cake profile pppoe-llcsnap 40 = PPPoE LLC SNAP (40 bytes) +WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes) +WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes) +WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation) WARNING: untranslated string: calamaris available reports = Available reports WARNING: untranslated string: calamaris byte unit = Byte unit WARNING: untranslated string: calamaris create report = Create report @@ -1170,6 +1185,7 @@ WARNING: untranslated string: least preferred = least preferred WARNING: untranslated string: legacy architecture warning = You are running IPFire on a legacy architecture and it is recommended to upgrade WARNING: untranslated string: legend = Legend WARNING: untranslated string: lifetime = Lifetime: +WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation WARNING: untranslated string: linkq = Link Quality WARNING: untranslated string: local ip address = Local IP Address WARNING: untranslated string: local ntp server specified but not enabled = Local NTP server specified but not enabled diff --git a/doc/language_issues.es b/doc/language_issues.es index 39b9bef48..684c4d6b1 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -836,6 +836,21 @@ WARNING: untranslated string: bit = bit WARNING: untranslated string: block = Block WARNING: untranslated string: broken = Broken WARNING: untranslated string: bytes = unknown string +WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes) +WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes) +WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes) +WARNING: untranslated string: cake profile conservative 48 = Conservative (should work on all connections, 48 bytes) +WARNING: untranslated string: cake profile docsis 18 = DOCSIS (18 bytes) +WARNING: untranslated string: cake profile ethernet 38 = Ethernet (38 bytes) +WARNING: untranslated string: cake profile ethernet vlan 42 = Ethernet with VLAN (42 bytes) +WARNING: untranslated string: cake profile ipoa-llcsnap 16 = IP over ATM LLC SNAP (16 bytes) +WARNING: untranslated string: cake profile ipoa-vcmux 8 = IP over ATM VC-MUX (8 bytes) +WARNING: untranslated string: cake profile pppoa-llc 14 = PPPoA LLC (14 bytes) +WARNING: untranslated string: cake profile pppoa-vcmux 10 = PPPoA VC-MUX (10 bytes) +WARNING: untranslated string: cake profile pppoe-llcsnap 40 = PPPoE LLC SNAP (40 bytes) +WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes) +WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes) +WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation) WARNING: untranslated string: capabilities = Capabilities WARNING: untranslated string: ccd add = Add network WARNING: untranslated string: ccd choose net = Choose network @@ -1249,6 +1264,7 @@ WARNING: untranslated string: last = Last WARNING: untranslated string: least preferred = least preferred WARNING: untranslated string: legacy architecture warning = You are running IPFire on a legacy architecture and it is recommended to upgrade WARNING: untranslated string: lifetime = Lifetime: +WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation WARNING: untranslated string: local ip address = Local IP Address WARNING: untranslated string: log server protocol = protocol: WARNING: untranslated string: mac filter = MAC filter diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 6a300858d..e9d589658 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -899,6 +899,21 @@ WARNING: translation string unused: zoneconf val vlan amount assignment error WARNING: translation string unused: zoneconf val vlan tag assignment error WARNING: translation string unused: zoneconf val vlan tag range error WARNING: translation string unused: zoneconf val zoneslave amount error +WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes) +WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes) +WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes) +WARNING: untranslated string: cake profile conservative 48 = Conservative (should work on all connections, 48 bytes) +WARNING: untranslated string: cake profile docsis 18 = DOCSIS (18 bytes) +WARNING: untranslated string: cake profile ethernet 38 = Ethernet (38 bytes) +WARNING: untranslated string: cake profile ethernet vlan 42 = Ethernet with VLAN (42 bytes) +WARNING: untranslated string: cake profile ipoa-llcsnap 16 = IP over ATM LLC SNAP (16 bytes) +WARNING: untranslated string: cake profile ipoa-vcmux 8 = IP over ATM VC-MUX (8 bytes) +WARNING: untranslated string: cake profile pppoa-llc 14 = PPPoA LLC (14 bytes) +WARNING: untranslated string: cake profile pppoa-vcmux 10 = PPPoA VC-MUX (10 bytes) +WARNING: untranslated string: cake profile pppoe-llcsnap 40 = PPPoE LLC SNAP (40 bytes) +WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes) +WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes) +WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation) WARNING: untranslated string: false max bandwidth = Maximum bandwidth is false. WARNING: untranslated string: false min bandwidth = Minimum bandwidth is false. WARNING: untranslated string: fwhost cust locationgrp = unknown string @@ -933,6 +948,7 @@ WARNING: untranslated string: guardian logtarget_file = unknown string WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string +WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation WARNING: untranslated string: max bandwidth = Maximum bandwidth WARNING: untranslated string: pakfire ago = ago. WARNING: untranslated string: route config changed = unknown string diff --git a/doc/language_issues.it b/doc/language_issues.it index 993c76b82..02e6e504c 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -921,6 +921,21 @@ WARNING: untranslated string: available = available WARNING: untranslated string: block = Block WARNING: untranslated string: broken = Broken WARNING: untranslated string: bytes = unknown string +WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes) +WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes) +WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes) +WARNING: untranslated string: cake profile conservative 48 = Conservative (should work on all connections, 48 bytes) +WARNING: untranslated string: cake profile docsis 18 = DOCSIS (18 bytes) +WARNING: untranslated string: cake profile ethernet 38 = Ethernet (38 bytes) +WARNING: untranslated string: cake profile ethernet vlan 42 = Ethernet with VLAN (42 bytes) +WARNING: untranslated string: cake profile ipoa-llcsnap 16 = IP over ATM LLC SNAP (16 bytes) +WARNING: untranslated string: cake profile ipoa-vcmux 8 = IP over ATM VC-MUX (8 bytes) +WARNING: untranslated string: cake profile pppoa-llc 14 = PPPoA LLC (14 bytes) +WARNING: untranslated string: cake profile pppoa-vcmux 10 = PPPoA VC-MUX (10 bytes) +WARNING: untranslated string: cake profile pppoe-llcsnap 40 = PPPoE LLC SNAP (40 bytes) +WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes) +WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes) +WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation) WARNING: untranslated string: check all = Check all WARNING: untranslated string: cpu frequency = CPU frequency WARNING: untranslated string: crypto error = Cryptographic error @@ -1084,6 +1099,7 @@ WARNING: untranslated string: ipsec routing table entries = IPsec Routing Table WARNING: untranslated string: ipsec settings = IPsec Settings WARNING: untranslated string: itlb multihit = iTLB MultiHit WARNING: untranslated string: legacy architecture warning = You are running IPFire on a legacy architecture and it is recommended to upgrade +WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation WARNING: untranslated string: local ip address = Local IP Address WARNING: untranslated string: location = Location WARNING: untranslated string: locationblock = Location Block diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 664a2dd62..7b403f2af 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -917,6 +917,21 @@ WARNING: untranslated string: available = available WARNING: untranslated string: block = Block WARNING: untranslated string: broken = Broken WARNING: untranslated string: bytes = unknown string +WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes) +WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes) +WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes) +WARNING: untranslated string: cake profile conservative 48 = Conservative (should work on all connections, 48 bytes) +WARNING: untranslated string: cake profile docsis 18 = DOCSIS (18 bytes) +WARNING: untranslated string: cake profile ethernet 38 = Ethernet (38 bytes) +WARNING: untranslated string: cake profile ethernet vlan 42 = Ethernet with VLAN (42 bytes) +WARNING: untranslated string: cake profile ipoa-llcsnap 16 = IP over ATM LLC SNAP (16 bytes) +WARNING: untranslated string: cake profile ipoa-vcmux 8 = IP over ATM VC-MUX (8 bytes) +WARNING: untranslated string: cake profile pppoa-llc 14 = PPPoA LLC (14 bytes) +WARNING: untranslated string: cake profile pppoa-vcmux 10 = PPPoA VC-MUX (10 bytes) +WARNING: untranslated string: cake profile pppoe-llcsnap 40 = PPPoE LLC SNAP (40 bytes) +WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes) +WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes) +WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation) WARNING: untranslated string: capabilities = Capabilities WARNING: untranslated string: check all = Check all WARNING: untranslated string: cpu frequency = CPU frequency @@ -1095,6 +1110,7 @@ WARNING: untranslated string: ipsec routing table entries = IPsec Routing Table WARNING: untranslated string: ipsec settings = IPsec Settings WARNING: untranslated string: itlb multihit = iTLB MultiHit WARNING: untranslated string: legacy architecture warning = You are running IPFire on a legacy architecture and it is recommended to upgrade +WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation WARNING: untranslated string: local ip address = Local IP Address WARNING: untranslated string: location = Location WARNING: untranslated string: locationblock = Location Block diff --git a/doc/language_issues.pl b/doc/language_issues.pl index f10f9ff4a..791ccda61 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -851,6 +851,21 @@ WARNING: untranslated string: bit = bit WARNING: untranslated string: block = Block WARNING: untranslated string: broken = Broken WARNING: untranslated string: bytes = unknown string +WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes) +WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes) +WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes) +WARNING: untranslated string: cake profile conservative 48 = Conservative (should work on all connections, 48 bytes) +WARNING: untranslated string: cake profile docsis 18 = DOCSIS (18 bytes) +WARNING: untranslated string: cake profile ethernet 38 = Ethernet (38 bytes) +WARNING: untranslated string: cake profile ethernet vlan 42 = Ethernet with VLAN (42 bytes) +WARNING: untranslated string: cake profile ipoa-llcsnap 16 = IP over ATM LLC SNAP (16 bytes) +WARNING: untranslated string: cake profile ipoa-vcmux 8 = IP over ATM VC-MUX (8 bytes) +WARNING: untranslated string: cake profile pppoa-llc 14 = PPPoA LLC (14 bytes) +WARNING: untranslated string: cake profile pppoa-vcmux 10 = PPPoA VC-MUX (10 bytes) +WARNING: untranslated string: cake profile pppoe-llcsnap 40 = PPPoE LLC SNAP (40 bytes) +WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes) +WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes) +WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation) WARNING: untranslated string: capabilities = Capabilities WARNING: untranslated string: ccd add = Add network WARNING: untranslated string: ccd choose net = Choose network @@ -1254,6 +1269,7 @@ WARNING: untranslated string: last = Last WARNING: untranslated string: least preferred = least preferred WARNING: untranslated string: legacy architecture warning = You are running IPFire on a legacy architecture and it is recommended to upgrade WARNING: untranslated string: lifetime = Lifetime: +WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation WARNING: untranslated string: local ip address = Local IP Address WARNING: untranslated string: location = Location WARNING: untranslated string: locationblock = Location Block diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 2e889e41e..14fcf87b4 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -847,6 +847,21 @@ WARNING: untranslated string: bit = bit WARNING: untranslated string: block = Block WARNING: untranslated string: broken = Broken WARNING: untranslated string: bytes = unknown string +WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes) +WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes) +WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes) +WARNING: untranslated string: cake profile conservative 48 = Conservative (should work on all connections, 48 bytes) +WARNING: untranslated string: cake profile docsis 18 = DOCSIS (18 bytes) +WARNING: untranslated string: cake profile ethernet 38 = Ethernet (38 bytes) +WARNING: untranslated string: cake profile ethernet vlan 42 = Ethernet with VLAN (42 bytes) +WARNING: untranslated string: cake profile ipoa-llcsnap 16 = IP over ATM LLC SNAP (16 bytes) +WARNING: untranslated string: cake profile ipoa-vcmux 8 = IP over ATM VC-MUX (8 bytes) +WARNING: untranslated string: cake profile pppoa-llc 14 = PPPoA LLC (14 bytes) +WARNING: untranslated string: cake profile pppoa-vcmux 10 = PPPoA VC-MUX (10 bytes) +WARNING: untranslated string: cake profile pppoe-llcsnap 40 = PPPoE LLC SNAP (40 bytes) +WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes) +WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes) +WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation) WARNING: untranslated string: capabilities = Capabilities WARNING: untranslated string: ccd add = Add network WARNING: untranslated string: ccd choose net = Choose network @@ -1252,6 +1267,7 @@ WARNING: untranslated string: last = Last WARNING: untranslated string: least preferred = least preferred WARNING: untranslated string: legacy architecture warning = You are running IPFire on a legacy architecture and it is recommended to upgrade WARNING: untranslated string: lifetime = Lifetime: +WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation WARNING: untranslated string: local ip address = Local IP Address WARNING: untranslated string: location = Location WARNING: untranslated string: locationblock = Location Block diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 5e216f765..d158c2c7a 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -908,6 +908,21 @@ WARNING: untranslated string: autonomous system = Autonomous System WARNING: untranslated string: available = available WARNING: untranslated string: broken = Broken WARNING: untranslated string: bytes = unknown string +WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes) +WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes) +WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes) +WARNING: untranslated string: cake profile conservative 48 = Conservative (should work on all connections, 48 bytes) +WARNING: untranslated string: cake profile docsis 18 = DOCSIS (18 bytes) +WARNING: untranslated string: cake profile ethernet 38 = Ethernet (38 bytes) +WARNING: untranslated string: cake profile ethernet vlan 42 = Ethernet with VLAN (42 bytes) +WARNING: untranslated string: cake profile ipoa-llcsnap 16 = IP over ATM LLC SNAP (16 bytes) +WARNING: untranslated string: cake profile ipoa-vcmux 8 = IP over ATM VC-MUX (8 bytes) +WARNING: untranslated string: cake profile pppoa-llc 14 = PPPoA LLC (14 bytes) +WARNING: untranslated string: cake profile pppoa-vcmux 10 = PPPoA VC-MUX (10 bytes) +WARNING: untranslated string: cake profile pppoe-llcsnap 40 = PPPoE LLC SNAP (40 bytes) +WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes) +WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes) +WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation) WARNING: untranslated string: cpu frequency = CPU frequency WARNING: untranslated string: crypto error = Cryptographic error WARNING: untranslated string: crypto warning = Cryptographic warning @@ -1021,6 +1036,7 @@ WARNING: untranslated string: ipsec routing table entries = IPsec Routing Table WARNING: untranslated string: ipsec settings = IPsec Settings WARNING: untranslated string: itlb multihit = iTLB MultiHit WARNING: untranslated string: legacy architecture warning = You are running IPFire on a legacy architecture and it is recommended to upgrade +WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation WARNING: untranslated string: local ip address = Local IP Address WARNING: untranslated string: meltdown = Meltdown WARNING: untranslated string: mitigated = Mitigated diff --git a/doc/language_missings b/doc/language_missings index e0755b024..2d2dacd37 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -20,6 +20,21 @@ < backup protect key password < bewan adsl pci st < bewan adsl usb +< cake profile bridged-llcsnap 32 +< cake profile bridged-ptm 19 +< cake profile bridged-vcmux 24 +< cake profile conservative 48 +< cake profile docsis 18 +< cake profile ethernet 38 +< cake profile ethernet vlan 42 +< cake profile ipoa-llcsnap 16 +< cake profile ipoa-vcmux 8 +< cake profile pppoa-llc 14 +< cake profile pppoa-vcmux 10 +< cake profile pppoe-llcsnap 40 +< cake profile pppoe-ptm 27 +< cake profile pppoe-vcmux 32 +< cake profile raw 0 < Captive heading terms < Captive heading voucher < Captive invalid coupon @@ -43,6 +58,7 @@ < ipsec dns server address is invalid < ipsec invalid ip address or fqdn for rw endpoint < ipsec roadwarrior endpoint +< link-layer encapsulation < netbios nameserver daemon < no entries < notes @@ -118,6 +134,21 @@ < bit < block < broken +< cake profile bridged-llcsnap 32 +< cake profile bridged-ptm 19 +< cake profile bridged-vcmux 24 +< cake profile conservative 48 +< cake profile docsis 18 +< cake profile ethernet 38 +< cake profile ethernet vlan 42 +< cake profile ipoa-llcsnap 16 +< cake profile ipoa-vcmux 8 +< cake profile pppoa-llc 14 +< cake profile pppoa-vcmux 10 +< cake profile pppoe-llcsnap 40 +< cake profile pppoe-ptm 27 +< cake profile pppoe-vcmux 32 +< cake profile raw 0 < capabilities < ccd add < ccd choose net @@ -565,6 +596,7 @@ < least preferred < legacy architecture warning < lifetime +< link-layer encapsulation < local ip address < log server protocol < mac filter @@ -937,11 +969,27 @@ < ansi t1.483 < bewan adsl pci st < bewan adsl usb +< cake profile bridged-llcsnap 32 +< cake profile bridged-ptm 19 +< cake profile bridged-vcmux 24 +< cake profile conservative 48 +< cake profile docsis 18 +< cake profile ethernet 38 +< cake profile ethernet vlan 42 +< cake profile ipoa-llcsnap 16 +< cake profile ipoa-vcmux 8 +< cake profile pppoa-llc 14 +< cake profile pppoa-vcmux 10 +< cake profile pppoe-llcsnap 40 +< cake profile pppoe-ptm 27 +< cake profile pppoe-vcmux 32 +< cake profile raw 0 < false max bandwidth < false min bandwidth < g.dtm < g.lite < guaranteed bandwidth +< link-layer encapsulation < max bandwidth < upload fcdsl.o ############################################################################ @@ -976,6 +1024,21 @@ < available < block < broken +< cake profile bridged-llcsnap 32 +< cake profile bridged-ptm 19 +< cake profile bridged-vcmux 24 +< cake profile conservative 48 +< cake profile docsis 18 +< cake profile ethernet 38 +< cake profile ethernet vlan 42 +< cake profile ipoa-llcsnap 16 +< cake profile ipoa-vcmux 8 +< cake profile pppoa-llc 14 +< cake profile pppoa-vcmux 10 +< cake profile pppoe-llcsnap 40 +< cake profile pppoe-ptm 27 +< cake profile pppoe-vcmux 32 +< cake profile raw 0 < Captive < Captive 1day < Captive 1month @@ -1172,6 +1235,7 @@ < ipsec settings < itlb multihit < legacy architecture warning +< link-layer encapsulation < local ip address < location < locationblock @@ -1382,6 +1446,21 @@ < available < block < broken +< cake profile bridged-llcsnap 32 +< cake profile bridged-ptm 19 +< cake profile bridged-vcmux 24 +< cake profile conservative 48 +< cake profile docsis 18 +< cake profile ethernet 38 +< cake profile ethernet vlan 42 +< cake profile ipoa-llcsnap 16 +< cake profile ipoa-vcmux 8 +< cake profile pppoa-llc 14 +< cake profile pppoa-vcmux 10 +< cake profile pppoe-llcsnap 40 +< cake profile pppoe-ptm 27 +< cake profile pppoe-vcmux 32 +< cake profile raw 0 < capabilities < Captive < Captive 1day @@ -1596,6 +1675,7 @@ < ipsec settings < itlb multihit < legacy architecture warning +< link-layer encapsulation < local ip address < location < locationblock @@ -1854,6 +1934,21 @@ < bit < block < broken +< cake profile bridged-llcsnap 32 +< cake profile bridged-ptm 19 +< cake profile bridged-vcmux 24 +< cake profile conservative 48 +< cake profile docsis 18 +< cake profile ethernet 38 +< cake profile ethernet vlan 42 +< cake profile ipoa-llcsnap 16 +< cake profile ipoa-vcmux 8 +< cake profile pppoa-llc 14 +< cake profile pppoa-vcmux 10 +< cake profile pppoe-llcsnap 40 +< cake profile pppoe-ptm 27 +< cake profile pppoe-vcmux 32 +< cake profile raw 0 < capabilities < Captive < Captive 1day @@ -2347,6 +2442,7 @@ < least preferred < legacy architecture warning < lifetime +< link-layer encapsulation < local ip address < location < locationblock @@ -2755,6 +2851,21 @@ < bit < block < broken +< cake profile bridged-llcsnap 32 +< cake profile bridged-ptm 19 +< cake profile bridged-vcmux 24 +< cake profile conservative 48 +< cake profile docsis 18 +< cake profile ethernet 38 +< cake profile ethernet vlan 42 +< cake profile ipoa-llcsnap 16 +< cake profile ipoa-vcmux 8 +< cake profile pppoa-llc 14 +< cake profile pppoa-vcmux 10 +< cake profile pppoe-llcsnap 40 +< cake profile pppoe-ptm 27 +< cake profile pppoe-vcmux 32 +< cake profile raw 0 < capabilities < Captive < Captive 1day @@ -3254,6 +3365,7 @@ < least preferred < legacy architecture warning < lifetime +< link-layer encapsulation < local ip address < location < locationblock @@ -3637,6 +3749,21 @@ < autonomous system < available < broken +< cake profile bridged-llcsnap 32 +< cake profile bridged-ptm 19 +< cake profile bridged-vcmux 24 +< cake profile conservative 48 +< cake profile docsis 18 +< cake profile ethernet 38 +< cake profile ethernet vlan 42 +< cake profile ipoa-llcsnap 16 +< cake profile ipoa-vcmux 8 +< cake profile pppoa-llc 14 +< cake profile pppoa-vcmux 10 +< cake profile pppoe-llcsnap 40 +< cake profile pppoe-ptm 27 +< cake profile pppoe-vcmux 32 +< cake profile raw 0 < Captive delete logo < cpu frequency < crypto error @@ -3724,6 +3851,7 @@ < ipsec settings < itlb multihit < legacy architecture warning +< link-layer encapsulation < local ip address < meltdown < mitigated diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index a26617edd..020d3d872 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -98,7 +98,25 @@ $qossettings{'CLASS'} = ''; $qossettings{'CLASSPRFX'} = ''; $qossettings{'DEV'} = ''; $qossettings{'TOS'} = ''; +$qossettings{'CAKE_PROFILE'} = 'conservative'; +my %CAKE_PROFILES = ( + "ethernet" => $Lang::tr{'cake profile ethernet 38'}, + "ethernet ether-vlan" => $Lang::tr{'cake profile ethernet vlan 42'}, + "raw" => $Lang::tr{'cake profile raw 0'}, + "conservative" => $Lang::tr{'cake profile conservative 48'}, + "docsis" => $Lang::tr{'cake profile docsis 18'}, + "bridged-ptm" => $Lang::tr{'cake profile bridged-ptm 19'}, + "pppoe-ptm" => $Lang::tr{'cake profile pppoe-ptm 27'}, + "pppoe-llcsnap" => $Lang::tr{'cake profile pppoe-llcsnap 40'}, + "pppoe-vcmux" => $Lang::tr{'cake profile pppoe-vcmux 32'}, + "pppoa-llc" => $Lang::tr{'cake profile pppoa-llc 14'}, + "pppoa-vcmux" => $Lang::tr{'cake profile pppoa-vcmux 10'}, + "bridged-llcsnap" => $Lang::tr{'cake profile bridged-llcsnap 32'}, + "bridged-vcmux" => $Lang::tr{'cake profile bridged-vcmux 24'}, + "ipoa-llcsnap" => $Lang::tr{'cake profile ipoa-llcsnap 16'}, + "ipoa-vcmux" => $Lang::tr{'cake profile ipoa-vcmux 8'}, +); &General::readhash("${General::swroot}/qos/settings", \%qossettings); &Header::getcgihash(\%qossettings); @@ -110,6 +128,12 @@ my %mainsettings = (); &General::readhash("${General::swroot}/main/settings", \%mainsettings); &General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color); +$selected{'CAKE_PROFILE'} = (); +foreach my $key (keys %CAKE_PROFILES) { + $selected{'CAKE_PROFILE'}{$key} = ''; +} +$selected{'CAKE_PROFILE'}{$qossettings{'CAKE_PROFILE'}} = 'selected'; + &Header::showhttpheaders(); &Header::openpage('QoS', 1, ''); @@ -759,27 +783,53 @@ sub changebandwidth { - + - - - + + + + + + + + + + + + + + + + +
$Lang::tr{'down and up speed'}$Lang::tr{'down and up speed'}
$Lang::tr{'downlink speed'}: + - -
- -
- -
$Lang::tr{'uplink speed'}: +
 
$Lang::tr{'link-layer encapsulation'}: +
 
+ + + +
$Lang::tr{'template warning'} diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index a92bb07f8..48bf00a1a 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -529,6 +529,21 @@ 'cached' => 'cached', 'cached memory' => 'Cached Memory ', 'cached swap' => 'Cached Swap', +'cake profile bridged-llcsnap 32' => 'Bridged LLC SNAP (32 bytes)', +'cake profile bridged-ptm 19' => 'Bridged PTM (19 bytes)', +'cake profile bridged-vcmux 24' => 'Bridged VC-MUX (24 bytes)', +'cake profile conservative 48' => 'Conservative (should work on all connections, 48 bytes)', +'cake profile docsis 18' => 'DOCSIS (18 bytes)', +'cake profile ethernet 38' => 'Ethernet (38 bytes)', +'cake profile ethernet vlan 42' => 'Ethernet with VLAN (42 bytes)', +'cake profile ipoa-llcsnap 16' => 'IP over ATM LLC SNAP (16 bytes)', +'cake profile ipoa-vcmux 8' => 'IP over ATM VC-MUX (8 bytes)', +'cake profile pppoa-llc 14' => 'PPPoA LLC (14 bytes)', +'cake profile pppoa-vcmux 10' => 'PPPoA VC-MUX (10 bytes)', +'cake profile pppoe-llcsnap 40' => 'PPPoE LLC SNAP (40 bytes)', +'cake profile pppoe-ptm 27' => 'PPPoE PTM (27 bytes)', +'cake profile pppoe-vcmux 32' => 'PPPoE VC-MUX (32 bytes)', +'cake profile raw 0' => 'Raw (no overhead compensation)', 'calamaris available reports' => 'Available reports', 'calamaris byte unit' => 'Byte unit', 'calamaris create report' => 'Create report', @@ -1596,6 +1611,7 @@ 'length' => 'Length', 'lifetime' => 'Lifetime:', 'line' => 'Line', +'link-layer encapsulation' => 'Link-Layer Encapsulation', 'linkq' => 'Link Quality', 'load printer' => 'Load Printer', 'loaded modules' => 'Loaded modules:', From patchwork Thu Dec 2 12:37:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 4885 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4J4b8T4Tchz3wtV for ; Thu, 2 Dec 2021 12:38:01 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4J4b8Q69T3z3vg; Thu, 2 Dec 2021 12:37:58 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4J4b8P4V9Tz30HY; Thu, 2 Dec 2021 12:37:57 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4J4b8N0k2zz2xSB for ; Thu, 2 Dec 2021 12:37:56 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4J4b8M6YVjz1sh; Thu, 2 Dec 2021 12:37:55 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1638448675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gpUF5xBMLtLYC+CYKKiLaifQZWBKCxqDbtYr6Q/aNoM=; b=IoKY7M8ST81WYcJvGsI6AqJyoqw8k0R3epijz6wjXlbZ8culZwZt+fV/hrJpTUCeCl5J92 iJp9+HVzb7lJTUAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1638448675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gpUF5xBMLtLYC+CYKKiLaifQZWBKCxqDbtYr6Q/aNoM=; b=OPOTr3pDWFGpeWSVyXDkGg47HIkd7wPuo3pXOZCXv3GnmcPJQZhgRy0DO6ZDVcP8weM0ho tvQCsLi2Ux6qdPU2jd1cb6bkpWCy4zC8Rpu8e6f1zExQb29wkBPylVchNdtg9dggkkgoeF kQSeVFM7uojpyidqZ8zG0QYWUuhpejMUtBrYTOy2GHrXa6xX36x++DdecAkblt5g2QYglT 2eytghQ5svCAOD48URzLZHp+Jdl7ER/reOyogUVKNf54CVeGXXKhJyivtLG0BdkQT01Lmw q2sHmI9tvaxVzeYPtx7kpIYUdrWaWsS5UVk51YTBuaohHm0E+7v+7LJXcJcT1A== From: Michael Tremer To: development@lists.ipfire.org Subject: [RFC PATCH 7/8] network-aqm: Use "conservative" setting for all PPP connections Date: Thu, 2 Dec 2021 12:37:47 +0000 Message-Id: <20211202123748.2525617-7-michael.tremer@ipfire.org> In-Reply-To: <20211202123748.2525617-1-michael.tremer@ipfire.org> References: <20211202123748.2525617-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This should be a better default than using VDSL2 since "conservative" should work on all connections. Signed-off-by: Michael Tremer --- config/udev/network-aqm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/udev/network-aqm b/config/udev/network-aqm index 3ef9b0f59..d51c6fbde 100644 --- a/config/udev/network-aqm +++ b/config/udev/network-aqm @@ -65,9 +65,9 @@ case "${ACTION}" in exit 0 ;; - # Handle RED PPPoE (default to VDSL2) + # Handle dial-up connections on RED ppp*,512) - args+=( "cake" "internet" "pppoe-ptm" "ack-filter" ) + args+=( "cake" "internet" "conservative" "ack-filter" ) ;; # Treat any other interfaces as "Ethernet" From patchwork Thu Dec 2 12:37:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 4886 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4J4b8W2jM1z3wtT for ; Thu, 2 Dec 2021 12:38:03 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4J4b8Q6KqKz3vj; Thu, 2 Dec 2021 12:37:58 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4J4b8P58gPz30HZ; Thu, 2 Dec 2021 12:37:57 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4J4b8N1WWVz2yfp for ; Thu, 2 Dec 2021 12:37:56 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4J4b8N0JYxzjr; Thu, 2 Dec 2021 12:37:56 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1638448676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uyXkrpAjBbhCjzQNpVIwEXbXMg/IdhO9uFEpsrHq1ZY=; b=EhpgKNlRYGFNnIR76YdyVG4kLzBw/hYJjHOKApX/srBzJcJgsgTOyfo2i7+cmsVXLeQWTt /xC3g3rJSyVvb3AA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1638448676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uyXkrpAjBbhCjzQNpVIwEXbXMg/IdhO9uFEpsrHq1ZY=; b=mGBYW/BSFtG7h9/UI9IqMjfRWei/O+bvl/l9zI3+jDzPBj1F1d94R86rHlJ7spd30kdA4P 9DOEgeJ9fymN8CKtB5+3Nz6yuPTOQv6UvFamdleogb9yfmjimNKZMUfKOmBltooPGVRWp2 9WO3bCP37Ic8bcYrcHH4uAIgnKLlsrgRezr/PZMH98P2IBTNsy5Zx7YRyf+Q4Lhput2sZk JLSlVdbNu0ijIm/pWo1ncO/Eps8F5xYSTS92F4lzTsNL7xXlMiXBE6pz2wz3kya9FO7Eys YvdQ4I8tEWnK7rXApPOnZxjjopjea1GdjG4TSL062mTzA6rPJAlepozDJexMsw== From: Michael Tremer To: development@lists.ipfire.org Subject: [RFC PATCH 8/8] QoS: Add CAKE profile to commmand line Date: Thu, 2 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> References: <20211202123748.2525617-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 = "/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";