From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH] Revert "parse-func.pl: Adjust regular expression to changed 'tc' output" Date: Thu, 22 Jun 2023 15:51:15 +0000 Message-ID: <20230622155115.1741-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4633966866977205601==" List-Id: --===============4633966866977205601== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This reverts commit ca06e817b84b8bb737b2811bdc5ad43d034e2c48. The incorrect output has been fixed in tc. Fixes: #13150 Signed-off-by: Michael Tremer --- config/qos/parse-func.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/qos/parse-func.pl b/config/qos/parse-func.pl index 04ca85b7f..991757f92 100644 --- a/config/qos/parse-func.pl +++ b/config/qos/parse-func.pl @@ -46,24 +46,24 @@ class htb 1:10 parent 1:1 prio 0 rate 80Kbit ceil 320Kbit= burst 1701b cburst 200 lended: 230876 borrowed: 17112 giants: 0 tokens: 127200 ctokens: 37940 =20 -class htb 1:20 parent 1:1 leaf 4220prio 1 rate 100Kbit ceil 200Kbit burst 17= 27b cburst 1855b=20 +class htb 1:20 parent 1:1 leaf 4220: prio 1 rate 100Kbit ceil 200Kbit burst = 1727b cburst 1855b=20 Sent 2495181573 bytes 44034303 pkts (dropped 5837, overlimits 0)=20 lended: 43825585 borrowed: 208718 giants: 0 tokens: 103424 ctokens: 55808 =20 -class htb 1:30 parent 1:1 leaf 4230prio 3 rate 80Kbit ceil 400Kbit burst 170= 1b cburst 2111b=20 +class htb 1:30 parent 1:1 leaf 4230: prio 3 rate 80Kbit ceil 400Kbit burst 1= 701b cburst 2111b=20 Sent 2060213567 bytes 5465574 pkts (dropped 121, overlimits 0)=20 rate 16851bps 35pps=20 lended: 4556992 borrowed: 908582 giants: 0 tokens: -25364 ctokens: 32897 =20 -class htb 1:50 parent 1:1 leaf 4250prio 5 rate 40Kbit ceil 120Kbit burst 165= 0b cburst 1752b=20 +class htb 1:50 parent 1:1 leaf 4250: prio 5 rate 40Kbit ceil 120Kbit burst 1= 650b cburst 1752b=20 Sent 6071486687 bytes 24448436 pkts (dropped 8086739, overlimits 0)=20 rate 15801bps 85pps backlog 126p=20 lended: 8324530 borrowed: 16123780 giants: 0 tokens: -202717 ctokens: -172499 =20 -class htb 1:666 parent 1:1 leaf 666prio 7 rate 4Kbit ceil 40Kbit burst 1604b= cburst 1650b=20 +class htb 1:666 parent 1:1 leaf 666: prio 7 rate 4Kbit ceil 40Kbit burst 160= 4b cburst 1650b=20 Sent 2148626078 bytes 6771069 pkts (dropped 2078536, overlimits 0)=20 rate 5221bps 17pps backlog 125p=20 lended: 675330 borrowed: 6095613 giants: 0 @@ -94,7 +94,7 @@ sub parse_class($) { my $line=3D$tc_output[$i]; # Parsing HTB: # ------------ - if ( $line =3D~ m/class htb (\d+):(\d+)( root| parent )?(\d+:\d+)?( leaf )?= (\d+)?(prio )?(\d+)? rate (.*) ceil (.*) burst (.*) cburst (.*)/ ) { + if ( $line =3D~ m/class htb (\d+):(\d+)( root| parent )?(\d+:\d+)?( leaf )?= (\d+)?:?( prio )?(\d+)? rate (.*) ceil (.*) burst (.*) cburst (.*)/ ) { my $type =3D "htb"; my $major =3D $1; my $minor =3D $2; --=20 2.39.2 --===============4633966866977205601==--