From patchwork Fri Dec 4 13:32:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1411037 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=XiVk36Mm; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=gSHRuiSc; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CnYbF1cDJz9sWK for ; Sat, 5 Dec 2020 00:34:33 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:To:From: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Q1j3Tz9VN5f3mLPC06XstXYXKx6Xo7tpjyvD4QS9w2E=; b=XiVk36MmOAg8Gua5EvOYJJHnz9 rrBPa0seLu+68AXTZ8p1VN/CvvBRe2vmeQSFz/+zpXHlrs0i9/ckeJewvlizM5Hh+mMDLvG7OmIWT fb2aVuT8AYn1ZoEw+5ViPhmzsQ/OvZovQ9AGqDzeKRmHcTmeWhaKLuSHbvsH5myN7m3fH6vTJT5b/ YnBHS1yiU6ZLGGvm8yP6XEKLnA9HKcwfVrztkWwpJB3OVVa0B6oRk+a3n2/W4qYJXlAe/gbdShQ3t AJEy+VC6Orv5AlvTZjWfzVE459EkUJVgtUzr3Uj9q1KHmnALmCsIcumURZVqQun3kR/NPCFJZeW2T 1WnQXMGA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1klBCi-0005Zh-Av; Fri, 04 Dec 2020 13:32:56 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1klBCf-0005YQ-48 for openwrt-devel@lists.openwrt.org; Fri, 04 Dec 2020 13:32:54 +0000 Received: by mail-wr1-x444.google.com with SMTP id p8so5339157wrx.5 for ; Fri, 04 Dec 2020 05:32:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=c6x0Rc07Clq6e1JQ5wCc3Kt/senZ1egghBp3EQ3EYaM=; b=gSHRuiScmv915M2ncypa4IOekVwvwHL6OAi2Fr+qdASacFMKnohFhoSAbYflS/9p16 tU62GJYECbXO5EVY9tkXZ03TYK7IyBOcecgfHLmsFa92Q2+pe1H7J/jmeXZE5+36S1Wa CkRtzfsEIkQr9tAZ0DoHlgKX16rf8+/uASgMxNOodEzdArGQz3nftTv1gPRI208bPjjj 2PNvwbhz51os1SEkeC8/2eMhfg2XiQmUMtHOyry6YmPZEdJyOlxjYbO/L+ZofAs2gA0f iolI3nj82oRqJECKdMhPf9QUhP23wiuAFH8AVTE0Tlse4sU7BKt57vsTAAWFZXx29jRV Ibbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=c6x0Rc07Clq6e1JQ5wCc3Kt/senZ1egghBp3EQ3EYaM=; b=iPoYERoZzBPKjtNojzfB8dNNXhkPT0qUBZRkoOwV+AQ3an1UP1ZNKbl5tLYhS0abJO 9fgZP/l9uVn8KAltfm8yN7gzEZZ3tLaq4Zjbse9DzXw6e2cRPL4/GKCfdGJvbvGgD6Q/ B/Ubisi+3XSShTxL+dkpHwuoAZAU33mNRXh4ZoO9zUSfPsc8BiYkzF1nMDojyNRBkw8i mgFs9fNfE0ux5pHVWZuK3liUV4p87SSTyZqTrpgkYnEBr4gXAYlb8/rRZ1ydhCZN+Yw9 8G+pgihroBkDKHWqv4X8dymCyHcrp1Paw3H9OX2tSnjcJYAzI9K7eONirYD+b07aSpIU z28g== X-Gm-Message-State: AOAM531SmABSVWvnAxJb+6plyBwo9IEqoux/51dwrjzgZ5xXIkUooKcg V/1EmOYZJSP2MTYl3odh2xptSV93Am8= X-Google-Smtp-Source: ABdhPJy7wjkaoDd2bWA3LYU1mqPAzqj9N0DGQFMOwymsHr0pdkDy6ToVrvcGTAk6WYu5KFRpSMg0Tg== X-Received: by 2002:adf:ec4d:: with SMTP id w13mr4911746wrn.427.1607088771569; Fri, 04 Dec 2020 05:32:51 -0800 (PST) Received: from mamamia.internal (a89-183-82-101.net-htp.de. [89.183.82.101]) by smtp.gmail.com with ESMTPSA id x9sm3621288wru.55.2020.12.04.05.32.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Dec 2020 05:32:51 -0800 (PST) From: Andre Heider To: openwrt-devel@lists.openwrt.org Subject: [PATCH v3 2/3] ltq-dsl-base: remove preformatted integer values from lucistat Date: Fri, 4 Dec 2020 14:32:46 +0100 Message-Id: <20201204133247.35877-2-a.heider@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201204133247.35877-1-a.heider@gmail.com> References: <20201204133247.35877-1-a.heider@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201204_083253_182057_0C2FF565 X-CRM114-Status: GOOD ( 10.07 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:444 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [a.heider[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org luci has been converted to use the raw values, see [0]. Remove the now unused values. [0] https://github.com/openwrt/luci/pull/4635 Signed-off-by: Andre Heider --- .../files/lib/functions/lantiq_dsl.sh | 54 ++++++++----------- 1 file changed, 22 insertions(+), 32 deletions(-) diff --git a/package/network/utils/ltq-dsl-base/files/lib/functions/lantiq_dsl.sh b/package/network/utils/ltq-dsl-base/files/lib/functions/lantiq_dsl.sh index 1a28633c79..169e602d4a 100755 --- a/package/network/utils/ltq-dsl-base/files/lib/functions/lantiq_dsl.sh +++ b/package/network/utils/ltq-dsl-base/files/lib/functions/lantiq_dsl.sh @@ -149,15 +149,13 @@ data_rates() { [ -z "$drd" ] && drd=0 [ -z "$dru" ] && dru=0 - sdrd=$(scale $drd) - sdru=$(scale $dru) - if [ "$action" = "lucistat" ]; then echo "dsl.data_rate_down=$drd" echo "dsl.data_rate_up=$dru" - echo "dsl.data_rate_down_s=\"$sdrd\"" - echo "dsl.data_rate_up_s=\"$sdru\"" else + sdrd=$(scale $drd) + sdru=$(scale $dru) + echo "Data Rate: Down: ${sdrd}/s / Up: ${sdru}/s" fi } @@ -426,17 +424,15 @@ latency_delay() { idu_s="Fast" fi - sidu=$(scale_latency $idu) - sidd=$(scale_latency $idd) - if [ "$action" = "lucistat" ]; then echo "dsl.latency_down=\"$(scale_latency_us $idd)\"" echo "dsl.latency_up=\"$(scale_latency_us $idu)\"" - echo "dsl.latency_num_down=\"$sidd\"" - echo "dsl.latency_num_up=\"$sidu\"" echo "dsl.latency_s_down=\"$idd_s\"" echo "dsl.latency_s_up=\"$idu_s\"" else + sidu=$(scale_latency $idu) + sidd=$(scale_latency $idd) + echo "Latency [Interleave Delay]: ${sidd} [${idd_s}] ${sidu} [${idu_s}]" fi } @@ -536,26 +532,22 @@ line_uptime() { [ -z "$et" ] && et=0 - d=$(expr $et / 86400) - etr=$(expr $et % 86400) - h=$(expr $etr / 3600) - etr=$(expr $etr % 3600) - m=$(expr $etr / 60) - s=$(expr $etr % 60) - - - [ "${d}${h}${m}${s}" -ne 0 ] && rc="${s}s" - [ "${d}${h}${m}" -ne 0 ] && rc="${m}m ${rc}" - [ "${d}${h}" -ne 0 ] && rc="${h}h ${rc}" - [ "${d}" -ne 0 ] && rc="${d}d ${rc}" - - [ -z "$rc" ] && rc="down" - - if [ "$action" = "lucistat" ]; then echo "dsl.line_uptime=${et}" - echo "dsl.line_uptime_s=\"${rc}\"" else + d=$(expr $et / 86400) + etr=$(expr $et % 86400) + h=$(expr $etr / 3600) + etr=$(expr $etr % 3600) + m=$(expr $etr / 60) + s=$(expr $etr % 60) + + [ "${d}${h}${m}${s}" -ne 0 ] && rc="${s}s" + [ "${d}${h}${m}" -ne 0 ] && rc="${m}m ${rc}" + [ "${d}${h}" -ne 0 ] && rc="${h}h ${rc}" + [ "${d}" -ne 0 ] && rc="${d}d ${rc}" + + [ -z "$rc" ] && rc="down" echo "Line Uptime Seconds: ${et}" echo "Line Uptime: ${rc}" @@ -615,9 +607,6 @@ line_data() { [ -z "$attndrd" ] && attndrd=0 [ -z "$attndru" ] && attndru=0 - sattndrd=$(scale $attndrd) - sattndru=$(scale $attndru) - if [ "$action" = "lucistat" ]; then echo "dsl.line_attenuation_down=\"$latnd\"" echo "dsl.line_attenuation_up=\"$latnu\"" @@ -629,9 +618,10 @@ line_data() { echo "dsl.actatp_up=\"$actatpu\"" echo "dsl.max_data_rate_down=$attndrd" echo "dsl.max_data_rate_up=$attndru" - echo "dsl.max_data_rate_down_s=\"$sattndrd\"" - echo "dsl.max_data_rate_up_s=\"$sattndru\"" else + sattndrd=$(scale $attndrd) + sattndru=$(scale $attndru) + echo "Line Attenuation (LATN): Down: ${latnd} dB / Up: ${latnu} dB" echo "Signal Attenuation (SATN): Down: ${satnd} dB / Up: ${satnu} dB" echo "Noise Margin (SNR): Down: ${snrd} dB / Up: ${snru} dB"