From patchwork Mon Oct 21 18:45:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2549 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 "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 46xlw90pljz43Sq for ; Mon, 21 Oct 2019 18:46:17 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 46xlvx6dJ1z4LY; Mon, 21 Oct 2019 18:46:05 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 46xlvx5VM9z2ycw; Mon, 21 Oct 2019 18:46:05 +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 "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 46xlvv4zgpz2ycd for ; Mon, 21 Oct 2019 18:46:03 +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) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 46xlvv0Y2lz4G9; Mon, 21 Oct 2019 18:46:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1571683563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=raDOhnFHENob1X2tuTxCPjeBYOO3jMyTXs0WKVLVPrM=; b=D4a0CLC7dGAv9OCyx4oA39b+guvqHqFC2rrbggFqMcLJksvuB1lPRf7RklleUgkkmB19lz WocYwMktZlDwrf2xKFWf9auQOto55sBVM2W/aOS/EgSp9mO2/CPmgwDNeHKSTJEZ0bMfV5 bgSjo9QP9B58EAxn9UkHkqUGKXN4mYBmPY5Xlk0TryxzV7Jh+Qwlmw3+Y/KLaCmP8RmH6Y WxFqq05PSXJWp/7hz1HXSG3Ysg6QF8s2aVAT4LW5OfKQSYSe/bfdbdZfIaIO+MvE8IXJje 3c/ml3WxrAFvREvcobUyx4P+pshACYRhdDqxIn+PoUZ7aY9IhJ+esBH0VihdHg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1571683563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=raDOhnFHENob1X2tuTxCPjeBYOO3jMyTXs0WKVLVPrM=; b=ReeiIyCNZJl6vxDC8oZvX/R1IkmYyS4nJP55l6tSBummaPJTR12ZR8ET7cNlp9WfySEGvu p6Ri/ijY7vTIWkDg== From: Michael Tremer 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> References: <20191021184539.12758-1-michael.tremer@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=ms smtp.mailfrom=michael.tremer@ipfire.org 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: Arne Fitzenreiter , Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 Signed-off-by: Michael Tremer --- 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 </dev/null 2>&1 /usr/local/bin/qosd $qossettings{'IMQ_DEV'} >/dev/null 2>&1 @@ -568,15 +548,11 @@ print </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-OUT >/dev/null 2>&1 - iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-TOS >/dev/null 2>&1 + iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j QOS-INC >/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 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 Ceilburst:   -END -; - $selected{'TOS'}{$qossettings{'TOS'}} = "selected='selected'"; -print <TOS-Bit: - -   $Lang::tr{'remark'}: * $Lang::tr{'required field'}