From patchwork Fri Dec 11 12:05:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1414873 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=F2gAbUup; 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=MYHLgu2i; 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 4CsqKG4KZgz9sTX for ; Fri, 11 Dec 2020 23:07:14 +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=4X/nHUHrbRNYNwp5oWcj6HszXX0f1sguOwqYlwEwcWg=; b=F2gAbUup275oHQu2z3jcKJ1v0Y 3KrekAEQiUl5nybCckzYfER16VqQGLbS3d1AeGiRGqNK/NZ0UNm8QQyDKmu4pC1hb2QmZyXuO1J04 pPZ12PtqxOfeii8shjjdUCU/ul2kROqbmWAcgJ4mqTeWc0rzRSDo8YpNyEnzbEGGmRHIFsX6j3339 9jb6A2VkTsNpg8aUY0zeZeTcisFO0TMZL+dbdt6s7m1fglZ1izZqJhNbNsIHXkuxc7XMJY6vtvf7l +OWqzQ8if7pkuZvkzJjkjt6y4OFYhRpWK4udlemSIrnGMxYZG3Zc5FT+9qzBmnccFUqj4ln4y+2r3 ovRebEYg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhAo-0005I2-N1; Fri, 11 Dec 2020 12:05:22 +0000 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhAk-0005Ft-Tn for openwrt-devel@lists.openwrt.org; Fri, 11 Dec 2020 12:05:19 +0000 Received: by mail-wr1-x436.google.com with SMTP id c5so5147271wrp.6 for ; Fri, 11 Dec 2020 04:05:17 -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=umPsORUT+rT1Di2E1KLq1ykzz7sN93djxRttVSBOsHc=; b=MYHLgu2iSRr5NM6FFQmoTdIEdhTa0tYcUMD61aPCleD2VHZbzq1bFCglm7FdV/HJwl 4gKK/yDjOAeJmQzwLxw4OXM7v2kdkR1WJgsxtNMkcsr4MH2QvyIf3utDgWxYZRabBP+5 A4fmH12vGCBEOZDHMyFVr8Q2wPwdT9abYQo9qgK6weCyuUQ7tDblR6y/s5aWroXZ76WH JUQqCiAW6ZwQdEh5zOyakMeIfU4VWawK/bHCcIvH3FwlOEIVy5NaVb6BCwYEWNmnQXUu /vJJ7WUP1KKTeswT2FnBv/0qtTsn2R4Pr5+wywHbp8X4VBeM2cMwDEkncFSB31olgN0/ 2P7w== 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=umPsORUT+rT1Di2E1KLq1ykzz7sN93djxRttVSBOsHc=; b=ZDDa9+pysUtOCOgAhOze1JN6wlp7n8ACiRCXU0zehZIJQXDP2qH1Zt2CMcKIgeVBLi bmc6zSDQR87SCKwWPuf4xnbZx7Bj+d5mV9mz87GLad8CBQzRv7zk4ypYDJQFkYPCbxTe /bClww+OO0LPOJdNKV8b/CVnqX8PoUNij21CMUw9jVasO10eOCnnOS2sYNqSAyYxJQKv HBwnMwtnB5FQUuuM82F+wwGERtn3No6PILq22O+Bcr5Ldukj5Wh3K42DymgbPyERijzr VjVmeQRMA8sBoI6eDMGPInzLdmxs8Hy9u0mYXPhEnu/rcnYfNTPg0pPy7MQ60aJrCFMB u5Kg== X-Gm-Message-State: AOAM532JncES/fcmC4S5QNgsETtXJ4MWN5hVIE3b8gThuPY68v5t0aFq iDTRQ15sM9YIiHyXobxIqoY4Ht5ZF8w= X-Google-Smtp-Source: ABdhPJwiupQ7VUYDMEs3y/7E/fxi/HmbwwVweR30xHahcIQwStiUofzZ9rOxbmZhZlOUtSZXohy/Pg== X-Received: by 2002:adf:fa05:: with SMTP id m5mr13778500wrr.26.1607688316014; Fri, 11 Dec 2020 04:05:16 -0800 (PST) Received: from mamamia.internal (a89-182-180-166.net-htp.de. [89.182.180.166]) by smtp.gmail.com with ESMTPSA id l1sm14552616wmi.15.2020.12.11.04.05.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Dec 2020 04:05:15 -0800 (PST) From: Andre Heider To: openwrt-devel@lists.openwrt.org Subject: [PATCH 01/13] ltq-vdsl-app: shutdown upon sigterm Date: Fri, 11 Dec 2020 13:05:01 +0100 Message-Id: <20201211120513.1130247-2-a.heider@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201211120513.1130247-1-a.heider@gmail.com> References: <20201211120513.1130247-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-20201211_070519_028604_280B420F X-CRM114-Status: GOOD ( 16.53 ) 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:436 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [a.heider[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 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_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 procd sends sigterm to stop daemons, hook it up. This speeds up the shutdown sequence and gets rid of the following message: daemon.info procd: Instance dsl_control::instance1 pid 15408 not stopped on SIGTERM, sending SIGKILL instead Signed-off-by: Andre Heider --- .../config/ltq-vdsl-app/files/dsl_control | 2 -- .../ltq-vdsl-app/patches/201-sigterm.patch | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 package/network/config/ltq-vdsl-app/patches/201-sigterm.patch diff --git a/package/network/config/ltq-vdsl-app/files/dsl_control b/package/network/config/ltq-vdsl-app/files/dsl_control index 3f3cecbca5..5089d7ac31 100644 --- a/package/network/config/ltq-vdsl-app/files/dsl_control +++ b/package/network/config/ltq-vdsl-app/files/dsl_control @@ -307,8 +307,6 @@ start_service() { } stop_service() { - # do not use dsl_cmd to not block when this is locked up by some other proess - echo quit > /tmp/pipe/dsl_cpe0_cmd DSL_NOTIFICATION_TYPE="DSL_INTERFACE_STATUS" \ DSL_INTERFACE_STATUS="DOWN" \ /sbin/dsl_notify.sh diff --git a/package/network/config/ltq-vdsl-app/patches/201-sigterm.patch b/package/network/config/ltq-vdsl-app/patches/201-sigterm.patch new file mode 100644 index 0000000000..68a416ce24 --- /dev/null +++ b/package/network/config/ltq-vdsl-app/patches/201-sigterm.patch @@ -0,0 +1,19 @@ +--- a/src/dsl_cpe_control.c ++++ b/src/dsl_cpe_control.c +@@ -6504,7 +6504,7 @@ DSL_CPE_STATIC void DSL_CPE_Termination + /* ignore the signal, we'll handle by ourself */ + signal (sig, SIG_IGN); + +- if (sig == SIGINT) ++ if (sig == SIGINT || sig == SIGTERM) + { + DSL_CCA_DEBUG(DSL_CCA_DBG_MSG, (DSL_CPE_PREFIX "terminated" DSL_CPE_CRLF)); + DSL_CPE_Termination (); +@@ -6756,6 +6756,7 @@ DSL_int_t dsl_cpe_daemon ( + + #ifndef RTEMS + signal (SIGINT, DSL_CPE_TerminationHandler); ++ signal (SIGTERM, DSL_CPE_TerminationHandler); + #endif /* RTEMS*/ + + /* Open DSL_CPE_MAX_DSL_ENTITIES devices*/ From patchwork Fri Dec 11 12:05:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1414867 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=D+kzKrE8; 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=rfFZBksZ; 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 4CsqK95FHyz9sR4 for ; Fri, 11 Dec 2020 23:07:09 +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=32AxwFJAWgDgkinEd67eyrrZKXHLYka+s+wixQOlJ0k=; b=D+kzKrE8LZJ87igVQ7jJJb2Ngd t3GkqNw320STkAd3RZmgp0GwC/w7aSXRIU//bSGHtx5C/AnQ6FJZRgDKBxakCDkONt02+vZf17KIu uff3O5vJ0ZuCCH+AWmfUWmgH6/bDzglWNaOcN8B08wVgy3S3A8PKcbTJO3lgO7rEJ9VZjAJB7woJW RsnrTUmRrsoAszRokNOf3EMaDdu31MCi58vg++D21qIuiyHC+6amL86NOF/ji8JKc6tVbRH03hNpn WjkxLz7UmW9rSqmuwFfBQShuEmuAt/M2JS2UigKeq24h2wV+PayfGEjeMFLY6H8KXWHYSJEeByz+c dCpkqiNA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhAr-0005J1-Pv; Fri, 11 Dec 2020 12:05:25 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhAl-0005Fu-IZ for openwrt-devel@lists.openwrt.org; Fri, 11 Dec 2020 12:05:20 +0000 Received: by mail-wr1-x442.google.com with SMTP id t4so8747119wrr.12 for ; Fri, 11 Dec 2020 04:05:17 -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=bz3NZ+nrCMOHNb7dJoEl29cNgQPsnRpLznaQ/WtRvwM=; b=rfFZBksZsuOxKDQXzO19PHPnaPGM2luSToXqXN51rbpRjZDk2YY0W4samvaHVgEgEi s7XYCgYlJ4ePjqGoW97rWRvQTBzBupKitJPX8lx/ZzFQ7JwmHYoIoeFv3nv7UMyxvIIJ CabptGOj0M01nAx68ZNz5oN2e/lUSyO/+sRhtvhQKhqoPcbJW/JqMKmTIxK8Xa3HQFYx pNgnp/nbvqeOMsebdwONRZn2WEMNfsOZUfFHJDQMIdroCdBk4IMZxW0SnbSQL5K16oXv nqjlhMKuU8msPTA2K6cBH3rtVr99vNhFlVbHFv/UgjtcUX7UuFRtwTlJuA8hIZuBku+k pFKw== 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=bz3NZ+nrCMOHNb7dJoEl29cNgQPsnRpLznaQ/WtRvwM=; b=sxmcNpGxtbB1iR5BEUGMreIK5Ide6HpSfBjbYguffmgcsT0ixO1bqnfs8F8ickPA8u D4Ha/YOuv/CAmaIe3NAMK2LfVIE/42zfLbLxu7ZNcCpt6Kqz035aphjO/8UtjCqjZWc/ kThlbSXNoAZkdxKTSh6ra/FiG5FM4+IZEzM7lP9nHON7conCgn508QBuhJm0P2eLsJ52 qdGy95raaPgJNKhBFTuALDbTeb7LhVq+HW7V3qtON19ext+VZeGXFWWnH0Vls/gy9zVw BQVWk8/Cf3dEZNtei5N3UQ1upAj854KlRiRI8btlAoRCMQjTYmr87tAujdxBewySJqH8 dt+w== X-Gm-Message-State: AOAM530oI9SAJZelz3tRXzK45PVSYDC8O0/A/IuS/0OrmERxXV4JOEDu RoR04dbtcAJAbqB8R5oQWyDXZrrBia8= X-Google-Smtp-Source: ABdhPJzqJonJmZ8KQ5PY3vJvpa1nE996RReKLNECsX2PD4+z218lpq1jMP86evoLehH+Mk3a2FpdSw== X-Received: by 2002:a5d:40d2:: with SMTP id b18mr4580763wrq.369.1607688316731; Fri, 11 Dec 2020 04:05:16 -0800 (PST) Received: from mamamia.internal (a89-182-180-166.net-htp.de. [89.182.180.166]) by smtp.gmail.com with ESMTPSA id l1sm14552616wmi.15.2020.12.11.04.05.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Dec 2020 04:05:16 -0800 (PST) From: Andre Heider To: openwrt-devel@lists.openwrt.org Subject: [PATCH 02/13] ltq-vdsl-app: fix -Wundef warnings Date: Fri, 11 Dec 2020 13:05:02 +0100 Message-Id: <20201211120513.1130247-3-a.heider@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201211120513.1130247-1-a.heider@gmail.com> References: <20201211120513.1130247-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-20201211_070519_716830_FBB0F045 X-CRM114-Status: GOOD ( 10.78 ) 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:442 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [a.heider[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 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_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 Shut up these warnings: /usr/include/vdsl/cmv_message_format.h:33:6: warning: "MEI_SUPPORT_DEBUG_STREAMS" is not defined, evaluates to 0 [-Wundef] #if (MEI_SUPPORT_DEBUG_STREAMS == 1) ^~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/vdsl/drv_mei_cpe_interface.h:2256:6: warning: "MEI_SUPPORT_OPTIMIZED_FW_DL" is not defined, evaluates to 0 [-Wundef] #if (MEI_SUPPORT_OPTIMIZED_FW_DL == 1) ^~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Andre Heider --- package/network/config/ltq-vdsl-app/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/network/config/ltq-vdsl-app/Makefile b/package/network/config/ltq-vdsl-app/Makefile index 5e2db1d5c6..ef81f7c8d7 100644 --- a/package/network/config/ltq-vdsl-app/Makefile +++ b/package/network/config/ltq-vdsl-app/Makefile @@ -35,6 +35,11 @@ define Package/ltq-vdsl-app/description Userland tool needed to control Lantiq VDSL CPE endef +APPL_CFLAGS= \ + -DMAX_CLI_PIPES=1 \ + -DMEI_SUPPORT_DEBUG_STREAMS=0 \ + -DMEI_SUPPORT_OPTIMIZED_FW_DL=0 + CONFIGURE_ARGS += \ --enable-vrx \ --enable-vrx-device=vr9 \ @@ -43,7 +48,7 @@ CONFIGURE_ARGS += \ --enable-ifxos \ --enable-ifxos-include="-I$(STAGING_DIR)/usr/include/ifxos" \ --enable-ifxos-library="-I$(STAGING_DIR)/usr/lib" \ - --enable-add-appl-cflags="-DMAX_CLI_PIPES=1" \ + --enable-add-appl-cflags="$(APPL_CFLAGS)" \ --enable-debug \ --disable-dti \ --with-channels-per-line="1" \ From patchwork Fri Dec 11 12:05:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1414878 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=e6WkX0pw; 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=OA8Nu6gL; 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 4CsqKS6fdnz9sR4 for ; Fri, 11 Dec 2020 23:07:24 +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=N3k5nfyfJ9tL/It030umAeSe0bifrFvDJCGG/Z01OQc=; b=e6WkX0pwSlInAbnqaYteE9iI1K 19/bVNO/3sBiQXEZdQHqMSE1zB9ycXGLdTx5louTzIUqAQgz3xev2O2E9Cjs4cvsX4/y52FxIuR5o tE9ycPV4pO2+CBWJMWCwIM/JIrVa3u+tlW/2d1sfcNtpGqU06Oiec+2VrYomEDnFnkHRPNKTUMJLX HMdRukfqlKxZ9VyJ5WoPyUh+6jT0FkUKIy6W/Srq5XrJ+q2FZjV0hV9Qd7wlcxlbBR3ON2XzuMo5E x/JkJ7FR4BmCr5EwqDBSmbJyQcW3gpQ5/iFDlWNWj7Y61UkgyB6lPfwspSozzMza1gFvql8A+d3Ss qivb/VzQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhB3-0005MR-QH; Fri, 11 Dec 2020 12:05:37 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhAl-0005GE-MP for openwrt-devel@lists.openwrt.org; Fri, 11 Dec 2020 12:05:25 +0000 Received: by mail-wr1-x443.google.com with SMTP id m5so8768347wrx.9 for ; Fri, 11 Dec 2020 04:05:19 -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=MTmBv8P9r/sETTN4jJEdX4XsDZg2iHbUJZ8u47+13tg=; b=OA8Nu6gLu/9Qqn13xpiKBxTSffa7KeakxGREiEHF9B48F/9+eqmLvZMfRiNq4n77ps Rp1KNB+MiS2QKIVtrDfBOXKHMktZu9UzA1VCSB9e7+3VuY8M6hg5BM415rUYGxgsT1VU WZE2+sQ78tKG2L2DKA51Qnp2L8MO4zzQKvhMLeFc1bY33zgHD3t/S1044/boifqmOu6G CMRSVwK1Olg/doSIEXkd2TfCLKGWKJJ0SS1kJvvAW2IL3pHuHDW2vty3dWVx2/95/I9F Llm/SHOOXONXW3OM8VZ/VW+FeO2T/gsah+GDL57Ud6oa9ISoTDmTHDSnBNVa/LqhZBAA F8ew== 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=MTmBv8P9r/sETTN4jJEdX4XsDZg2iHbUJZ8u47+13tg=; b=st/okLx9pJT4vZYSdUTbaa4ZeDk9CPKpykAbUOxY9hN3O3ygVAE2R2zujWe1TgZ12h om8KH2jNYLD531ZYjoS5cXQ2/12j3QvoCMFCsj0nQCJvstdG+30Pl83wf68ImX6pSlcn M+r6oqLryQPOyXDrI7+za255NLvmMC9uVQMQa9vSCI9L5tYqfdXmXKUnWd+pFp3zHeiu Du3IPjRWXNPgvY29xFT1QcmcD3FkNJ15j5lqHH42rMzkcVGipoj7L1vs2v0CPD+5MfUF YvqLEIWtt5aCsrZQPph+y06ELDKFBkumxZUMfPs8en5HZ/Wry7Vph0jPKrO8YwPPoCa8 Tyjg== X-Gm-Message-State: AOAM531wETH/v++DqLbpkcN3sp9UbU45Xb4iXGoyCeGcL0xduen/og8Z m2picwDGtcTJfqDw8rw4zgdZQtLhLdb7OQ== X-Google-Smtp-Source: ABdhPJyiKbTOpd7vSW9LLVraqlOPNodYh4umfQe0QRvIgnOqQZk/Vt/lMyAtyEdkV6RD0JUPRMJXAw== X-Received: by 2002:adf:a441:: with SMTP id e1mr13419229wra.385.1607688317835; Fri, 11 Dec 2020 04:05:17 -0800 (PST) Received: from mamamia.internal (a89-182-180-166.net-htp.de. [89.182.180.166]) by smtp.gmail.com with ESMTPSA id l1sm14552616wmi.15.2020.12.11.04.05.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Dec 2020 04:05:17 -0800 (PST) From: Andre Heider To: openwrt-devel@lists.openwrt.org Subject: [PATCH 03/13] ltq-vdsl-app: add ubus support to get metrics Date: Fri, 11 Dec 2020 13:05:03 +0100 Message-Id: <20201211120513.1130247-4-a.heider@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201211120513.1130247-1-a.heider@gmail.com> References: <20201211120513.1130247-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-20201211_070519_949585_C01068EA X-CRM114-Status: GOOD ( 19.79 ) 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:443 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [a.heider[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 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_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 Add a 'dsl' ubus object with a 'metrics' function to replace the expensive shell parsing done by /etc/init.d/dsl_control [dsl|luci]stat. All metrics are gathered by using syscalls. An additional thread is started to handle ubus events. $ time /etc/init.d/dsl_control dslstat real 0m 2.66s user 0m 0.90s sys 0m 1.76s $ time ubus call dsl metrics real 0m 0.02s user 0m 0.00s sys 0m 0.01s Example output: { "api_version": "4.17.18.6", "firmware_version": "5.8.1.5.0.7", "chipset": "Lantiq-VRX200", "driver_version": "1.5.17.6", "state": "Showtime with TC-Layer sync", "up": true, "uptime": 3891, "atu_c": { "vendor_id": [ 181, 0, 66, 68, 67, 77, 178, 26 ], "vendor": "Broadcom 178.26", "system_vendor_id": [ 181, 0, 66, 68, 67, 77, 0, 0 ], "system_vendor": "Broadcom", "version": [ 49, 57, 46, 48, 46, 51, 53, 46, 50, 32, 86, 69, 95, 49, 49, 95 ], "serial": [ 65, 65, 49, 52, 52, 54, 70, 69, 48, 90, 87, 45, 48, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] }, "power_state": "L0 - Synchronized", "xtse": [ 0, 0, 0, 0, 0, 0, 0, 2 ], "annex": "B", "standard": "G.993.2", "profile": "17a", "mode": "G.993.2 (VDSL2, Profile 17a, with down- and upstream vectoring)", "upstream": { "vector": true, "trellis": true, "bitswap": true, "retx": true, "virtual_noise": false, "interleave_delay": 0, "data_rate": 31999000, "latn": 8.500000, "satn": 8.400000, "snr": 12.700000, "actps": -90.100000, "actatp": 13.400000, "attndr": 37180000 }, "downstream": { "vector": true, "trellis": true, "bitswap": true, "retx": true, "virtual_noise": false, "interleave_delay": 140, "data_rate": 89998000, "latn": 9.500000, "satn": 9.600000, "snr": 13.300000, "actps": -90.100000, "actatp": -1.600000, "attndr": 116315372 }, "errors": { "near": { "es": 1, "ses": 0, "loss": 3, "uas": 424, "lofs": 0, "fecs": 0, "hec": 0, "ibe": 0, "crc_p": 0, "crcp_p": 0, "cv_p": 0, "cvp_p": 0, "rx_corrupted": 27740, "rx_uncorrected_protected": 27010, "rx_retransmitted": 0, "rx_corrected": 730, "tx_retransmitted": 16222 }, "far": { "es": 242, "ses": 71, "loss": 0, "uas": 424, "lofs": 0, "fecs": 22687, "hec": 0, "ibe": 0, "crc_p": 0, "crcp_p": 0, "cv_p": 0, "cvp_p": 0, "rx_corrupted": 1383552, "rx_uncorrected_protected": 1220215, "rx_retransmitted": 0, "rx_corrected": 163337, "tx_retransmitted": 1574051 } } } Signed-off-by: Andre Heider --- package/network/config/ltq-vdsl-app/Makefile | 3 +- .../ltq-vdsl-app/patches/300-ubus.patch | 50 ++ .../ltq-vdsl-app/src/src/dsl_cpe_ubus.c | 803 ++++++++++++++++++ 3 files changed, 855 insertions(+), 1 deletion(-) create mode 100644 package/network/config/ltq-vdsl-app/patches/300-ubus.patch create mode 100644 package/network/config/ltq-vdsl-app/src/src/dsl_cpe_ubus.c diff --git a/package/network/config/ltq-vdsl-app/Makefile b/package/network/config/ltq-vdsl-app/Makefile index ef81f7c8d7..5a84ea8e7e 100644 --- a/package/network/config/ltq-vdsl-app/Makefile +++ b/package/network/config/ltq-vdsl-app/Makefile @@ -20,6 +20,7 @@ PKG_LICENSE:=BSD-2-Clause PKG_BUILD_DEPENDS:=ltq-vdsl PKG_FLAGS:=nonshared +PKG_FIXUP:=autoreconf include $(INCLUDE_DIR)/package.mk @@ -28,7 +29,7 @@ define Package/ltq-vdsl-app CATEGORY:=Network TITLE:=Lantiq VDSL userland tool URL:=http://www.lantiq.com/ - DEPENDS:=@TARGET_lantiq_xrx200 +libpthread +librt +ltq-dsl-base + DEPENDS:=@TARGET_lantiq_xrx200 +libpthread +librt +ltq-dsl-base +libubox +libubus endef define Package/ltq-vdsl-app/description diff --git a/package/network/config/ltq-vdsl-app/patches/300-ubus.patch b/package/network/config/ltq-vdsl-app/patches/300-ubus.patch new file mode 100644 index 0000000000..f218ea2208 --- /dev/null +++ b/package/network/config/ltq-vdsl-app/patches/300-ubus.patch @@ -0,0 +1,50 @@ +--- a/src/dsl_cpe_control.c ++++ b/src/dsl_cpe_control.c +@@ -177,6 +177,9 @@ extern DSL_Error_t DSL_CPE_Pipe_StaticRe + #endif /* INCLUDE_DSL_RESOURCE_STATISTICS*/ + #endif + ++extern void ubus_init(); ++extern void ubus_deinit(); ++ + DSL_char_t *g_sFirmwareName1 = DSL_NULL; + DSL_FirmwareFeatures_t g_nFwFeatures1 = {DSL_FW_XDSLMODE_CLEANED, DSL_FW_XDSLFEATURE_CLEANED, + DSL_FW_XDSLFEATURE_CLEANED}; +@@ -6759,6 +6762,8 @@ DSL_int_t dsl_cpe_daemon ( + signal (SIGTERM, DSL_CPE_TerminationHandler); + #endif /* RTEMS*/ + ++ ubus_init(); ++ + /* Open DSL_CPE_MAX_DSL_ENTITIES devices*/ + for (nDevice = 0; nDevice < DSL_CPE_MAX_DSL_ENTITIES; nDevice++) + { +@@ -7213,6 +7218,7 @@ DSL_int_t dsl_cpe_daemon ( + #endif /* INCLUDE_DSL_CPE_CLI_SUPPORT */ + + DSL_CPE_CONTROL_EXIT: ++ ubus_deinit(); + + #ifdef INCLUDE_DSL_BONDING + DSL_CPE_BND_Stop((DSL_CPE_BND_Context_t*)pCtrlCtx->pBnd); +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -11,7 +11,7 @@ else + dsl_cpe_control_common_ldflags = + endif + +-dsl_cpe_control_LDADD = -lpthread -lrt ++dsl_cpe_control_LDADD = -lpthread -lrt -lubox -lubus + + if INCLUDE_DSL_CPE_DTI_SUPPORT + dsl_cpe_control_LDADD += -ldti_agent +@@ -66,7 +66,8 @@ dsl_cpe_control_SOURCES = \ + dsl_cpe_control.c \ + dsl_cpe_init_cfg.c \ + dsl_cpe_linux.c \ +- dsl_cpe_debug.c ++ dsl_cpe_debug.c \ ++ dsl_cpe_ubus.c + + dsl_cpe_control_SOURCES += \ + $(dsl_cpe_control_dti_sources) diff --git a/package/network/config/ltq-vdsl-app/src/src/dsl_cpe_ubus.c b/package/network/config/ltq-vdsl-app/src/src/dsl_cpe_ubus.c new file mode 100644 index 0000000000..5be67dc3f0 --- /dev/null +++ b/package/network/config/ltq-vdsl-app/src/src/dsl_cpe_ubus.c @@ -0,0 +1,803 @@ +// SPDX-License-Identifier: BSD-2-Clause +/* + * Copyright (C) 2020 Andre Heider + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "dsl_cpe_control.h" +#include +#ifdef INCLUDE_DSL_CPE_API_VRX +#include +#endif + +#define U16(v1, v2) ( \ + ((uint16_t)(v1) << 8) | \ + ((uint16_t)(v2))) + +#define U32(v1, v2, v3, v4) ( \ + ((uint32_t)(v1) << 24) | \ + ((uint32_t)(v2) << 16) | \ + ((uint32_t)(v3) << 8) | \ + ((uint32_t)(v4))) + +#define STR_CASE(id, text) \ + case id: \ + str = text; \ + break; + +#define IOCTL(type, request) \ + type out; \ + memset(&out, 0, sizeof(type)); \ + if (ioctl(fd, request, &out)) \ + return; + +#define IOCTL_DIR(type, request, dir) \ + type out; \ + memset(&out, 0, sizeof(type)); \ + out.nDirection = dir; \ + if (ioctl(fd, request, &out)) \ + return; + +#define IOCTL_DIR_DELT(type, request, dir, delt) \ + type out; \ + memset(&out, 0, sizeof(type)); \ + out.nDirection = dir; \ + out.nDeltDataType = delt; \ + if (ioctl(fd, request, &out)) \ + return; + +typedef enum { + ANNEX_UNKNOWN = 0, + ANNEX_A, + ANNEX_B, + ANNEX_C, + ANNEX_I, + ANNEX_J, + ANNEX_L, + ANNEX_M, +} annex_t; + +typedef enum { + STD_UNKNOWN = 0, + STD_T1_413, + STD_TS_101_388, + STD_G_992_1, + STD_G_992_2, + STD_G_992_3, + STD_G_992_4, + STD_G_992_5, + STD_G_993_1, + STD_G_993_2, +} standard_t; + +typedef enum { + VECTOR_UNKNOWN = 0, + VECTOR_OFF, + VECTOR_ON_DS, + VECTOR_ON_DS_US, +} vector_t; + +typedef enum { + PROFILE_UNKNOWN = 0, + PROFILE_8A, + PROFILE_8B, + PROFILE_8C, + PROFILE_8D, + PROFILE_12A, + PROFILE_12B, + PROFILE_17A, + PROFILE_30A, + PROFILE_35B, +} profile_t; + +static DSL_CPE_ThreadCtrl_t thread; +static struct ubus_context *ctx; +static struct blob_buf b; + +static inline void m_double(const char *id, double value) { + blobmsg_add_double(&b, id, value); +} + +static inline void m_bool(const char *id, bool value) { + blobmsg_add_u8(&b, id, value); +} + +static inline void m_u32(const char *id, uint32_t value) { + blobmsg_add_u32(&b, id, value); +} + +static inline void m_str(const char *id, const char *value) { + blobmsg_add_string(&b, id, value); +} + +static inline void m_db(const char *id, int value) { + m_double(id, (double)value / 10); +} + +static inline void m_array(const char *id, const uint8_t *value, uint8_t len) { + void *c = blobmsg_open_array(&b, id); + + for (uint8_t i = 0; i < len; ++i) + blobmsg_add_u16(&b, "", value[i]); + + blobmsg_close_array(&b, c); +} + +static void m_vendor(const char *id, const uint8_t *value) { + // ITU-T T.35: U.S. + if (U16(value[0], value[1]) != 0xb500) + return; + + const char *str = NULL; + switch (U32(value[2], value[3], value[4], value[5])) { + STR_CASE(0x414C4342, "Alcatel") + STR_CASE(0x414E4456, "Analog Devices") + STR_CASE(0x4244434D, "Broadcom") + STR_CASE(0x43454E54, "Centillium") + STR_CASE(0x4753504E, "Globespan") + STR_CASE(0x494B4E53, "Ikanos") + STR_CASE(0x4946544E, "Infineon") + STR_CASE(0x54535443, "Texas Instruments") + STR_CASE(0x544D4D42, "Thomson MultiMedia Broadband") + STR_CASE(0x5443544E, "Trend Chip Technologies") + STR_CASE(0x53544D49, "ST Micro") + }; + + if (!str) + return; + + if ((value[6] == 0) && (value[7] == 0)) { + m_str(id, str); + return; + } + + char buf[64]; + sprintf(buf, "%s %d.%d", str, value[6], value[7]); + m_str(id, buf); + + return; +} + +annex_t get_annex(const uint8_t *xtse) { + if ((xtse[0] & XTSE_1_01_A_T1_413) || + (xtse[0] & XTSE_1_03_A_1_NO) || + (xtse[0] & XTSE_1_04_A_1_O) || + (xtse[1] & XTSE_2_01_A_2_NO) || + (xtse[2] & XTSE_3_03_A_3_NO) || + (xtse[2] & XTSE_3_04_A_3_O) || + (xtse[3] & XTSE_4_01_A_4_NO) || + (xtse[3] & XTSE_4_02_A_4_O) || + (xtse[5] & XTSE_6_01_A_5_NO) || + (xtse[5] & XTSE_6_02_A_5_O) || + (xtse[7] & XTSE_8_01_A)) + return ANNEX_A; + + if ((xtse[0] & XTSE_1_05_B_1_NO) || + (xtse[0] & XTSE_1_06_B_1_O) || + (xtse[1] & XTSE_2_02_B_2_O) || + (xtse[2] & XTSE_3_05_B_3_NO) || + (xtse[2] & XTSE_3_06_B_3_O) || + (xtse[5] & XTSE_6_03_B_5_NO) || + (xtse[5] & XTSE_6_04_B_5_O) || + (xtse[7] & XTSE_8_02_B)) + return ANNEX_B; + + if ((xtse[0] & XTSE_1_02_C_TS_101388) || + (xtse[0] & XTSE_1_07_C_1_NO) || + (xtse[0] & XTSE_1_08_C_1_O) || + (xtse[1] & XTSE_2_03_C_2_NO) || + (xtse[1] & XTSE_2_04_C_2_O) || + (xtse[7] & XTSE_8_03_C)) + return ANNEX_C; + + if ((xtse[3] & XTSE_4_05_I_3_NO) || + (xtse[3] & XTSE_4_06_I_3_O) || + (xtse[4] & XTSE_5_01_I_4_NO) || + (xtse[4] & XTSE_5_02_I_4_O) || + (xtse[5] & XTSE_6_07_I_5_NO) || + (xtse[5] & XTSE_6_08_I_5_O)) + return ANNEX_I; + + if ((xtse[3] & XTSE_4_07_J_3_NO) || + (xtse[3] & XTSE_4_08_J_3_O) || + (xtse[6] & XTSE_7_01_J_5_NO) || + (xtse[6] & XTSE_7_02_J_5_O)) + return ANNEX_J; + + if ((xtse[4] & XTSE_5_03_L_3_NO) || + (xtse[4] & XTSE_5_04_L_3_NO) || + (xtse[4] & XTSE_5_05_L_3_O) || + (xtse[4] & XTSE_5_06_L_3_O)) + return ANNEX_L; + + if ((xtse[4] & XTSE_5_07_M_3_NO) || + (xtse[4] & XTSE_5_08_M_3_O) || + (xtse[6] & XTSE_7_03_M_5_NO) || + (xtse[6] & XTSE_7_04_M_5_O)) + return ANNEX_M; + + return ANNEX_UNKNOWN; +} + +static standard_t get_standard(const uint8_t *xtse) { + if (xtse[0] & XTSE_1_01_A_T1_413) + return STD_T1_413; + + if (xtse[0] & XTSE_1_02_C_TS_101388) + return STD_TS_101_388; + + if ((xtse[0] & XTSE_1_03_A_1_NO) || + (xtse[0] & XTSE_1_04_A_1_O) || + (xtse[0] & XTSE_1_05_B_1_NO) || + (xtse[0] & XTSE_1_06_B_1_O) || + (xtse[0] & XTSE_1_07_C_1_NO) || + (xtse[0] & XTSE_1_08_C_1_O)) + return STD_G_992_1; + + if ((xtse[1] & XTSE_2_01_A_2_NO) || + (xtse[1] & XTSE_2_02_B_2_O) || + (xtse[1] & XTSE_2_03_C_2_NO) || + (xtse[1] & XTSE_2_04_C_2_O)) + return STD_G_992_2; + + if ((xtse[2] & XTSE_3_03_A_3_NO) || + (xtse[2] & XTSE_3_04_A_3_O) || + (xtse[2] & XTSE_3_05_B_3_NO) || + (xtse[2] & XTSE_3_06_B_3_O) || + (xtse[3] & XTSE_4_05_I_3_NO) || + (xtse[3] & XTSE_4_06_I_3_O) || + (xtse[3] & XTSE_4_07_J_3_NO) || + (xtse[3] & XTSE_4_08_J_3_O) || + (xtse[4] & XTSE_5_03_L_3_NO) || + (xtse[4] & XTSE_5_04_L_3_NO) || + (xtse[4] & XTSE_5_05_L_3_O) || + (xtse[4] & XTSE_5_06_L_3_O) || + (xtse[4] & XTSE_5_07_M_3_NO) || + (xtse[4] & XTSE_5_08_M_3_O)) + return STD_G_992_3; + + if ((xtse[3] & XTSE_4_01_A_4_NO) || + (xtse[3] & XTSE_4_02_A_4_O) || + (xtse[4] & XTSE_5_01_I_4_NO) || + (xtse[4] & XTSE_5_02_I_4_O)) + return STD_G_992_4; + + if ((xtse[5] & XTSE_6_01_A_5_NO) || + (xtse[5] & XTSE_6_02_A_5_O) || + (xtse[5] & XTSE_6_03_B_5_NO) || + (xtse[5] & XTSE_6_04_B_5_O) || + (xtse[5] & XTSE_6_07_I_5_NO) || + (xtse[5] & XTSE_6_08_I_5_O) || + (xtse[6] & XTSE_7_01_J_5_NO) || + (xtse[6] & XTSE_7_02_J_5_O) || + (xtse[6] & XTSE_7_03_M_5_NO) || + (xtse[6] & XTSE_7_04_M_5_O)) + return STD_G_992_5; + + if (xtse[7] & XTSE_8_08) + return STD_G_993_1; + + if ((xtse[7] & XTSE_8_01_A) || + (xtse[7] & XTSE_8_02_B) || + (xtse[7] & XTSE_8_03_C)) + return STD_G_993_2; + + return STD_UNKNOWN; +} + +static void version_information(int fd) { + IOCTL(DSL_VersionInformation_t, DSL_FIO_VERSION_INFORMATION_GET) + + m_str("api_version", out.data.DSL_DriverVersionApi); + m_str("firmware_version", out.data.DSL_ChipSetFWVersion); + m_str("chipset", out.data.DSL_ChipSetType); + m_str("driver_version", out.data.DSL_DriverVersionMeiBsp); +} + +static void line_state(int fd) { + IOCTL(DSL_LineState_t, DSL_FIO_LINE_STATE_GET) + + const char *str; + switch (out.data.nLineState) { + STR_CASE(DSL_LINESTATE_NOT_INITIALIZED, "Not initialized") + STR_CASE(DSL_LINESTATE_EXCEPTION, "Exception") + STR_CASE(DSL_LINESTATE_NOT_UPDATED, "Not updated") + STR_CASE(DSL_LINESTATE_IDLE_REQUEST, "Idle request") + STR_CASE(DSL_LINESTATE_IDLE, "Idle") + STR_CASE(DSL_LINESTATE_SILENT_REQUEST, "Silent request") + STR_CASE(DSL_LINESTATE_SILENT, "Silent") + STR_CASE(DSL_LINESTATE_HANDSHAKE, "Handshake") + STR_CASE(DSL_LINESTATE_BONDING_CLR, "Bonding CLR") + STR_CASE(DSL_LINESTATE_FULL_INIT, "Full init") + STR_CASE(DSL_LINESTATE_SHORT_INIT_ENTRY, "Short init entry") + STR_CASE(DSL_LINESTATE_DISCOVERY, "Discovery") + STR_CASE(DSL_LINESTATE_TRAINING, "Training") + STR_CASE(DSL_LINESTATE_ANALYSIS, "Analysis") + STR_CASE(DSL_LINESTATE_EXCHANGE, "Exchange") + STR_CASE(DSL_LINESTATE_SHOWTIME_NO_SYNC, "Showtime without TC-Layer sync") + STR_CASE(DSL_LINESTATE_SHOWTIME_TC_SYNC, "Showtime with TC-Layer sync") + STR_CASE(DSL_LINESTATE_FASTRETRAIN, "Fastretrain") + STR_CASE(DSL_LINESTATE_LOWPOWER_L2, "Lowpower L2") + STR_CASE(DSL_LINESTATE_LOOPDIAGNOSTIC_ACTIVE, "Loopdiagnostic active") + STR_CASE(DSL_LINESTATE_LOOPDIAGNOSTIC_DATA_EXCHANGE, "Loopdiagnostic data exchange") + STR_CASE(DSL_LINESTATE_LOOPDIAGNOSTIC_DATA_REQUEST, "Loopdiagnostic data request") + STR_CASE(DSL_LINESTATE_LOOPDIAGNOSTIC_COMPLETE, "Loopdiagnostic complete") + STR_CASE(DSL_LINESTATE_RESYNC, "Resync") + STR_CASE(DSL_LINESTATE_TEST, "Test") + STR_CASE(DSL_LINESTATE_TEST_LOOP, "Test loop") + STR_CASE(DSL_LINESTATE_TEST_REVERB, "Test reverb") + STR_CASE(DSL_LINESTATE_TEST_MEDLEY, "Test medley") + STR_CASE(DSL_LINESTATE_TEST_SHOWTIME_LOCK, "Showtime lock") + STR_CASE(DSL_LINESTATE_TEST_QUIET, "Quiet") + STR_CASE(DSL_LINESTATE_LOWPOWER_L3, "Lowpower L3") +#ifndef INCLUDE_DSL_CPE_API_DANUBE + STR_CASE(DSL_LINESTATE_DISABLED, "Disabled") + STR_CASE(DSL_LINESTATE_T1413, "T1413") + STR_CASE(DSL_LINESTATE_ORDERLY_SHUTDOWN_REQUEST, "Orderly shutdown request") + STR_CASE(DSL_LINESTATE_ORDERLY_SHUTDOWN, "Orderly shutdown") + STR_CASE(DSL_LINESTATE_TEST_FILTERDETECTION_ACTIVE, "Test filterdetection active") + STR_CASE(DSL_LINESTATE_TEST_FILTERDETECTION_COMPLETE, "Test filterdetection complete") +#endif + default: + str = NULL; + break; + }; + if (str) + m_str("state", str); + + m_bool("up", out.data.nLineState == DSL_LINESTATE_SHOWTIME_TC_SYNC); +} + +static void pm_channel_counters_showtime(int fd) { + IOCTL_DIR(DSL_PM_ChannelCounters_t, DSL_FIO_PM_CHANNEL_COUNTERS_SHOWTIME_GET, DSL_NEAR_END); + + m_u32("uptime", out.interval.nElapsedTime); +} + +static void g997_line_inventory(int fd) { + IOCTL_DIR(DSL_G997_LineInventory_t, DSL_FIO_G997_LINE_INVENTORY_GET, DSL_DOWNSTREAM) + + m_array("vendor_id", out.data.G994VendorID, DSL_G997_LI_MAXLEN_VENDOR_ID); + m_vendor("vendor", out.data.G994VendorID); + m_array("system_vendor_id", out.data.SystemVendorID, DSL_G997_LI_MAXLEN_VENDOR_ID); + m_vendor("system_vendor", out.data.SystemVendorID); + m_array("version", out.data.VersionNumber, DSL_G997_LI_MAXLEN_VERSION); + m_array("serial", out.data.SerialNumber, DSL_G997_LI_MAXLEN_SERIAL); +} + +static void g997_power_management_status(int fd) { + IOCTL(DSL_G997_PowerManagementStatus_t, DSL_FIO_G997_POWER_MANAGEMENT_STATUS_GET) + + const char *str; + switch (out.data.nPowerManagementStatus) { + STR_CASE(DSL_G997_PMS_NA, "Power management state is not available") + STR_CASE(DSL_G997_PMS_L0, "L0 - Synchronized") + STR_CASE(DSL_G997_PMS_L1, "L1 - Power Down Data transmission (G.992.2)") + STR_CASE(DSL_G997_PMS_L2, "L2 - Power Down Data transmission (G.992.3 and G.992.4)") + STR_CASE(DSL_G997_PMS_L3, "L3 - No power") + default: + str = NULL; + break; + }; + if (str) + m_str("power_state", str); +} + +static void g997_xtu_system_enabling(int fd, standard_t *standard) { + IOCTL(DSL_G997_XTUSystemEnabling_t, DSL_FIO_G997_XTU_SYSTEM_ENABLING_STATUS_GET) + + m_array("xtse", out.data.XTSE, DSL_G997_NUM_XTSE_OCTETS); + + const char *str; + switch (get_annex(out.data.XTSE)) { + STR_CASE(ANNEX_A, "A") + STR_CASE(ANNEX_B, "B") + STR_CASE(ANNEX_C, "C") + STR_CASE(ANNEX_I, "I") + STR_CASE(ANNEX_J, "J") + STR_CASE(ANNEX_L, "L") + STR_CASE(ANNEX_M, "M") + default: + str = NULL; + break; + }; + if (str) + m_str("annex", str); + + *standard = get_standard(out.data.XTSE); + + switch (*standard) { + STR_CASE(STD_T1_413, "T1.413") + STR_CASE(STD_TS_101_388, "TS 101 388") + STR_CASE(STD_G_992_1, "G.992.1") + STR_CASE(STD_G_992_2, "G.992.2") + STR_CASE(STD_G_992_3, "G.992.3") + STR_CASE(STD_G_992_4, "G.992.4") + STR_CASE(STD_G_992_5, "G.992.5") + STR_CASE(STD_G_993_1, "G.993.1") + STR_CASE(STD_G_993_2, "G.993.2") + default: + str = NULL; + break; + } + if (str) + m_str("standard", str); +} + +static vector_t get_vector_status() { +#ifdef INCLUDE_DSL_CPE_API_VRX + int fd = open(DSL_CPE_DSL_LOW_DEV "/0", O_RDWR, 0644); + if (fd < 0) + return VECTOR_UNKNOWN; + + IOCTL_MEI_dsmStatus_t out; + memset(&out, 0, sizeof(IOCTL_MEI_dsmStatus_t)); + int ret = ioctl(fd, FIO_MEI_DSM_STATUS_GET, &out); + close(fd); + + if (ret) + return VECTOR_UNKNOWN; + + switch (out.eVectorStatus) { + case e_MEI_VECTOR_STAT_OFF: + return VECTOR_OFF; + case e_MEI_VECTOR_STAT_ON_DS: + return VECTOR_ON_DS; + case e_MEI_VECTOR_STAT_ON_DS_US: + return VECTOR_ON_DS_US; + default: + return VECTOR_UNKNOWN; + }; +#else + return VECTOR_UNKNOWN; +#endif +} + +static void band_plan_status(int fd, profile_t *profile) { +#if (INCLUDE_DSL_CPE_API_VDSL_SUPPORT == 1) + IOCTL(DSL_BandPlanStatus_t, DSL_FIO_BAND_PLAN_STATUS_GET) + + switch (out.data.nProfile) { + case DSL_PROFILE_8A: + *profile = PROFILE_8A; + break; + case DSL_PROFILE_8B: + *profile = PROFILE_8B; + break; + case DSL_PROFILE_8C: + *profile = PROFILE_8C; + break; + case DSL_PROFILE_8D: + *profile = PROFILE_8D; + break; + case DSL_PROFILE_12A: + *profile = PROFILE_12A; + break; + case DSL_PROFILE_12B: + *profile = PROFILE_12B; + break; + case DSL_PROFILE_17A: + *profile = PROFILE_17A; + break; + case DSL_PROFILE_30A: + *profile = PROFILE_30A; + break; + case DSL_PROFILE_35B: + *profile = PROFILE_35B; + break; + default: + *profile = PROFILE_UNKNOWN; + break; + }; + + const char *str; + switch (*profile) { + STR_CASE(PROFILE_8A, "8a") + STR_CASE(PROFILE_8B, "8b") + STR_CASE(PROFILE_8C, "8c") + STR_CASE(PROFILE_8D, "8d") + STR_CASE(PROFILE_12A, "12a") + STR_CASE(PROFILE_12B, "12b") + STR_CASE(PROFILE_17A, "17a") + STR_CASE(PROFILE_30A, "30a") + STR_CASE(PROFILE_35B, "35b") + default: + str = NULL; + break; + }; + if (str) + m_str("profile", str); +#endif +} + +static void line_feature_config(int fd, DSL_AccessDir_t direction) { + IOCTL_DIR(DSL_LineFeature_t, DSL_FIO_LINE_FEATURE_STATUS_GET, direction) + + m_bool("trellis", out.data.bTrellisEnable); + m_bool("bitswap", out.data.bBitswapEnable); + m_bool("retx", out.data.bReTxEnable); + m_bool("virtual_noise", out.data.bVirtualNoiseSupport); +} + +static void g997_channel_status(int fd, DSL_AccessDir_t direction) { + IOCTL_DIR(DSL_G997_ChannelStatus_t, DSL_FIO_G997_CHANNEL_STATUS_GET, direction); + + m_u32("interleave_delay", out.data.ActualInterleaveDelay * 10); + m_u32("data_rate", out.data.ActualDataRate); +} + +static void g997_line_status(int fd, DSL_AccessDir_t direction) { + IOCTL_DIR_DELT(DSL_G997_LineStatus_t, DSL_FIO_G997_LINE_STATUS_GET, direction, DSL_DELT_DATA_SHOWTIME); + + m_db("latn", out.data.LATN); + m_db("satn", out.data.SATN); + m_db("snr", out.data.SNR); + m_db("actps", out.data.ACTPS); + m_db("actatp", out.data.ACTATP); + m_u32("attndr", out.data.ATTNDR); +} + +static void pm_line_sec_counters_total(int fd, DSL_XTUDir_t direction) { + IOCTL_DIR(DSL_PM_LineSecCountersTotal_t, DSL_FIO_PM_LINE_SEC_COUNTERS_TOTAL_GET, direction) + + m_u32("es", out.data.nES); + m_u32("ses", out.data.nSES); + m_u32("loss", out.data.nLOSS); + m_u32("uas", out.data.nUAS); + m_u32("lofs", out.data.nLOFS); +#ifndef INCLUDE_DSL_CPE_API_DANUBE + m_u32("fecs", out.data.nFECS); +#endif +} + +static void pm_data_path_counters_total(int fd, DSL_XTUDir_t direction) { + IOCTL_DIR(DSL_PM_DataPathCountersTotal_t, DSL_FIO_PM_DATA_PATH_COUNTERS_TOTAL_GET, direction); + + m_u32("hec", out.data.nHEC); + m_u32("ibe", out.data.nIBE); + m_u32("crc_p", out.data.nCRC_P); + m_u32("crcp_p", out.data.nCRCP_P); + m_u32("cv_p", out.data.nCV_P); + m_u32("cvp_p", out.data.nCVP_P); +} + +static void retx_statistics(int fd, DSL_XTUDir_t direction) { +#ifdef INCLUDE_DSL_CPE_PM_RETX_COUNTERS +#ifdef INCLUDE_DSL_CPE_PM_RETX_THRESHOLDS + IOCTL_DIR(DSL_ReTxStatistics_t, DSL_FIO_RETX_STATISTICS_GET, direction); + + m_u32("rx_corrupted", out.data.nRxCorruptedTotal); + m_u32("rx_uncorrected_protected", out.data.nRxUncorrectedProtected); + m_u32("rx_retransmitted", out.data.nRxRetransmitted); + m_u32("rx_corrected", out.data.nRxCorrected); + m_u32("tx_retransmitted", out.data.nTxRetransmitted); +#endif +#endif +} + +static void describe_mode(standard_t standard, profile_t profile, vector_t vector) { + char buf[128]; + + switch (standard) { + case STD_T1_413: + strcpy(buf, "T1.413"); + break; + case STD_TS_101_388: + strcpy(buf, "TS 101 388"); + break; + case STD_G_992_1: + strcpy(buf, "G.992.1 (ADSL)"); + break; + case STD_G_992_2: + strcpy(buf, "G.992.2 (ADSL lite)"); + break; + case STD_G_992_3: + strcpy(buf, "G.992.3 (ADSL2)"); + break; + case STD_G_992_4: + strcpy(buf, "G.992.4 (ADSL2 lite)"); + break; + case STD_G_992_5: + strcpy(buf, "G.992.5 (ADSL2+)"); + break; + case STD_G_993_1: + strcpy(buf, "G.993.1 (VDSL)"); + break; + case STD_G_993_2: + strcpy(buf, "G.993.2 (VDSL2"); + + switch (profile) { + case PROFILE_8A: + strcat(buf, ", Profile 8a"); + break; + case PROFILE_8B: + strcat(buf, ", Profile 8b"); + break; + case PROFILE_8C: + strcat(buf, ", Profile 8c"); + break; + case PROFILE_8D: + strcat(buf, ", Profile 8d"); + break; + case PROFILE_12A: + strcat(buf, ", Profile 12a"); + break; + case PROFILE_12B: + strcat(buf, ", Profile 12b"); + break; + case PROFILE_17A: + strcat(buf, ", Profile 17a"); + break; + case PROFILE_30A: + strcat(buf, ", Profile 30a"); + break; + case PROFILE_35B: + strcat(buf, ", Profile 35b"); + break; + default: + break; + }; + + switch (vector) { + case VECTOR_ON_DS: + strcat(buf, ", with downstream vectoring"); + break; + case VECTOR_ON_DS_US: + strcat(buf, ", with down- and upstream vectoring"); + break; + default: + break; + }; + + strcat(buf, ")"); + break; + default: + return; + }; + + m_str("mode", buf); +} + +static int metrics(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *req, const char *method, + struct blob_attr *msg) +{ + void *c, *c2; + int fd; + standard_t standard = STD_UNKNOWN; + profile_t profile = PROFILE_UNKNOWN; + vector_t vector = VECTOR_UNKNOWN; + + fd = open(DSL_CPE_DEVICE_NAME "0", O_RDWR, 0644); + if (fd < 0) + return UBUS_STATUS_UNKNOWN_ERROR; + + blob_buf_init(&b, 0); + + version_information(fd); + line_state(fd); + pm_channel_counters_showtime(fd); + + c2 = blobmsg_open_table(&b, "atu_c"); + g997_line_inventory(fd); + blobmsg_close_table(&b, c2); + + g997_power_management_status(fd); + g997_xtu_system_enabling(fd, &standard); + + if (standard == STD_G_993_2) { + band_plan_status(fd, &profile); + vector = get_vector_status(); + } + + describe_mode(standard, profile, vector); + + c = blobmsg_open_table(&b, "upstream"); + switch (vector) { + case VECTOR_OFF: + m_bool("vector", false); + break; + case VECTOR_ON_DS_US: + m_bool("vector", true); + break; + default: + break; + }; + line_feature_config(fd, DSL_UPSTREAM); + g997_channel_status(fd, DSL_UPSTREAM); + g997_line_status(fd, DSL_UPSTREAM); + blobmsg_close_table(&b, c); + + c = blobmsg_open_table(&b, "downstream"); + switch (vector) { + case VECTOR_OFF: + m_bool("vector", false); + break; + case VECTOR_ON_DS: + case VECTOR_ON_DS_US: + m_bool("vector", true); + break; + default: + break; + }; + line_feature_config(fd, DSL_DOWNSTREAM); + g997_channel_status(fd, DSL_DOWNSTREAM); + g997_line_status(fd, DSL_DOWNSTREAM); + blobmsg_close_table(&b, c); + + c = blobmsg_open_table(&b, "errors"); + c2 = blobmsg_open_table(&b, "near"); + pm_line_sec_counters_total(fd, DSL_NEAR_END); + pm_data_path_counters_total(fd, DSL_NEAR_END); + retx_statistics(fd, DSL_NEAR_END); + blobmsg_close_table(&b, c2); + + c2 = blobmsg_open_table(&b, "far"); + pm_line_sec_counters_total(fd, DSL_FAR_END); + pm_data_path_counters_total(fd, DSL_FAR_END); + retx_statistics(fd, DSL_FAR_END); + blobmsg_close_table(&b, c2); + blobmsg_close_table(&b, c); + + ubus_send_reply(ctx, req, b.head); + + close(fd); + + return 0; +} + +static const struct ubus_method dsl_methods[] = { + UBUS_METHOD_NOARG("metrics", metrics), +}; + +static struct ubus_object_type dsl_object_type = + UBUS_OBJECT_TYPE("dsl", dsl_methods); + +static struct ubus_object dsl_object = { + .name = "dsl", + .type = &dsl_object_type, + .methods = dsl_methods, + .n_methods = ARRAY_SIZE(dsl_methods), +}; + +static DSL_int_t ubus_main(DSL_CPE_Thread_Params_t *params) { + uloop_run(); + return 0; +} + +void ubus_init() { + uloop_init(); + + ctx = ubus_connect(NULL); + if (!ctx) + return; + + if (ubus_add_object(ctx, &dsl_object)) { + ubus_free(ctx); + ctx = NULL; + return; + } + + ubus_add_uloop(ctx); + + DSL_CPE_ThreadInit(&thread, "ubus", ubus_main, DSL_CPE_PIPE_STACK_SIZE, DSL_CPE_PIPE_PRIORITY, 0, 0); +} + +void ubus_deinit() { + if (!ctx) + return; + + ubus_free(ctx); + uloop_done(); + + DSL_CPE_ThreadShutdown(&thread, 1000); +} From patchwork Fri Dec 11 12:05:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1414871 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=tZXg/NAc; 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=Pd3jGWEy; 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 4CsqKD0hBBz9sR4 for ; Fri, 11 Dec 2020 23:07:12 +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=NYM0FdURiFsUVekcb3+oRKKaA+16qkNs03+pq0tXg8I=; b=tZXg/NAcXG1BzyW1o78X+B4BIM E4cVcTvhM15ArtPHSZ+37YFyqZzz5ecXb8h1SCp/DhBRw+BkrDyp9uffY7Te+czZ5eEdn7eeaDfgq 3am72+spXmMfNH2jf+N4ZGj/LBJ2GATGE8x4nnrfMQKyuFPGJ2w3B2BUUCb0MsqVTzUnpC4PGgCzq +14ZZDl6O9Ub0AXH+iH053i3lSJNnmDefonPsKBjffqj8NWGHcFWxm/aKoCCXY9jHziZyFwXwa1uw Q83vG+2MM5FkmDEpFzrcyxBccJ3i1FJpH+ZRDtbXYX6SEjwx+8mlLyvtPOxxFMgyEQKbM/1WDesaq R9pT/PCA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhAx-0005Kp-Lg; Fri, 11 Dec 2020 12:05:31 +0000 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhAm-0005GS-8O for openwrt-devel@lists.openwrt.org; Fri, 11 Dec 2020 12:05:23 +0000 Received: by mail-wm1-x32d.google.com with SMTP id q75so8350178wme.2 for ; Fri, 11 Dec 2020 04:05:19 -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=7RO0Txl2vR7CEz2NGhmi3Y+gRw29ms44PF62h+Mjhkk=; b=Pd3jGWEyuPxqtY3XlkFBbE9RvlmoCrTsqKyeJvMrIhwLoXFzmL/612o9NTlGBAX69k iXhPMv6OOFY4/rTwn00FpQhmcUWdySzas5UUH8q/fQ4O0NF93IAJ7Nf0boqRyQqX7aQb jwGh6AUdFlyfso4M8luDrrWltz1GvattjKwUyPNkZ2ieNlllCQuFToDPcH2q+abnATec Mv7Qa4AASXiBN9d+ksC++Kt1QVVyyP6rIEITBfhN/9txd7kzUghA/bjzRdsDECq51BWj vB3cu/hErxQ4y5cUCMv4joCPpLZXzSQ3wQHeU82HQZBd07bFT3gRyfdvMlG61xooC1cZ Leyg== 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=7RO0Txl2vR7CEz2NGhmi3Y+gRw29ms44PF62h+Mjhkk=; b=s0IV73+LvSO07yayNKcgzpL3wIMuGg+N1Cmkbmjq2XH4c7UXtidg0usSRRXuaysQy8 ggZCZ4dag8+/RMVnDwNZYa6ZN68EpfEMHWQsR1B3n/9WbpM2+SQOfBXxFC3IYMut7jZS z+eXNrBd1XptWx/b9O3/FR93s19jQcdxcaxzV0mZHRCqIa4DMsbf/Cbpj1bisOQWZKeo BeiRFptiDHVbukrMbSs/9cWWl4x8fEPp8dxe9M7FDuTUa9dGs260xz7FjOVIuhlhILMF VheEVqV1mHDe5N/KrR+uNSUiIvrMBOOGkZ189seiBvQyN6NatzFCi2E8v9nkfuuCu1g0 CUtQ== X-Gm-Message-State: AOAM5328yWajupTfwsXb0GNxfM43ESkaM5Zs3gHaxBCpwDVoYj9W6q/c ILiIA31TNTgqhYYqlRrLsMCqGV5G2GD8bQ== X-Google-Smtp-Source: ABdhPJwrWWkqoQrF9REmjUXwsYW/WoT/DwOfzxVhAKdE6nXC7+q3TDlmdPp03w8Ix/XwycE7se5ZTA== X-Received: by 2002:a7b:c925:: with SMTP id h5mr12979940wml.43.1607688318633; Fri, 11 Dec 2020 04:05:18 -0800 (PST) Received: from mamamia.internal (a89-182-180-166.net-htp.de. [89.182.180.166]) by smtp.gmail.com with ESMTPSA id l1sm14552616wmi.15.2020.12.11.04.05.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Dec 2020 04:05:18 -0800 (PST) From: Andre Heider To: openwrt-devel@lists.openwrt.org Subject: [PATCH 04/13] ltq-adsl-app: add ubus support to get metrics Date: Fri, 11 Dec 2020 13:05:04 +0100 Message-Id: <20201211120513.1130247-5-a.heider@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201211120513.1130247-1-a.heider@gmail.com> References: <20201211120513.1130247-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-20201211_070520_373783_29305213 X-CRM114-Status: GOOD ( 16.54 ) 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:32d listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [a.heider[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 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_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 As with ltq-vdsl-app, see previous commit. Signed-off-by: Andre Heider --- package/network/config/ltq-adsl-app/Makefile | 2 +- .../ltq-adsl-app/patches/300-ubus.patch | 50 +++++++++++++++++++ package/network/config/ltq-adsl-app/src | 1 + 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 package/network/config/ltq-adsl-app/patches/300-ubus.patch create mode 120000 package/network/config/ltq-adsl-app/src diff --git a/package/network/config/ltq-adsl-app/Makefile b/package/network/config/ltq-adsl-app/Makefile index cfd66d0ee4..e03c0911a5 100644 --- a/package/network/config/ltq-adsl-app/Makefile +++ b/package/network/config/ltq-adsl-app/Makefile @@ -35,7 +35,7 @@ define Package/ltq-adsl-app CATEGORY:=Network TITLE:=Lantiq DSL userland tool URL:=http://www.lantiq.com/ - DEPENDS:=@(TARGET_lantiq_xway||TARGET_lantiq_xway_legacy||TARGET_lantiq_ase) +libpthread +ltq-dsl-base + DEPENDS:=@(TARGET_lantiq_xway||TARGET_lantiq_xway_legacy||TARGET_lantiq_ase) +libpthread +ltq-dsl-base +libubox +libubus MENU:=1 endef diff --git a/package/network/config/ltq-adsl-app/patches/300-ubus.patch b/package/network/config/ltq-adsl-app/patches/300-ubus.patch new file mode 100644 index 0000000000..1951efd4f6 --- /dev/null +++ b/package/network/config/ltq-adsl-app/patches/300-ubus.patch @@ -0,0 +1,50 @@ +--- a/src/dsl_cpe_control.c ++++ b/src/dsl_cpe_control.c +@@ -139,6 +139,9 @@ extern DSL_Error_t DSL_CPE_Pipe_StaticRe + #endif /* INCLUDE_DSL_RESOURCE_STATISTICS*/ + #endif + ++extern void ubus_init(); ++extern void ubus_deinit(); ++ + DSL_char_t *g_sFirmwareName1 = DSL_NULL; + DSL_char_t *g_sFirmwareName2 = DSL_NULL; + #ifdef INCLUDE_SCRIPT_NOTIFICATION +@@ -5343,6 +5346,8 @@ DSL_int_t dsl_cpe_daemon ( + signal (SIGINT, DSL_CPE_TerminationHandler); + #endif /* RTEMS*/ + ++ ubus_init(); ++ + /* Open DSL_CPE_MAX_DEVICE_NUMBER devices*/ + for (nDevice = 0; nDevice < DSL_CPE_MAX_DEVICE_NUMBER; nDevice++) + { +@@ -5738,6 +5743,7 @@ DSL_int_t dsl_cpe_daemon ( + #endif /* INCLUDE_DSL_CPE_CLI_SUPPORT */ + + DSL_CPE_CONTROL_EXIT: ++ ubus_deinit(); + + #ifdef INCLUDE_DSL_BONDING + DSL_CPE_BND_Stop((DSL_CPE_BND_Context_t*)pCtrlCtx->pBnd); +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -11,7 +11,7 @@ else + dsl_cpe_control_common_ldflags = + endif + +-dsl_cpe_control_LDADD = -lpthread ++dsl_cpe_control_LDADD = -lpthread -lubox -lubus + + if INCLUDE_DSL_CPE_SOAP_SUPPORT + dsl_cpe_control_LDADD += -lm +@@ -70,7 +70,8 @@ dsl_cpe_control_SOURCES = \ + dsl_cpe_control.c \ + dsl_cpe_init_cfg.c \ + dsl_cpe_linux.c \ +- dsl_cpe_debug.c ++ dsl_cpe_debug.c \ ++ dsl_cpe_ubus.c + + dsl_cpe_control_SOURCES += \ + $(dsl_cpe_control_dti_sources) diff --git a/package/network/config/ltq-adsl-app/src b/package/network/config/ltq-adsl-app/src new file mode 120000 index 0000000000..d3dfcc3b34 --- /dev/null +++ b/package/network/config/ltq-adsl-app/src @@ -0,0 +1 @@ +../ltq-vdsl-app/src \ No newline at end of file From patchwork Fri Dec 11 12:05:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1414876 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=ZfvXEKgD; 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=VvXYpmsg; 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 4CsqKK6Pk4z9sTX for ; Fri, 11 Dec 2020 23:07:17 +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=p2W1Sk9Upy6d8PssJMPCsLHLSjGbi5B1XmALP4kY81E=; b=ZfvXEKgDPrDZnEIzTK7vIvyZSI xYaZy37GZznwyl+fzGuo6tFfBWYqB4SoQIHcESmyI8RBYFJ13YrOq5mtbCMClvaNbS+o5Bo85bPly lppjSfVT7WVcTAqOlLVLEY8cku4PAj+rQus6YCYpwUrGEFrKACUnaU+nuOHSn8uRT3yLtVYcBRtAM BjVNXNFicXGkxgWGHsbysnbX99qo3mQQpk61Rq5sR0lDvnb+wHe0jbDCdlsAmWqA5QMW2U965MbtZ amWhBJLIHvrGISvrVKwdfboihTGpyWHPglacf8h4pBZl6IBsobOOY2LgDHSLpHmw55AI3MpLFjuaj tFfHi24w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhB0-0005Lc-9F; Fri, 11 Dec 2020 12:05:34 +0000 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhAn-0005H4-67 for openwrt-devel@lists.openwrt.org; Fri, 11 Dec 2020 12:05:25 +0000 Received: by mail-wm1-x32b.google.com with SMTP id g25so4556019wmh.1 for ; Fri, 11 Dec 2020 04:05:20 -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=qP+sxK7nU7XKyuuJdpOmX7B8CB01KfHXYLqORX4l8YI=; b=VvXYpmsgEUsAcHA54LJKJdEKbHRgFkmBst453ObVMRx+K7t5r+FSzf1qN/m/nTjbBv +L6d9dRDdWtSNMpRFnegUTmDB9YXeHTjB5CNAwF+2bVlvHe9YwqlBNnYurqPSXQc1DYv F2P1d6W0x5WuX/39tlKekKohVLkKiNgBMHX2JlaQs7y+HqubMI80qHposV/eALeNKf83 IjNUKXe4R4HQUvfbLXHCgvOaeXtR5juRQIUQXWTHwU2lP3776FCw9PpPTDYc0CEBYEz6 lCeGAcjxFZlq2ZKZyfBM67m0bODf+NZQjnJyOeMbO7mHDr2WUMab0/XoZgKMUoMdXJR0 yWDA== 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=qP+sxK7nU7XKyuuJdpOmX7B8CB01KfHXYLqORX4l8YI=; b=q/j7LBP8EGXJVjRJGXJM/JbQqXXCbuPw2INIHtyKQ0W7o951FQf2IAbBEJ4iM/8Bb/ WbzN1m1njwM57YUF8WlbvibPrX/YoRiqq9YKYBimrttK422k9WV3f/uPNqQS6JGYxF5W XSJrPApEEc+GH6g/TFlChYQSnQ8n+I8quja6z4ykFhP5pj56I8zOub5B3/VzoQpneWtf mUQz6c7mzN7Fc2uis6v+KuzMMCbis49V4ZLymwWsRPAzC3acUkdM4bzIYMEUs1EH+3ND bnccEg9rFZZYiJZmOkTT0UpFsEdwjD7idi3xeeEGuFpv33LHdM7a3jwSxhqc78r6HWXc Lq2g== X-Gm-Message-State: AOAM533qP+oJjFIp7BHmWxX8rV2nZ+MNcJUt226oq6fpxkVveMFxJu7N QCBvuKE7De4/6IF7VMXBPbI55D5rOZLVUQ== X-Google-Smtp-Source: ABdhPJydpgsTGZstTx6RWXbttx0tANoeATzNSuoBi5cEPhYBhX5H/7szmAJgeD8WPlwsObXgKPbJCw== X-Received: by 2002:a05:600c:224b:: with SMTP id a11mr13174580wmm.97.1607688319435; Fri, 11 Dec 2020 04:05:19 -0800 (PST) Received: from mamamia.internal (a89-182-180-166.net-htp.de. [89.182.180.166]) by smtp.gmail.com with ESMTPSA id l1sm14552616wmi.15.2020.12.11.04.05.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Dec 2020 04:05:19 -0800 (PST) From: Andre Heider To: openwrt-devel@lists.openwrt.org Subject: [luci PATCH 05/13] luci-mod-status: use the new ubus dsl metrics Date: Fri, 11 Dec 2020 13:05:05 +0100 Message-Id: <20201211120513.1130247-6-a.heider@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201211120513.1130247-1-a.heider@gmail.com> References: <20201211120513.1130247-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-20201211_070521_323626_0A28DF39 X-CRM114-Status: GOOD ( 12.29 ) 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:32b listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [a.heider[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 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_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 This is significantly faster. Signed-off-by: Andre Heider --- .../resources/view/status/include/50_dsl.js | 55 +++++++++---------- .../usr/share/rpcd/acl.d/luci-mod-status.json | 2 +- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js index 4150b5513..946890f07 100644 --- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js +++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js @@ -2,40 +2,39 @@ 'require baseclass'; 'require rpc'; -var callLuciDSLStatus = rpc.declare({ - object: 'luci-rpc', - method: 'getDSLStatus', +var call_dsl_metrics = rpc.declare({ + object: 'dsl', + method: 'metrics', expect: { '': {} } }); function renderbox(dsl) { return E('div', { class: 'ifacebox' }, [ - E('div', { class: 'ifacebox-head center ' + ((dsl.line_state === 'UP') ? 'active' : '') }, + E('div', { class: 'ifacebox-head center ' + (dsl.up ? 'active' : '') }, E('strong', _('DSL Status'))), E('div', { class: 'ifacebox-body left' }, [ L.itemlist(E('span'), [ - _('Line State'), '%s [0x%x]'.format(dsl.line_state, dsl.line_state_detail), - _('Line Mode'), dsl.line_mode_s || '-', - _('Line Uptime'), '%t'.format(dsl.line_uptime), - _('Annex'), dsl.annex_s || '-', - _('Profile'), dsl.profile_s || '-', - _('Data Rate'), '%1000.3mb/s / %1000.3mb/s'.format(dsl.data_rate_down, dsl.data_rate_up), - _('Max. Attainable Data Rate (ATTNDR)'), '%1000.3mb/s / %1000.3mb/s'.format(dsl.max_data_rate_down, dsl.max_data_rate_up), - _('Latency'), '%.2f ms / %.2f ms'.format(dsl.latency_down / 1000, dsl.latency_up / 1000), - _('Line Attenuation (LATN)'), '%.1f dB / %.1f dB'.format(dsl.line_attenuation_down, dsl.line_attenuation_up), - _('Signal Attenuation (SATN)'), '%.1f dB / %.1f dB'.format(dsl.signal_attenuation_down, dsl.signal_attenuation_up), - _('Noise Margin (SNR)'), '%.1f dB / %.1f dB'.format(dsl.noise_margin_down, dsl.noise_margin_up), - _('Aggregate Transmit Power (ACTATP)'), '%.1f dB / %.1f dB'.format(dsl.actatp_down, dsl.actatp_up), - _('Forward Error Correction Seconds (FECS)'), '%d / %d'.format(dsl.errors_fecs_near, dsl.errors_fecs_far), - _('Errored seconds (ES)'), '%d / %d'.format(dsl.errors_es_near, dsl.errors_es_far), - _('Severely Errored Seconds (SES)'), '%d / %d'.format(dsl.errors_ses_near, dsl.errors_ses_far), - _('Loss of Signal Seconds (LOSS)'), '%d / %d'.format(dsl.errors_loss_near, dsl.errors_loss_far), - _('Unavailable Seconds (UAS)'), '%d / %d'.format(dsl.errors_uas_near, dsl.errors_uas_far), - _('Header Error Code Errors (HEC)'), '%d / %d'.format(dsl.errors_hec_near, dsl.errors_hec_far), - _('Non Pre-emptive CRC errors (CRC_P)'), '%d / %d'.format(dsl.errors_crc_p_near, dsl.errors_crc_p_far), - _('Pre-emptive CRC errors (CRCP_P)'), '%d / %d'.format(dsl.errors_crcp_p_near, dsl.errors_crcp_p_far), - _('ATU-C System Vendor ID'), dsl.atuc_vendor_id, - _('Power Management Mode'), dsl.power_mode_s + _('Line State'), dsl.state || '-', + _('Line Mode'), dsl.mode || '-', + _('Line Uptime'), '%t'.format(dsl.uptime), + _('Annex'), dsl.annex || '-', + _('Data Rate'), '%1000.3mb/s / %1000.3mb/s'.format(dsl.downstream.data_rate, dsl.upstream.data_rate), + _('Max. Attainable Data Rate (ATTNDR)'), '%1000.3mb/s / %1000.3mb/s'.format(dsl.downstream.attndr, dsl.upstream.attndr), + _('Latency'), '%.2f ms / %.2f ms'.format(dsl.downstream.interleave_delay / 1000, dsl.upstream.interleave_delay / 1000), + _('Line Attenuation (LATN)'), '%.1f dB / %.1f dB'.format(dsl.downstream.latn, dsl.upstream.latn), + _('Signal Attenuation (SATN)'), '%.1f dB / %.1f dB'.format(dsl.downstream.satn, dsl.upstream.satn), + _('Noise Margin (SNR)'), '%.1f dB / %.1f dB'.format(dsl.downstream.snr, dsl.upstream.snr), + _('Aggregate Transmit Power (ACTATP)'), '%.1f dB / %.1f dB'.format(dsl.downstream.actatp, dsl.upstream.actatp), + _('Forward Error Correction Seconds (FECS)'), '%d / %d'.format(dsl.errors.near.fecs, dsl.errors.far.fecs), + _('Errored seconds (ES)'), '%d / %d'.format(dsl.errors.near.es, dsl.errors.far.es), + _('Severely Errored Seconds (SES)'), '%d / %d'.format(dsl.errors.near.ses, dsl.errors.far.ses), + _('Loss of Signal Seconds (LOSS)'), '%d / %d'.format(dsl.errors.near.loss, dsl.errors.far.loss), + _('Unavailable Seconds (UAS)'), '%d / %d'.format(dsl.errors.near.uas, dsl.errors.far.uas), + _('Header Error Code Errors (HEC)'), '%d / %d'.format(dsl.errors.near.hec, dsl.errors.far.hec), + _('Non Pre-emptive CRC errors (CRC_P)'), '%d / %d'.format(dsl.errors.near.crc_p, dsl.errors.far.crc_p), + _('Pre-emptive CRC errors (CRCP_P)'), '%d / %d'.format(dsl.errors.near.crcp_p, dsl.errors.far.crcp_p), + _('ATU-C System Vendor ID'), dsl.atu_c.vendor || dsl.atu_c.vendor_id, + _('Power Management Mode'), dsl.power_state ]) ]) ]); @@ -45,11 +44,11 @@ return baseclass.extend({ title: _('DSL'), load: function() { - return L.resolveDefault(callLuciDSLStatus(), {}); + return L.resolveDefault(call_dsl_metrics(), {}); }, render: function(dsl) { - if (!dsl.line_state) + if (!dsl.state) return null; return E('div', { 'id': 'dsl_status_table', 'class': 'network-status-table' }, renderbox(dsl)); diff --git a/modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status.json b/modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status.json index db52c7313..5768f0a97 100644 --- a/modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status.json +++ b/modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status.json @@ -111,7 +111,7 @@ "description": "Grant access to DSL status display", "read": { "ubus": { - "luci-rpc": [ "getDSLStatus" ] + "dsl": [ "metrics" ] } } }, From patchwork Fri Dec 11 12:05:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1414869 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=u1yMvr2R; 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=psQi2hrt; 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 4CsqKB4BhDz9sTX for ; Fri, 11 Dec 2020 23:07:10 +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=jh5f1TyO0+7SLOWAucZP8LtSc5056bUFfCQ1ujxxcjc=; b=u1yMvr2RIe3Ik5pxq3aSn4u6OK qnroYH8BpQ/an7OepObgQowBG4wQ2kYBtRrkuGLLKCUcoKxsqIiDtR1ameEJ1am8RXCwpBANCW9So 21sdgc5dYNvPX1XLvo+QmjR/uQgzTcYQFalPnwjQ1EezJ1UMdv9iCF4twSM3RYuA+jHffPuuOWTLi vmo3hprEKd8WhixgXwIge3FEwQITYNgLqPJIDw4KfcfsF6uV9rWFPOTlDyohHG7pV42kqApDyTLGq OegmdE0lIeG5artTTVpDg2EEEfFsl0jx6lh3sbutNUZ3dRvuaaJaraIZL85t4cbNfeXtbgUzW+eq/ WuKJj+5g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhB7-0005N9-19; Fri, 11 Dec 2020 12:05:41 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhAn-0005HM-N5 for openwrt-devel@lists.openwrt.org; Fri, 11 Dec 2020 12:05:26 +0000 Received: by mail-wm1-x343.google.com with SMTP id c198so7356977wmd.0 for ; Fri, 11 Dec 2020 04:05:21 -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=r8QMUN7bpRDQYZAGe2PqJIuRKl3puiwiA5Rmz/UTmpM=; b=psQi2hrtGlqgGzf6xUvsDN37zj+AWcy3NMfErKKtWQdrF4NytZYFSCVBsl87zIjluu TJQQ/NPvs8775VQmin58weiug6F/7/hyS8pS3bJCcsh0aqnqov0g/MfM+7+E0kp+dLyk Pmy0TjWF39/qlxHcduzxIgN+HcEqDLH04gJDR7sNlVosc/N+sXbkfEPlHhCw9VZdeSHv XH/MOgcQY5TkwSOY1L9+RwjhJWOhEV3zwibiI/PtZ2uKuNTaljKaMm90fOMDzsDp8oAb VsPIhKZEqogoE/nFCqW0q5e4p2CshjJpuBFG8AV0PgKoE0bLdRaVhsFkv1MCdmYqyzUl eHyg== 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=r8QMUN7bpRDQYZAGe2PqJIuRKl3puiwiA5Rmz/UTmpM=; b=oxhMBwaYpXHjM3Rg5iSN6uAF7pXfx8wCZY/YyuwaFyWe1w23r1vELSMA1dS32yFNsq D6Wyi4GxBBuM8ivEcFJhoUhemFJe2WNECeMoGc/RGINzFEzW+vNmr8pJxgj5XSSc3AmD dDEZ/y2uodO+khBTmtbgzEpTO0Iv7Zx+vuxvAvYIWJ0HvHCvYLQTHgpbjJYZ3/zxJaiZ bvaK8ylLXGemUT8Jc3KemirzsaSy3/aw+8+stfQUcYNAdWh6/LBEjgqrkUOyGzxOQz4F ShhGFUJBuKPHIxZ1A3DQnnrMAXo/a4Uu0iHnt1JDNZvF4F/ZK0SOB8RVZF0rL/nDB4xb GwPg== X-Gm-Message-State: AOAM530Yp0c4TLl2E+uJTOQmbYdFnQYiEfRuAP2KYY8vpRsybVdXC1Lw 05OmYTaYGoIwvJ/JxlMyXB+/BV+UrsvLig== X-Google-Smtp-Source: ABdhPJyt3OXYGkOQBHOpDAE3KJqlrvjSYwAz6v3we/y5gh4NQx0ZH4XSUpH6FmCgB/L5luK2s7VEBQ== X-Received: by 2002:a1c:5605:: with SMTP id k5mr13245713wmb.99.1607688320488; Fri, 11 Dec 2020 04:05:20 -0800 (PST) Received: from mamamia.internal (a89-182-180-166.net-htp.de. [89.182.180.166]) by smtp.gmail.com with ESMTPSA id l1sm14552616wmi.15.2020.12.11.04.05.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Dec 2020 04:05:19 -0800 (PST) From: Andre Heider To: openwrt-devel@lists.openwrt.org Subject: [luci PATCH 06/13] rpcd-mod-luci: get rid of now unused getDSLStatus ubus rpc Date: Fri, 11 Dec 2020 13:05:06 +0100 Message-Id: <20201211120513.1130247-7-a.heider@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201211120513.1130247-1-a.heider@gmail.com> References: <20201211120513.1130247-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-20201211_070521_871656_6206EEF9 X-CRM114-Status: GOOD ( 11.14 ) 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:343 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [a.heider[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 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_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 Good riddance. Signed-off-by: Andre Heider --- libs/rpcd-mod-luci/src/luci.c | 55 ----------------------------------- 1 file changed, 55 deletions(-) diff --git a/libs/rpcd-mod-luci/src/luci.c b/libs/rpcd-mod-luci/src/luci.c index 94ccdf271..abf4b9ba5 100644 --- a/libs/rpcd-mod-luci/src/luci.c +++ b/libs/rpcd-mod-luci/src/luci.c @@ -1695,60 +1695,6 @@ rpc_luci_get_board_json(struct ubus_context *ctx, struct ubus_object *obj, return UBUS_STATUS_OK; } -static int -rpc_luci_get_dsl_status(struct ubus_context *ctx, struct ubus_object *obj, - struct ubus_request_data *req, const char *method, - struct blob_attr *msg) -{ - char line[128], *p, *s; - FILE *cmd; - - cmd = popen("/etc/init.d/dsl_control lucistat", "r"); - - if (!cmd) - return UBUS_STATUS_NOT_FOUND; - - blob_buf_init(&blob, 0); - - while (fgets(line, sizeof(line), cmd)) { - if (strncmp(line, "dsl.", 4)) - continue; - - p = strchr(line, '='); - - if (!p) - continue; - - s = p + strlen(p) - 1; - - while (s >= p && isspace(*s)) - *s-- = 0; - - *p++ = 0; - - if (!strcmp(p, "nil")) - continue; - - if (isdigit(*p)) { - blobmsg_add_u32(&blob, line + 4, strtoul(p, NULL, 0)); - } - else if (*p == '"') { - s = p + strlen(p) - 1; - - if (s >= p && *s == '"') - *s = 0; - - blobmsg_add_string(&blob, line + 4, p + 1); - } - } - - fclose(cmd); - - ubus_send_reply(ctx, req, blob.head); - return UBUS_STATUS_OK; -} - - enum { RPC_L_FAMILY, __RPC_L_MAX, @@ -1859,7 +1805,6 @@ rpc_luci_api_init(const struct rpc_daemon_ops *o, struct ubus_context *ctx) UBUS_METHOD_NOARG("getHostHints", rpc_luci_get_host_hints), UBUS_METHOD_NOARG("getDUIDHints", rpc_luci_get_duid_hints), UBUS_METHOD_NOARG("getBoardJSON", rpc_luci_get_board_json), - UBUS_METHOD_NOARG("getDSLStatus", rpc_luci_get_dsl_status), UBUS_METHOD("getDHCPLeases", rpc_luci_get_dhcp_leases, rpc_get_leases_policy) }; From patchwork Fri Dec 11 12:05:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1414872 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=mkCgKpfR; 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=UWwKrGeV; 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 4CsqKD5Lrgz9sSn for ; Fri, 11 Dec 2020 23:07:12 +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=1bX8T+U+00E4RYV4H+1OM8yChocIeUHKe0Y4jqthzWM=; b=mkCgKpfRatBuwuHaY5DTWMewr+ jme98H7lHeUBQ30QeyThVGCtoeUNBJk8GmgH/EXsKKaRttgeEkd5GuNeIq0yVdPXyM79elgJAlT5D /SZlaQqaXKFb1XRG5NEqK4ylTpispwauUk7Bk5Wqvet2jWJq17Z9r488l6WPq+DUGt3VdNZr6zlYJ j0yb3Wspp/kqv0Gs04WYCYtP/tj820QCUFs6jd9GbB1+M4wc+hKCW7injEetUEGf983cs8FlKLxXP SAhUqgd3bl8zKEFsbYZo5FNyRcBTznkN72kyEzVlAg5DzQVV0UbAGE5mSeV8mSGxkPySAd/2KHl1L rU1gFD0A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhBI-0005Rh-2g; Fri, 11 Dec 2020 12:05:52 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhAo-0005Hq-CJ for openwrt-devel@lists.openwrt.org; Fri, 11 Dec 2020 12:05:29 +0000 Received: by mail-wr1-x442.google.com with SMTP id t4so8747374wrr.12 for ; Fri, 11 Dec 2020 04:05:22 -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=9EHd0Bw9Xri+9wOSFraq1tseHYQEKPV4NzZO5cs4TW8=; b=UWwKrGeVtf52eLizTiZw0ss6WFlsC2bO6yXa9Man0+S0n9mf/PbqkBlpukRgAiHO+7 vEc6HiT6nuG0/pwzbZ5sjtStF7UlcRsm0ocGMuQpiFw4zP6rkTJanFY8QNhI0qWrEtCX r/BSFByCYgCBwiOEEidE0CIJijoLKqom5JPuwrxAjkQf1Yiqg5CfMhFmrWGeW6mC66Z/ q/BM5JxARpWfNRpyNFPc8OLX4D523tZFErcJthatzZkT26pKSHpRxzcc/BF13SeVgz2D hGYqvmuT3R4u4s1wl+HQQa0LEReyOugE4+36wuOJt/22mtF6lZW0fv1YOA51MBeDb7F4 sSXw== 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=9EHd0Bw9Xri+9wOSFraq1tseHYQEKPV4NzZO5cs4TW8=; b=rPtBJZRsMSvqcXNUfCz5urL0RGsOfEj3kvwXRPmP1Kt4SwVz3kzdvoMMTKCWUnKkXr VcVMHk9KjLzD97aCmDXCWvPQsY0bvIsMy86odnXHlDf1sI5nL0HnV3qYnPaDd+Ws19fc kZBW7tKNllqWk2MzLw95J2mkyoBfrWlxhBCG+fhmYjkvclGWAgP1ysPHvjuXoGSMRLic aGL0/kSTnNoIL15P5LOh/Ss69jY8jBQrHdJKgPqCwlvatSaqHHWZjgyqWyOQGS26c+ZB Iv1LLtTQmDi7Q+pqCTP7qgYFbzbs/JQMuPwX4v9WlnnCEkmseYknE1hGYQ5+eo+HfEuq UnEQ== X-Gm-Message-State: AOAM5339rvm48s5s9i816YRdZ7dexERR/y51ejCAV9WEF81mMnyUmJxW O/6UdW298VdGGR9kcv5Q1lSme+YDwsMdWA== X-Google-Smtp-Source: ABdhPJz4ODKa/SKRL0K/uoTiD+zL6J5yHMZhTy0KhYjXofMP9J5PXMLYvIVvGEIKxlaEGU0YFjYz1g== X-Received: by 2002:adf:e80d:: with SMTP id o13mr13520177wrm.293.1607688321231; Fri, 11 Dec 2020 04:05:21 -0800 (PST) Received: from mamamia.internal (a89-182-180-166.net-htp.de. [89.182.180.166]) by smtp.gmail.com with ESMTPSA id l1sm14552616wmi.15.2020.12.11.04.05.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Dec 2020 04:05:20 -0800 (PST) From: Andre Heider To: openwrt-devel@lists.openwrt.org Subject: [packages PATCH 07/13] prometheus-node-exporter-lua: use the new ubus dsl metrics Date: Fri, 11 Dec 2020 13:05:07 +0100 Message-Id: <20201211120513.1130247-8-a.heider@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201211120513.1130247-1-a.heider@gmail.com> References: <20201211120513.1130247-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-20201211_070522_515650_DF33316F X-CRM114-Status: GOOD ( 12.23 ) 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:442 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [a.heider[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 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_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 This is significantly faster. Signed-off-by: Andre Heider --- .../lib/lua/prometheus-collectors/ltq-dsl.lua | 108 ++++++++---------- 1 file changed, 47 insertions(+), 61 deletions(-) diff --git a/utils/prometheus-node-exporter-lua/files/usr/lib/lua/prometheus-collectors/ltq-dsl.lua b/utils/prometheus-node-exporter-lua/files/usr/lib/lua/prometheus-collectors/ltq-dsl.lua index a59c1507e..0a33fa4fd 100644 --- a/utils/prometheus-node-exporter-lua/files/usr/lib/lua/prometheus-collectors/ltq-dsl.lua +++ b/utils/prometheus-node-exporter-lua/files/usr/lib/lua/prometheus-collectors/ltq-dsl.lua @@ -1,14 +1,6 @@ -local function scrape() - local fd = io.popen("/etc/init.d/dsl_control lucistat") - local dsl_func = loadstring(fd:read("*a")) - fd:close() - - if not dsl_func then - return - end - - local dsl_stat = dsl_func() +local ubus = require "ubus" +local function scrape() local dsl_line_attenuation = metric("dsl_line_attenuation_db", "gauge") local dsl_signal_attenuation = metric("dsl_signal_attenuation_db", "gauge") local dsl_snr = metric("dsl_signal_to_noise_margin_db", "gauge") @@ -19,82 +11,76 @@ local function scrape() local dsl_error_seconds_total = metric("dsl_error_seconds_total", "counter") local dsl_errors_total = metric("dsl_errors_total", "counter") + local u = ubus.connect() + local m = u:call("dsl", "metrics", {}) + -- dsl hardware/firmware information metric("dsl_info", "gauge", { - atuc_vendor_id = dsl_stat.atuc_vendor_id, - atuc_system_vendor_id = dsl_stat.atuc_system_vendor_id, - chipset = dsl_stat.chipset, - firmware_version = dsl_stat.firmware_version, - api_version = dsl_stat.api_version, + atuc_vendor = m.atu_c.vendor, + atuc_system_vendor = m.atu_c.system_vendor, + chipset = m.chipset, + firmware_version = m.firmware_version, + api_version = m.api_version, }, 1) -- dsl line settings information metric("dsl_line_info", "gauge", { - xtse1 = dsl_stat.xtse1, - xtse2 = dsl_stat.xtse2, - xtse3 = dsl_stat.xtse3, - xtse4 = dsl_stat.xtse4, - xtse5 = dsl_stat.xtse5, - xtse6 = dsl_stat.xtse6, - xtse7 = dsl_stat.xtse7, - xtse8 = dsl_stat.xtse8, - annex = dsl_stat.annex_s, - mode = dsl_stat.line_mode_s, - profile = dsl_stat.profile_s, + annex = m.annex, + mode = m.mode, + profile = m.profile, }, 1) - -- dsl up is 1 if the line is up and running local dsl_up - if dsl_stat.line_state == "UP" then + if m.up then dsl_up = 1 else dsl_up = 0 end metric("dsl_up", "gauge", { - detail = dsl_stat.line_state_detail, + detail = m.state, }, dsl_up) -- dsl line status data - metric("dsl_uptime_seconds", "gauge", {}, dsl_stat.line_uptime) + metric("dsl_uptime_seconds", "gauge", {}, m.uptime) -- dsl db measurements - dsl_line_attenuation({direction="down"}, dsl_stat.line_attenuation_down) - dsl_line_attenuation({direction="up"}, dsl_stat.line_attenuation_up) - dsl_signal_attenuation({direction="down"}, dsl_stat.signal_attenuation_down) - dsl_signal_attenuation({direction="up"}, dsl_stat.signal_attenuation_up) - dsl_snr({direction="down"}, dsl_stat.noise_margin_down) - dsl_snr({direction="up"}, dsl_stat.noise_margin_up) - dsl_aggregated_transmit_power({direction="down"}, dsl_stat.actatp_down) - dsl_aggregated_transmit_power({direction="up"}, dsl_stat.actatp_up) + dsl_line_attenuation({direction="down"}, m.downstream.latn) + dsl_line_attenuation({direction="up"}, m.upstream.latn) + dsl_signal_attenuation({direction="down"}, m.downstream.satn) + dsl_signal_attenuation({direction="up"}, m.upstream.satn) + dsl_snr({direction="down"}, m.downstream.snr) + dsl_snr({direction="up"}, m.upstream.snr) + dsl_aggregated_transmit_power({direction="down"}, m.downstream.actatp) + dsl_aggregated_transmit_power({direction="up"}, m.upstream.actatp) -- dsl performance data - if dsl_stat.latency_down ~= nil then - dsl_latency({direction="down"}, dsl_stat.latency_down / 1000000) - dsl_latency({direction="up"}, dsl_stat.latency_up / 1000000) + if m.downstream.interleave_delay ~= nil then + dsl_latency({direction="down"}, m.downstream.interleave_delay / 1000000) + dsl_latency({direction="up"}, m.upstream.interleave_delay / 1000000) end - dsl_datarate({direction="down"}, dsl_stat.data_rate_down) - dsl_datarate({direction="up"}, dsl_stat.data_rate_up) - dsl_max_datarate({direction="down"}, dsl_stat.max_data_rate_down) - dsl_max_datarate({direction="up"}, dsl_stat.max_data_rate_up) + dsl_datarate({direction="down"}, m.downstream.data_rate) + dsl_datarate({direction="up"}, m.upstream.data_rate) + dsl_max_datarate({direction="down"}, m.downstream.attndr) + dsl_max_datarate({direction="up"}, m.upstream.attndr) -- dsl errors - dsl_error_seconds_total({err="forward error correction",loc="near"}, dsl_stat.errors_fecs_near) - dsl_error_seconds_total({err="forward error correction",loc="far"}, dsl_stat.errors_fecs_far) - dsl_error_seconds_total({err="errored",loc="near"}, dsl_stat.errors_es_near) - dsl_error_seconds_total({err="errored",loc="far"}, dsl_stat.errors_es_near) - dsl_error_seconds_total({err="severely errored",loc="near"}, dsl_stat.errors_ses_near) - dsl_error_seconds_total({err="severely errored",loc="near"}, dsl_stat.errors_ses_near) - dsl_error_seconds_total({err="loss of signal",loc="near"}, dsl_stat.errors_loss_near) - dsl_error_seconds_total({err="loss of signal",loc="far"}, dsl_stat.errors_loss_far) - dsl_error_seconds_total({err="unavailable",loc="near"}, dsl_stat.errors_uas_near) - dsl_error_seconds_total({err="unavailable",loc="far"}, dsl_stat.errors_uas_far) - dsl_errors_total({err="header error code error",loc="near"}, dsl_stat.errors_hec_near) - dsl_errors_total({err="header error code error",loc="far"}, dsl_stat.errors_hec_far) - dsl_errors_total({err="non pre-emptive crc error",loc="near"}, dsl_stat.errors_crc_p_near) - dsl_errors_total({err="non pre-emptive crc error",loc="far"}, dsl_stat.errors_crc_p_far) - dsl_errors_total({err="pre-emptive crc error",loc="near"}, dsl_stat.errors_crcp_p_near) - dsl_errors_total({err="pre-emptive crc error",loc="far"}, dsl_stat.errors_crcp_p_far) + dsl_error_seconds_total({err="forward error correction", loc="near"}, m.errors.near.fecs) + dsl_error_seconds_total({err="forward error correction", loc="far"}, m.errors.far.fecs) + dsl_error_seconds_total({err="errored", loc="near"}, m.errors.near.es) + dsl_error_seconds_total({err="errored", loc="far"}, m.errors.far.es) + dsl_error_seconds_total({err="severely errored", loc="near"}, m.errors.near.ses) + dsl_error_seconds_total({err="severely errored", loc="far"}, m.errors.far.ses) + dsl_error_seconds_total({err="loss of signal", loc="near"}, m.errors.near.loss) + dsl_error_seconds_total({err="loss of signal", loc="far"}, m.errors.far.loss) + dsl_error_seconds_total({err="unavailable", loc="near"}, m.errors.near.uas) + dsl_error_seconds_total({err="unavailable", loc="far"}, m.errors.far.uas) + dsl_errors_total({err="header error code error", loc="near"}, m.errors.near.hec) + dsl_errors_total({err="header error code error", loc="far"}, m.errors.far.hec) + dsl_errors_total({err="non pre-emptive crc error", loc="near"}, m.errors.near.crc_p) + dsl_errors_total({err="non pre-emptive crc error", loc="far"}, m.errors.far.crc_p) + dsl_errors_total({err="pre-emptive crc error", loc="near"}, m.errors.near.crcp_p) + dsl_errors_total({err="pre-emptive crc error", loc="far"}, m.errors.far.crcp_p) end return { scrape = scrape } From patchwork Fri Dec 11 12:05:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1414874 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=vlVl5Cn6; 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=Xhi/Ejff; 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 4CsqKK2NRvz9sR4 for ; Fri, 11 Dec 2020 23:07:17 +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=Kr/vl29doPtb5UQCJw0jg5/kiSOwTWsfGPGxeBzn47w=; b=vlVl5Cn60B5uwiZqwSTQ5MRyXw AnovOynQsOpzqpvbYxUt0Ww91u4JB6t4eEdFPWEzzxq8zFLSQ52T92SCP5PADvIoc9jZESJBM14qM 5K+9RJx1evnjDPWtHuRChEnVtUz8DXnhbjx68/nl6zUiXHEmbxY9A5tbrkqrp5T4kexDQhdWY33wU IpLg0B6F7d+rlu5AzbUtkkXQyiM15ZRrIE/mnaK82j42MsPcUj960KRw8K1wzUOzwMDM0s5HSOwC+ AzgsBx5SdMusGRWir7lhC1j+XyTC/4wDeOXdNpU29GfEcoFD8ixgXHx9A8Ubtp53Q8BjOO0re/0vi cKc1CzuQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhBA-0005O4-4P; Fri, 11 Dec 2020 12:05:44 +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 1knhAp-0005IC-7k for openwrt-devel@lists.openwrt.org; Fri, 11 Dec 2020 12:05:27 +0000 Received: by mail-wr1-x444.google.com with SMTP id a12so8771207wrv.8 for ; Fri, 11 Dec 2020 04:05:23 -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=tQRjCgCxeD+TobssdF5fK06sUgxBYlyXhAVtyIwOhGo=; b=Xhi/Ejffzj+WZ7CujXlV97VGF4mVSrMXBLJ1Iz3uxKQ88k81M7HD3Tw8jlXZseekBS A68mScZEhQPqDp+/Q1Se1qJL3pEgTKo6TVrItqbg7FwHE23jJ0YSI7Ak+UuwzL6UhTV1 FSpPO4FVDLVQyE8MR5MI2syJofjPQTHl7J+aPAaeT0MJmZiIUqbRGEfpH622Z34r3A0a y4PdlMgGsLEgjL/6nIA6XoA8evEVfK+N48IINtRxTcCCxdpcBLkkBfSgNCvb2uDMh51s dlIe413RTRmxAnrGgXH/emzChw3y39x0R8Icrm2RiNuaLJUWDbP00W1LPLyZCAZV1P6s S0eQ== 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=tQRjCgCxeD+TobssdF5fK06sUgxBYlyXhAVtyIwOhGo=; b=MuOo1UIoZDzLq+X3VSY8XOd8R7T8cteVOyAqFUG1tJQ0N10qu/w4EmHkxR9JEeg6x/ dbv5MHghr+XhZaVDy9VAiF4otiWmapGUztyEl33imwojcfB5adAb9XB9futgEenYiCO/ AmOEmMbfJh4VdS5XYpsKbOfuXSMPqw8OhQ3tFuyZ1vzgkK8SH4gzJ9Br/bIZaZZpl27K O7Se4GV0r5XK7esHQTQqZ15VbpJTX4tYRmsfqgf1lZ0WhiKaUm1WHJYNeFBkwvKNQzl4 15leRAtOIsGZ3k7FZXTv5FAx5Jp/vjflJD34SJRcO311sN+g+ZMBFKvdMUzCcVhakBHF CKtw== X-Gm-Message-State: AOAM531YEID0j0VDjttstgci4NgCj+sA2cyE7GkzHdftcL2x9xpKw/qT GV6cTY+SIMRuLh/M2GJVGRPOYIoZySSN5A== X-Google-Smtp-Source: ABdhPJyKgPkvSBwBoa0Sco63OfRem2+VUgSRb3mz3eIym6WVhlZ1K+osWeBrhyyUFsYz4x1gUtbtqQ== X-Received: by 2002:adf:ce0c:: with SMTP id p12mr5336870wrn.34.1607688322019; Fri, 11 Dec 2020 04:05:22 -0800 (PST) Received: from mamamia.internal (a89-182-180-166.net-htp.de. [89.182.180.166]) by smtp.gmail.com with ESMTPSA id l1sm14552616wmi.15.2020.12.11.04.05.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Dec 2020 04:05:21 -0800 (PST) From: Andre Heider To: openwrt-devel@lists.openwrt.org Subject: [PATCH 08/13] ltq-vdsl-app: use ubus to provide metrics Date: Fri, 11 Dec 2020 13:05:08 +0100 Message-Id: <20201211120513.1130247-9-a.heider@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201211120513.1130247-1-a.heider@gmail.com> References: <20201211120513.1130247-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-20201211_070523_351952_1DC39492 X-CRM114-Status: UNSURE ( 9.47 ) X-CRM114-Notice: Please train this message. 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 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [a.heider[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 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_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 now uses ubus directly, so remove 'lucistat'. For manual usage just print the ubus output, use luci for a pretty version. Signed-off-by: Andre Heider --- package/network/config/ltq-vdsl-app/files/dsl_control | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/network/config/ltq-vdsl-app/files/dsl_control b/package/network/config/ltq-vdsl-app/files/dsl_control index 5089d7ac31..54b739e2cd 100644 --- a/package/network/config/ltq-vdsl-app/files/dsl_control +++ b/package/network/config/ltq-vdsl-app/files/dsl_control @@ -4,10 +4,11 @@ START=97 USE_PROCD=1 -extra_command "dslstat" "Get DSL status information" -extra_command "lucistat" "Get status information in lua friendly format" +dslstat() { + ubus call dsl metrics +} -. /lib/functions/lantiq_dsl.sh +extra_command "dslstat" "Get DSL status information" # # ITU-T G.997.1 (06/2012) - Section 7.3.1.1.1 (xTU transmission system enabling (XTSE)) From patchwork Fri Dec 11 12:05:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1414870 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=IK1uL5Gj; 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=t5cvu1ZS; 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 4CsqKB5lZ5z9sTc for ; Fri, 11 Dec 2020 23:07:10 +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=S79m8IgxLp++CZYSqF/1C0ZNqUeV2OmflqnLPUNJxD0=; b=IK1uL5GjaP4sKmtPLT2OyRCPo2 2uCU9WxTbuZ03r3y1S/Cnlxiid3/NWYfDtQtTvHm5PKeN1/y5VqP7VZjo4J4oUE3w9xDkxNBhGyp1 tj+Ix8NIUF53sL1xAXzxEpMe8a1MD2feqgPT9upGrHXAnDyjHj08oSA/5Bv0r4sCIeSvn5GROQ5co LbZCFx16+8YJqXrPpJGwBHEdnHWRUr5yvb9fE4naTA30Q2EkMiBvDZ7KfSKhb5/7dWX83vkQmKBlW O24J4tpnRRYFOARAPVg1obZaSN0bqwjdAbTjr9ef5eKj25OxwnVdW6dBeYI9D76bBOzPSYle6GYVz uEzejFUA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhBF-0005QT-Oy; Fri, 11 Dec 2020 12:05:49 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhAq-0005Ia-6n for openwrt-devel@lists.openwrt.org; Fri, 11 Dec 2020 12:05:28 +0000 Received: by mail-wr1-x441.google.com with SMTP id r14so8785345wrn.0 for ; Fri, 11 Dec 2020 04:05:23 -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=zZP/P0RDA5XN3PxY9tK6FvgGK3mnH3a0LdZHZUEKr30=; b=t5cvu1ZScQxeW9XA0cwY6n0Ijt/2bTrvXX4UuLUIleBd96uL4LJlrKJurXg0r2B1+7 VvdfHVADlg+q46ChZMNpWabtgG+aFyCTSLoU78v7dJgYYgTHGvSFDfEwuECqZJje9rzv oaoGcqESUhbVc4W/chbr+Nog1b+Wa57uUBvH0AhtSkd+oSs8YcfLQiqxhWEvycJhDZug AovCFshW4JDRJKMGAYVi6hMRuYVI6Kfhc3AuO2rQ1p6fZpc6N5tJ++FWb8wPWFs9tNNb Sz72qxfvz6iG5JA68k/vqyQyqSQlyj+EuVQX54ICed337XqXLJ76ntocZIRwnBuKDCnh VsoQ== 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=zZP/P0RDA5XN3PxY9tK6FvgGK3mnH3a0LdZHZUEKr30=; b=B24s+2HwJcWXpM34eYGQuKQHMZ2Tr7YLBEqWj2Dj5DdQ8lpIsht8o/iAATGu0oRd8D CAjIfeG2Lgq0HEaLeKAACMNuG+jf9GdgzShh+2Ss4ZiCGVQpgPDAsBc29ICY/w/NlU63 NeaM+i0ck4qEqvdJAs7VWqBZ/UGbOo8dRVKvont6W8MbBhGtT0+E0JCaoOk2xVR82VXS mu0HZw7AMPFZVvWqUrCQsyla15GvvkqAMjSCKpwWeRYTWfq10dJVrqTO4TRGHRkTs0q9 MiPVkIymQ+YxEhVjrTlDNnM7YtOI5VL3XTU+yN9bGq3DUybTJazB7m2zvlxExmLNIX/P vnAw== X-Gm-Message-State: AOAM531/yx8wses88er9Ehc64LDiQLSWXH3juDsQyUFpIaXDfVlzGElj PCy124ZpxWzxWtzTP7i85SENYiPtCCEb4A== X-Google-Smtp-Source: ABdhPJyMuWXH3D50pS4TTGIADU2ZHX/ib0XYppnXGEEd0OauR0/+XgUeIe9DA51b3185c61T0BMNSg== X-Received: by 2002:a5d:61ca:: with SMTP id q10mr13670697wrv.124.1607688322829; Fri, 11 Dec 2020 04:05:22 -0800 (PST) Received: from mamamia.internal (a89-182-180-166.net-htp.de. [89.182.180.166]) by smtp.gmail.com with ESMTPSA id l1sm14552616wmi.15.2020.12.11.04.05.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Dec 2020 04:05:22 -0800 (PST) From: Andre Heider To: openwrt-devel@lists.openwrt.org Subject: [PATCH 09/13] ltq-adsl-app: use ubus to provide metrics Date: Fri, 11 Dec 2020 13:05:09 +0100 Message-Id: <20201211120513.1130247-10-a.heider@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201211120513.1130247-1-a.heider@gmail.com> References: <20201211120513.1130247-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-20201211_070524_309230_58AC5881 X-CRM114-Status: UNSURE ( 9.44 ) X-CRM114-Notice: Please train this message. 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:441 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [a.heider[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 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_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 now uses ubus directly, so remove 'lucistat'. For manual usage just print the ubus output, use luci for a pretty version. Signed-off-by: Andre Heider --- package/network/config/ltq-adsl-app/files/dsl_control | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/network/config/ltq-adsl-app/files/dsl_control b/package/network/config/ltq-adsl-app/files/dsl_control index 49c342d9d5..4bd6e860e8 100644 --- a/package/network/config/ltq-adsl-app/files/dsl_control +++ b/package/network/config/ltq-adsl-app/files/dsl_control @@ -4,10 +4,11 @@ START=97 USE_PROCD=1 -extra_command "dslstat" "Get DSL status information" -extra_command "lucistat" "Get status information in lua friendly format" +dslstat() { + ubus call dsl metrics +} -. /lib/functions/lantiq_dsl.sh +extra_command "dslstat" "Get DSL status information" annex_b=10_00_10_00_00_04_00_00 annex_bdmt=10_00_00_00_00_00_00_00 From patchwork Fri Dec 11 12:05:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1414879 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=WgQz2XYE; 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=qDSt5wA5; 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 4CsqKp723Mz9sR4 for ; Fri, 11 Dec 2020 23:07:42 +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=3xuxisYqTCE1AL7x9cm68X4f0GFJ8fkb6dHmZatxxfs=; b=WgQz2XYEpDQjZp9lTFxvwOkC9M GnEy26BcZ+xKzmdxqgWySPLfNklCEFgJwGldafAj+gKBlwmdZqogd4rJ1SSP0adnYJCzPnVPxj1Bz 0YLWv3iDu+Z3lkFs9OysNM4Nx2GFX7OSpJBQMLHGykiRxYLC0ZAn4O5LXMdTwwStUt+dEXULi3LIg kF+0lbc8f6HkxMaY/rIjKvuwXNL1JYmQAseRHKU+61XZizqGuU2zJ2ViJhVCnH910CJs7GNoUfTLz irJaQJR7U3WFL9R7NvJssPXxHavtFdODvSac73mR6q9S3dMTqIGqUkVarerDvl1GaQTlEWJo3LEKJ /PRuKmDQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhBc-0005b5-Gc; Fri, 11 Dec 2020 12:06:12 +0000 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhAs-0005Iy-V9 for openwrt-devel@lists.openwrt.org; Fri, 11 Dec 2020 12:05:32 +0000 Received: by mail-wr1-x42d.google.com with SMTP id a11so1047945wrr.13 for ; Fri, 11 Dec 2020 04:05:25 -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=YluvC7k1pyeuiExSMV3gxfaMvgpI3gvbp54CCMacK9o=; b=qDSt5wA5G45uTQEy54kiZl0W6xlw3JLqiOW2BSLVVe+Ib6kFotfCJFT+el2nFEHSrD W0shSAirASH3CXDUReCzF0nO0Fsijitr/bfQ33rucTob5qC5ppDEgNn7Miw5zGLh+uX/ kahzoY4PzkA/+Ve9Q8tNS/asRCJC5uxIx/Dpt/j/pEeXPW5lbhFtFSW+ppZwQAnsZFCD 1l9esdM/0uwOF2dTGhFoufwG/SMM9MNZKPRSUTbWUqBbI3WjFopiP2NGvlr3+F3mjG72 BRhYAvaQaupHdcvmpylL+XP/0JfK+4AapQRFU1LfU4Njxy3ZrJ6yI7X7ifwuDOxXy4Ah vkAw== 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=YluvC7k1pyeuiExSMV3gxfaMvgpI3gvbp54CCMacK9o=; b=iPDRFzTfONWdQ0s0o6g6ukJ5aRMbBHBF5CiSW69mFPvXQrSYlPh3090Bvsw5CwvCTI FzvRsvC11Q5msDTR0I52wiq0nLWmLYl+O1r0l/LmufIr30Ed/vpgk/gRByQUpv+MLj7I yhOdG1FvOvW68d2RCM4zlgRhjOK5LJ5rw7+PbacBTguoctZaX3T8nyu0q8w2oZn1yLeH WjR7buW3t4akU8+tjbxeF90GmDoOZKWOc+sgUueGjbR0vpIC+4Jm0SKIpGGEe05AbK1M sPYXhAsAxHz+3VJReJBzPXHQv/3Fdm2dstDz8z6Dac8r0kmYql4ugYXoRAVFQ2crg4ng 7ZWA== X-Gm-Message-State: AOAM533T/drZQ4dSBes2ksAH1UOc6RObM4aFCk9vhupJcbWKbNFp0lke 2870cAOcX6EcEazoyYjQ4yzTOrekwlZsng== X-Google-Smtp-Source: ABdhPJxlMqr5ZKB+1UYtdhyvs57nvWaxKUBFX46nySZGECWV6RN0JFvLpDLBNisJu9OYtHYSJi3m4Q== X-Received: by 2002:a5d:44c6:: with SMTP id z6mr4733661wrr.306.1607688323709; Fri, 11 Dec 2020 04:05:23 -0800 (PST) Received: from mamamia.internal (a89-182-180-166.net-htp.de. [89.182.180.166]) by smtp.gmail.com with ESMTPSA id l1sm14552616wmi.15.2020.12.11.04.05.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Dec 2020 04:05:23 -0800 (PST) From: Andre Heider To: openwrt-devel@lists.openwrt.org Subject: [PATCH 10/13] ltq-dsl-base: remove usused lantiq_dsl.sh Date: Fri, 11 Dec 2020 13:05:10 +0100 Message-Id: <20201211120513.1130247-11-a.heider@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201211120513.1130247-1-a.heider@gmail.com> References: <20201211120513.1130247-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-20201211_070527_203302_14B2936D X-CRM114-Status: UNSURE ( 9.93 ) X-CRM114-Notice: Please train this message. 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:42d listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [a.heider[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 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_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 All users have been converted to ubus. Signed-off-by: Andre Heider --- .../files/lib/functions/lantiq_dsl.sh | 749 ------------------ 1 file changed, 749 deletions(-) delete mode 100755 package/network/utils/ltq-dsl-base/files/lib/functions/lantiq_dsl.sh 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 deleted file mode 100755 index 5842a7879f..0000000000 --- a/package/network/utils/ltq-dsl-base/files/lib/functions/lantiq_dsl.sh +++ /dev/null @@ -1,749 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2012-2014 OpenWrt.org - -if [ "$( which vdsl_cpe_control )" ]; then - XDSL_CTRL=vdsl_cpe_control -else - XDSL_CTRL=dsl_cpe_control -fi - -# -# Basic functions to send CLI commands to the vdsl_cpe_control daemon -# -dsl_cmd() { - killall -q -0 ${XDSL_CTRL} && ( - lock /var/lock/dsl_pipe - echo "$@" > /tmp/pipe/dsl_cpe0_cmd - cat /tmp/pipe/dsl_cpe0_ack - lock -u /var/lock/dsl_pipe - ) -} -dsl_val() { - expr "$1" : '.*'$2'=\([-\.[:alnum:]]*\).*' -} -dsl_string() { - expr "$1" : '.*'$2'=(\([A-Z0-9,]*\))' -} - -# -# Simple divide by 10 routine to cope with one decimal place -# -dbt() { - local a=$(expr $1 / 10) - local b=$(expr $1 % 10) - echo "${a}.${b#-}" -} -# -# Take a number and convert to k or meg -# -scale() { - local val=$1 - local a - local b - - if [ "$val" -gt 1000000 ]; then - a=$(expr $val / 1000) - b=$(expr $a % 1000) - a=$(expr $a / 1000) - printf "%d.%03d Mb" ${a} ${b} - elif [ "$val" -gt 1000 ]; then - a=$(expr $val / 1000) - printf "%d Kb" ${a} - else - echo "${val} b" - fi -} - -scale_latency() { - local val=$1 - local a - local b - - a=$(expr $val / 100) - b=$(expr $val % 100) - printf "%d.%d ms" ${a} ${b} -} - -scale_latency_us() { - local val=$1 - - expr $val \* 10 -} - -# -# convert vendorid into human readable form -# -parse_vendorid() { - local val=$1 - local name - local version - - case "$val" in - B5,00,41,4C,43,42*) - name="Alcatel" - version=${val##*B5,00,41,4C,43,42,} - ;; - B5,00,41,4E,44,56*) - name="Analog Devices" - version=${val##*B5,00,41,4E,44,56,} - ;; - B5,00,42,44,43,4D*) - name="Broadcom" - version=${val##*B5,00,42,44,43,4D,} - ;; - B5,00,43,45,4E,54*) - name="Centillium" - version=${val##*B5,00,43,45,4E,54,} - ;; - B5,00,47,53,50,4E*) - name="Globespan" - version=${val##*B5,00,47,53,50,4E,} - ;; - B5,00,49,4B,4E,53*) - name="Ikanos" - version=${val##*B5,00,49,4B,4E,53,} - ;; - B5,00,49,46,54,4E*) - name="Infineon" - version=${val##*B5,00,49,46,54,4E,} - ;; - B5,00,54,53,54,43*) - name="Texas Instruments" - version=${val##*B5,00,54,53,54,43,} - ;; - B5,00,54,4D,4D,42*) - name="Thomson MultiMedia Broadband" - version=${val##*B5,00,54,4D,4D,42,} - ;; - B5,00,54,43,54,4E*) - name="Trend Chip Technologies" - version=${val##*B5,00,54,43,54,4E,} - ;; - B5,00,53,54,4D,49*) - name="ST Micro" - version=${val##*B5,00,53,54,4D,49,} - ;; - esac - - [ -n "$name" ] && { - val="$name" - - [ "$version" != "00,00" ] && val="$(printf "%s %d.%d" "$val" 0x${version//,/ 0x})" - } - - echo "$val" -} - -# -# Read the data rates for both directions -# -data_rates() { - local csg - local dru - local drd - local sdru - local sdrd - - csg=$(dsl_cmd g997csg 0 1) - drd=$(dsl_val "$csg" ActualDataRate) - - csg=$(dsl_cmd g997csg 0 0) - dru=$(dsl_val "$csg" ActualDataRate) - - [ -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 - echo "Data Rate: Down: ${sdrd}/s / Up: ${sdru}/s" - fi -} - -# -# Chipset -# -chipset() { - local vig - local cs - - vig=$(dsl_cmd vig) - cs=$(dsl_val "$vig" DSL_ChipSetType) - csfw=$(dsl_val "$vig" DSL_ChipSetFWVersion) - csapi=$(dsl_val "$vig" DSL_DriverVersionApi) - - if [ "$action" = "lucistat" ]; then - echo "dsl.chipset=\"${cs}\"" - echo "dsl.firmware_version=\"${csfw}\"" - echo "dsl.api_version=\"${csapi}\"" - else - echo "Chipset: ${cs}" - echo "Firmware Version: ${csfw}" - echo "API Version: ${csapi}" - fi -} - -# -# Vendor information -# -vendor() { - local lig - local vid - local svid - - lig=$(dsl_cmd g997lig 1) - vid=$(dsl_string "$lig" G994VendorID) - svid=$(dsl_string "$lig" SystemVendorID) - - vid=$(parse_vendorid $vid) - svid=$(parse_vendorid $svid) - - if [ "$action" = "lucistat" ]; then - echo "dsl.atuc_vendor_id=\"${vid}\"" - echo "dsl.atuc_system_vendor_id=\"${svid}\"" - else - echo "ATU-C Vendor ID: ${vid}" - echo "ATU-C System Vendor ID: ${svid}" - fi -} - -# -# XTSE capabilities -# -xtse() { - local xtusesg - local xtse1 - local xtse2 - local xtse3 - local xtse4 - local xtse5 - local xtse6 - local xtse7 - local xtse8 - - local xtse_s="" - - local annex_s="" - local line_mode_s="" - local vector_s="" - - local dsmsg="" - local cmd="" - - xtusesg=$(dsl_cmd g997xtusesg) - xtse1=$(dsl_val "$xtusesg" XTSE1) - xtse2=$(dsl_val "$xtusesg" XTSE2) - xtse3=$(dsl_val "$xtusesg" XTSE3) - xtse4=$(dsl_val "$xtusesg" XTSE4) - xtse5=$(dsl_val "$xtusesg" XTSE5) - xtse6=$(dsl_val "$xtusesg" XTSE6) - xtse7=$(dsl_val "$xtusesg" XTSE7) - xtse8=$(dsl_val "$xtusesg" XTSE8) - - # Evaluate Annex (according to G.997.1, 7.3.1.1.1) - if [ $((xtse1 & 13)) != 0 \ - -o $((xtse2 & 1)) != 0 \ - -o $((xtse3 & 12)) != 0 \ - -o $((xtse4 & 3)) != 0 \ - -o $((xtse6 & 3)) != 0 \ - -o $((xtse8 & 1)) != 0 ]; then - annex_s=" A," - fi - - if [ $((xtse1 & 48)) != 0 \ - -o $((xtse2 & 2)) != 0 \ - -o $((xtse3 & 48)) != 0 \ - -o $((xtse6 & 12)) != 0 \ - -o $((xtse8 & 2)) != 0 ]; then - annex_s="$annex_s B," - fi - - if [ $((xtse1 & 194)) != 0 \ - -o $((xtse2 & 12)) != 0 \ - -o $((xtse8 & 4)) != 0 ]; then - annex_s="$annex_s C," - fi - - if [ $((xtse4 & 48)) != 0 \ - -o $((xtse5 & 3)) != 0 \ - -o $((xtse6 & 192)) != 0 ]; then - annex_s="$annex_s I," - fi - - if [ $((xtse4 & 192)) != 0 \ - -o $((xtse7 & 3)) != 0 ]; then - annex_s="$annex_s J," - fi - - if [ $((xtse5 & 60)) != 0 ]; then - annex_s="$annex_s L," - fi - - if [ $((xtse5 & 192)) != 0 \ - -o $((xtse7 & 12)) != 0 ]; then - annex_s="$annex_s M," - fi - - annex_s=${annex_s:1} - annex_s=${annex_s%?} - - # Evaluate Line Mode (according to G.997.1, 7.3.1.1.1) - - # Regional standard: ANSI T1.413 - if [ $((xtse1 & 1)) != 0 ]; then - line_mode_s=" T1.413," - fi - - # Regional standard: TS 101 388 - if [ $((xtse1 & 1)) != 0 ]; then - line_mode_s="$line_mode_s TS 101 388," - fi - - if [ $((xtse1 & 252)) != 0 ]; then - line_mode_s="$line_mode_s G.992.1 (ADSL)," - fi - - if [ $((xtse2 & 15)) != 0 ]; then - line_mode_s="$line_mode_s G.992.2 (ADSL lite)," - fi - - if [ $((xtse3 & 60)) != 0 \ - -o $((xtse4 & 240)) != 0 \ - -o $((xtse5 & 252)) != 0 ]; then - line_mode_s="$line_mode_s G.992.3 (ADSL2)," - fi - - if [ $((xtse4 & 3)) != 0 \ - -o $((xtse5 & 3)) != 0 ]; then - line_mode_s="$line_mode_s G.992.4 (ADSL2 lite)," - fi - - if [ $((xtse6 & 199)) != 0 \ - -o $((xtse7 & 15)) != 0 ]; then - line_mode_s="$line_mode_s G.992.5 (ADSL2+)," - fi - - if [ $((xtse8 & 7)) != 0 ]; then - dsmsg=$(dsl_cmd dsmsg) - vector_s=$(dsl_val "$dsmsg" eVectorStatus) - - case "$vector_s" in - "0") line_mode_s="$line_mode_s G.993.2 (VDSL2)," ;; - "1") line_mode_s="$line_mode_s G.993.5 (VDSL2 with downstream vectoring)," ;; - "2") line_mode_s="$line_mode_s G.993.5 (VDSL2 with down- and upstream vectoring)," ;; - *) line_mode_s="$line_mode_s unknown," ;; - esac - fi - - #!!! PROPRIETARY & INTERMEDIATE USE !!! - if [ $((xtse8 & 128)) != 0 ]; then - line_mode_s="$line_mode_s G.993.1 (VDSL)," - fi - - line_mode_s=${line_mode_s:1} - line_mode_s=${line_mode_s%?} - - xtse_s="${xtse1}, ${xtse2}, ${xtse3}, ${xtse4}, ${xtse5}, ${xtse6}, ${xtse7}, ${xtse8}" - - if [ "$action" = "lucistat" ]; then - echo "dsl.xtse1=${xtse1:-nil}" - echo "dsl.xtse2=${xtse2:-nil}" - echo "dsl.xtse3=${xtse3:-nil}" - echo "dsl.xtse4=${xtse4:-nil}" - echo "dsl.xtse5=${xtse5:-nil}" - echo "dsl.xtse6=${xtse6:-nil}" - echo "dsl.xtse7=${xtse7:-nil}" - echo "dsl.xtse8=${xtse8:-nil}" - echo "dsl.xtse_s=\"$xtse_s\"" - echo "dsl.annex_s=\"${annex_s}\"" - echo "dsl.line_mode_s=\"${line_mode_s}\"" - else - echo "XTSE Capabilities: ${xtse_s}" - echo "Annex: ${annex_s}" - echo "Line Mode: ${line_mode_s}" - fi -} - -# -# Power Management Mode -# -power_mode() { - local pmsg=$(dsl_cmd g997pmsg) - local pm=$(dsl_val "$pmsg" nPowerManagementStatus); - local s; - - case "$pm" in - "-1") s="Power management state is not available" ;; - "0") s="L0 - Synchronized" ;; - "1") s="L1 - Power Down Data transmission (G.992.2)" ;; - "2") s="L2 - Power Down Data transmission (G.992.3 and G.992.4)" ;; - "3") s="L3 - No power" ;; - *) s="unknown" ;; - esac - - if [ "$action" = "lucistat" ]; then - echo "dsl.power_mode_num=${pm:-nil}" - echo "dsl.power_mode_s=\"$s\"" - else - echo "Power Management Mode: $s" - fi -} - -# -# Latency type (interleave delay) -# -latency_delay() { - local csg - - local idu - local idu_s; - local sidu - - local idd - local idd_s; - local sidd - - csg=$(dsl_cmd g997csg 0 1) - idd=$(dsl_val "$csg" ActualInterleaveDelay) - - csg=$(dsl_cmd g997csg 0 0) - idu=$(dsl_val "$csg" ActualInterleaveDelay) - - [ -z "$idd" ] && idd=0 - [ -z "$idu" ] && idu=0 - - if [ "$idd" -gt 100 ]; then - idd_s="Interleave" - else - idd_s="Fast" - fi - - if [ "$idu" -gt 100 ]; then - idu_s="Interleave" - else - 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 - echo "Latency [Interleave Delay]: ${sidd} [${idd_s}] ${sidu} [${idu_s}]" - fi -} - -# -# Errors -# -errors() { - local lsctg - local dpctg - local fecsf - local fecsn - local esf - local esn - local sesf - local sesn - local lossf - local lossn - local uasf - local uasn - - local crc_pf - local crc_pn - local crcp_pf - local crcp_pn - local hecf - local hecn - - lsctg=$(dsl_cmd pmlsctg 1) - fecsf=$(dsl_val "$lsctg" nFECS) - esf=$(dsl_val "$lsctg" nES) - sesf=$(dsl_val "$lsctg" nSES) - lossf=$(dsl_val "$lsctg" nLOSS) - uasf=$(dsl_val "$lsctg" nUAS) - - lsctg=$(dsl_cmd pmlsctg 0) - fecsn=$(dsl_val "$lsctg" nFECS) - esn=$(dsl_val "$lsctg" nES) - sesn=$(dsl_val "$lsctg" nSES) - lossn=$(dsl_val "$lsctg" nLOSS) - uasn=$(dsl_val "$lsctg" nUAS) - - dpctg=$(dsl_cmd pmdpctg 0 1) - hecf=$(dsl_val "$dpctg" nHEC) - crc_pf=$(dsl_val "$dpctg" nCRC_P) - crcp_pf=$(dsl_val "$dpctg" nCRCP_P) - - dpctg=$(dsl_cmd pmdpctg 0 0) - hecn=$(dsl_val "$dpctg" nHEC) - crc_pn=$(dsl_val "$dpctg" nCRC_P) - crcp_pn=$(dsl_val "$dpctg" nCRCP_P) - - if [ "$action" = "lucistat" ]; then - echo "dsl.errors_fecs_near=${fecsn:-nil}" - echo "dsl.errors_fecs_far=${fecsf:-nil}" - echo "dsl.errors_es_near=${esn:-nil}" - echo "dsl.errors_es_far=${esf:-nil}" - echo "dsl.errors_ses_near=${sesn:-nil}" - echo "dsl.errors_ses_far=${sesf:-nil}" - echo "dsl.errors_loss_near=${lossn:-nil}" - echo "dsl.errors_loss_far=${lossf:-nil}" - echo "dsl.errors_uas_near=${uasn:-nil}" - echo "dsl.errors_uas_far=${uasf:-nil}" - echo "dsl.errors_hec_near=${hecn:-nil}" - echo "dsl.errors_hec_far=${hecf:-nil}" - echo "dsl.errors_crc_p_near=${crc_pn:-nil}" - echo "dsl.errors_crc_p_far=${crc_pf:-nil}" - echo "dsl.errors_crcp_p_near=${crcp_pn:-nil}" - echo "dsl.errors_crcp_p_far=${crcp_pf:-nil}" - else - echo "Forward Error Correction Seconds (FECS): Near: ${fecsn} / Far: ${fecsf}" - echo "Errored seconds (ES): Near: ${esn} / Far: ${esf}" - echo "Severely Errored Seconds (SES): Near: ${sesn} / Far: ${sesf}" - echo "Loss of Signal Seconds (LOSS): Near: ${lossn} / Far: ${lossf}" - echo "Unavailable Seconds (UAS): Near: ${uasn} / Far: ${uasf}" - echo "Header Error Code Errors (HEC): Near: ${hecn} / Far: ${hecf}" - echo "Non Pre-emtive CRC errors (CRC_P): Near: ${crc_pn} / Far: ${crc_pf}" - echo "Pre-emtive CRC errors (CRCP_P): Near: ${crcp_pn} / Far: ${crcp_pf}" - fi -} - -# -# Work out how long the line has been up -# -line_uptime() { - local ccsg - local et - local etr - local d - local h - local m - local s - local rc="" - - ccsg=$(dsl_cmd pmccsg 0 0 0) - et=$(dsl_val "$ccsg" nElapsedTime) - - [ -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 - - echo "Line Uptime Seconds: ${et}" - echo "Line Uptime: ${rc}" - fi -} - -# -# Get noise and attenuation figures -# -line_data() { - local lsg - local latnu - local latnd - local satnu - local satnd - local snru - local snrd - local attndru - local attndrd - local sattndru - local sattndrd - local actatpu - local actatpd - - lsg=$(dsl_cmd g997lsg 1 1) - latnd=$(dsl_val "$lsg" LATN) - satnd=$(dsl_val "$lsg" SATN) - snrd=$(dsl_val "$lsg" SNR) - attndrd=$(dsl_val "$lsg" ATTNDR) - actatpd=$(dsl_val "$lsg" ACTATP) - - lsg=$(dsl_cmd g997lsg 0 1) - latnu=$(dsl_val "$lsg" LATN) - satnu=$(dsl_val "$lsg" SATN) - snru=$(dsl_val "$lsg" SNR) - attndru=$(dsl_val "$lsg" ATTNDR) - actatpu=$(dsl_val "$lsg" ACTATP) - - [ -z "$latnd" ] && latnd=0 - [ -z "$latnu" ] && latnu=0 - [ -z "$satnd" ] && satnd=0 - [ -z "$satnu" ] && satnu=0 - [ -z "$snrd" ] && snrd=0 - [ -z "$snru" ] && snru=0 - [ -z "$actatpd" ] && actatpd=0 - [ -z "$actatpu" ] && actatpu=0 - - latnd=$(dbt $latnd) - latnu=$(dbt $latnu) - satnd=$(dbt $satnd) - satnu=$(dbt $satnu) - snrd=$(dbt $snrd) - snru=$(dbt $snru) - actatpd=$(dbt $actatpd) - actatpu=$(dbt $actatpu) - - [ -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\"" - echo "dsl.noise_margin_down=\"$snrd\"" - echo "dsl.noise_margin_up=\"$snru\"" - echo "dsl.signal_attenuation_down=\"$satnd\"" - echo "dsl.signal_attenuation_up=\"$satnu\"" - echo "dsl.actatp_down=\"$actatpd\"" - 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 - 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" - echo "Aggregate Transmit Power (ACTATP): Down: ${actatpd} dB / Up: ${actatpu} dB" - echo "Max. Attainable Data Rate (ATTNDR): Down: ${sattndrd}/s / Up: ${sattndru}/s" - fi -} - -# -# Is the line up? Or what state is it in? -# -line_state() { - local lsg=$(dsl_cmd lsg) - local ls=$(dsl_val "$lsg" nLineState); - local s; - - case "$ls" in - "0x0") s="not initialized" ;; - "0x1") s="exception" ;; - "0x10") s="not updated" ;; - "0xff") s="idle request" ;; - "0x100") s="idle" ;; - "0x1ff") s="silent request" ;; - "0x200") s="silent" ;; - "0x300") s="handshake" ;; - "0x380") s="full_init" ;; - "0x400") s="discovery" ;; - "0x500") s="training" ;; - "0x600") s="analysis" ;; - "0x700") s="exchange" ;; - "0x800") s="showtime_no_sync" ;; - "0x801") s="showtime_tc_sync" ;; - "0x900") s="fastretrain" ;; - "0xa00") s="lowpower_l2" ;; - "0xb00") s="loopdiagnostic active" ;; - "0xb10") s="loopdiagnostic data exchange" ;; - "0xb20") s="loopdiagnostic data request" ;; - "0xc00") s="loopdiagnostic complete" ;; - "0x1000000") s="test" ;; - "0xd00") s="resync" ;; - "0x3c0") s="short init entry" ;; - "") s="not running daemon"; ls="0xfff" ;; - *) s="unknown" ;; - esac - - if [ "$action" = "lucistat" ]; then - echo "dsl.line_state_num=$ls" - echo "dsl.line_state_detail=\"$s\"" - if [ "$ls" = "0x801" ]; then - echo "dsl.line_state=\"UP\"" - else - echo "dsl.line_state=\"DOWN\"" - fi - else - if [ "$ls" = "0x801" ]; then - echo "Line State: UP [$ls: $s]" - else - echo "Line State: DOWN [$ls: $s]" - fi - fi -} - -# -# Which profile is used? -# -profile() { - local bpstg=$(dsl_cmd bpstg) - local profile=$(dsl_val "$bpstg" nProfile); - local s; - - case "$profile" in - "0") s="8a" ;; - "1") s="8b" ;; - "2") s="8c" ;; - "3") s="8d" ;; - "4") s="12a" ;; - "5") s="12b" ;; - "6") s="17a" ;; - "7") s="30a" ;; - "8") s="17b" ;; - "") s="";; - *) s="unknown" ;; - esac - - if [ "$action" = "lucistat" ]; then - echo "dsl.profile=${profile:-nil}" - echo "dsl.profile_s=\"${s}\"" - else - echo "Profile: $s" - fi -} - -dslstat() { - vendor - chipset - xtse - profile - line_state - errors - power_mode - latency_delay - data_rates - line_data - line_uptime -} - -lucistat() { - echo "local dsl={}" - dslstat - echo "return dsl" -} From patchwork Fri Dec 11 12:05:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1414880 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=M2vTBzaP; 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=d1Izd22Y; 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 4CsqKw2Gj4z9sSn for ; Fri, 11 Dec 2020 23:07:48 +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=fIkHTPQNpe4wrk0kctmkQ6Zb3b1MLNEFl+LXUdtn64M=; b=M2vTBzaPsPEaCXLtMghT30FGjJ fFN6G0dUAeW/kZuADWqmlwrnm+MNw4xYh8ord5W8bC/GuhiKBduy+ZKHslA1prugUV3jGHMH+CEkg duMCHwN+jdBnGVj5JzrknX42H8tVpzMCAHR1wLPBPTHCAdnEsz2Y6xSkzvUdKlUjmqyjcgCVGUYAS wUrwI4csB9Ws0pi+IKOI6JxS6HuPcZH3RxTTGuXNiFxL20OtzMedZQqjN0wjAYJp9QdtOfrq/3fQS LQf4WYh6PYrXtW3Ham5fjz5VgqPa59Ck/mdDmdTU21YATtmoxOSKpRRg5hDj8NXhagQRi5ISnGliu wU6nl94w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhBM-0005St-5s; Fri, 11 Dec 2020 12:05:56 +0000 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhAs-0005Iz-VD for openwrt-devel@lists.openwrt.org; Fri, 11 Dec 2020 12:05:30 +0000 Received: by mail-wr1-x42d.google.com with SMTP id i9so8782337wrc.4 for ; Fri, 11 Dec 2020 04:05:25 -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=kiUYE4uvF3yimoDLBFOkL3oseNinLeaCi1P83mkI8LI=; b=d1Izd22Y6WG2aawV6i//sdHucqyJgmcRY3NjVW2kid1qpOWFxdWDfDTPuatfyQWIsr 1EJpgb0w/HvWkRG9XAvQiOMYLUMre9/AbRHpjnp8w0UmczP3HgiLCiMHI1V6ceHYk+oc d6t3k1tpSxI3ZTE377VQDiDiqbnuFciU1vvU2iukc5jpT3kwY1zptMu8GtP3307NcfE9 KAlclp45nCSpMsWZDHl4zw6wIgvQ5pSkfj1dllKHJpbl0Jj5FERVkbMyrZrj9fzzb8eL SGMcBn2H7xSUeNcFurbHTUIZDjJMMGVz6D2bkRgyxqHm9857LgVujTRtrwE1Cwp3npZt obTQ== 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=kiUYE4uvF3yimoDLBFOkL3oseNinLeaCi1P83mkI8LI=; b=ronwZbArzt0LLPKRYqwy31Es9DWpRS1xTMtYlSZWOP64l20JIv54VSWt98Z8kvBUDv sZTKZxEo+gaD5NXZgQgTD3KXsRVeKR3f3A4gRDF+zp8K/sBJrcbNOw0B+yi39cWbwW5J jTs/UwdI8HNBn9611YxTzBL/W0qKLq5RtK2icvq2cTJ5s3BYuqSmcypUqxgetQkxQGaD LJwRqgzGmZ3q1ngw7KmgxNUVP/W5xc6ooE0lY4Fiz0MdcX1kNoSWdrwddaJxxlMH3lIy cnOryjz28kSe5XXizQXSMdwF2OidaPwJxWDNR6vLuQSQ/GkzAZA9NLv2Mx1IVyd5CJno s18g== X-Gm-Message-State: AOAM530rVjtDfbq0fHE+K9lpAB0wZt/iSXDRiQXXZk0v0AgVCS+QR7EA 2BLW79cJTVQsNRON3S+caiHW95eMPDAp6A== X-Google-Smtp-Source: ABdhPJwts9qbZ2h/hp6xCex4Qw+8ItoDGr2NnHFTKGUjm6Jh0S9B8PazN56Bx4dgGJ5wkwat9PhRLg== X-Received: by 2002:adf:e512:: with SMTP id j18mr13487129wrm.52.1607688324465; Fri, 11 Dec 2020 04:05:24 -0800 (PST) Received: from mamamia.internal (a89-182-180-166.net-htp.de. [89.182.180.166]) by smtp.gmail.com with ESMTPSA id l1sm14552616wmi.15.2020.12.11.04.05.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Dec 2020 04:05:24 -0800 (PST) From: Andre Heider To: openwrt-devel@lists.openwrt.org Subject: [PATCH 11/13] ltq-dsl-base: bump PKG_RELEASE Date: Fri, 11 Dec 2020 13:05:11 +0100 Message-Id: <20201211120513.1130247-12-a.heider@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201211120513.1130247-1-a.heider@gmail.com> References: <20201211120513.1130247-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-20201211_070527_089263_642523C0 X-CRM114-Status: GOOD ( 11.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:42d listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [a.heider[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 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_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 Signed-off-by: Andre Heider --- package/network/utils/ltq-dsl-base/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/network/utils/ltq-dsl-base/Makefile b/package/network/utils/ltq-dsl-base/Makefile index e2cfc4004c..aae07bc299 100644 --- a/package/network/utils/ltq-dsl-base/Makefile +++ b/package/network/utils/ltq-dsl-base/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ltq-dsl-base -PKG_RELEASE:=2 +PKG_RELEASE:=3 include $(INCLUDE_DIR)/package.mk From patchwork Fri Dec 11 12:05:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1414877 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=SyYIIm0t; 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=QsKCr4pV; 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 4CsqKP5Tx3z9sSn for ; Fri, 11 Dec 2020 23:07:21 +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=F0yu/UBFUT1DIp1Dpxe304SAIU+qT3ogUG2pMvAt1c4=; b=SyYIIm0tcDr4RjQePPAk3FC8oG E/oTGzsl8VrqxW+exX6KHGZtD1AyFRBGGHiRP5uHQ5wVoAFhzW4jLWbjEcXxpWDf02F/NvxR+Gi61 jNlFCtjVUUGCbzX3kZldry93fiYW2sXgjuytWAiCBKxeEz+n81o/mc6a9n4oWDHDBDtcCv3BANNbB FwTLMolFMw79GnI0aRFmBv+XyqFY6toja3LSfuXWS7hE/Rc+FqjIxpYrU0Q09dynAtXzdvibKMysq ZzvXE0okKE2toOhtlN0DXFBKgYQUimU7bd6VeAzZjTg1E93C11pdpc5hOAZbqcJZCvnNQjp6c2Mkt c1cWHM2A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhBR-0005Vj-TF; Fri, 11 Dec 2020 12:06:02 +0000 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhAt-0005JP-Aj for openwrt-devel@lists.openwrt.org; Fri, 11 Dec 2020 12:05:30 +0000 Received: by mail-wr1-x433.google.com with SMTP id i9so8782398wrc.4 for ; Fri, 11 Dec 2020 04:05:26 -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=VruJ4hmdwbdAkIB256ykQMcw9cVa0Fg1Ul7vNQ5nkFk=; b=QsKCr4pVGiWLAfDtsa7WmAIVDegBoGKIsx1NLZ5joD4vnwhRk4LZdo5GtXf8HGxTS5 pF/QjiT9P9jaBQm6RRfgub/oocEyzfJKrdolpes2fxRTdi7zvK+UaDqP4qL93p4XXPbI ajwmoZJAetSCRrsPDl/Iymykd7d2+sBHUkjZTTxRCRydpgDsHMfSAGTPPOCxwzNlbj5c bNsPkC1Tn3En8o0wkBy9kEeZt+8UXF557y5J9RutrOe+AnaNMHd/p5M0F4VLHSF5q2C9 oSVKSfr6M0B8m6lrIsrSUmc/hVRmVCA+obLd7ENvSs1uFaXn6Kn6mfiz408XN5Eplc3s 2ZkQ== 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=VruJ4hmdwbdAkIB256ykQMcw9cVa0Fg1Ul7vNQ5nkFk=; b=YHwBSTOWxqqh0aZ/xdsqKdBf21NRJVSiLkp/SaIpnIAgRvzWdoxBqRWaOv4YvzxZkX 5GgFoRqN8kS0l/B3Ag1dlEPP5uGcw79Yx5WObu+TepF/SgOzQoh1UWQYyU13A6xKWEsn SbLVzcyuSltG9bgoW6LrO7PW93rY1lcRkDoBvYU5FGDHxn8XuPf69nZEm83LF6Lu6vyS PuyJkJPybLNcvBNzcUdbYZIZTj05Pqa3V2/EFJrqTLqYYtlVERAVERNSaDsgIx6/o3QB 2sJ5KbgHPEXumj0LXM7lNsmkUfbCPldzvVljJO25/xt1YR6LHeHpD+JN3g7aOJhblCIA 9Ajg== X-Gm-Message-State: AOAM530b/wtR6SxN0kVxoPaUw/RtYmOicDNPN7YjfN2DqTV1FPq9s2Yz v7reQwocGZNnA65yEwcdA1pDoqF+yrEYUA== X-Google-Smtp-Source: ABdhPJzdI/O6fgGunJhiPP13NqFVWq4yvA0QucskbweQGg5n+GL5lOP6M3d7vBo0jwLyUli5zt+/Wg== X-Received: by 2002:a5d:4683:: with SMTP id u3mr13746831wrq.19.1607688325688; Fri, 11 Dec 2020 04:05:25 -0800 (PST) Received: from mamamia.internal (a89-182-180-166.net-htp.de. [89.182.180.166]) by smtp.gmail.com with ESMTPSA id l1sm14552616wmi.15.2020.12.11.04.05.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Dec 2020 04:05:24 -0800 (PST) From: Andre Heider To: openwrt-devel@lists.openwrt.org Subject: [PATCH 12/13] ltq-vdsl-app: bump PKG_RELEASE Date: Fri, 11 Dec 2020 13:05:12 +0100 Message-Id: <20201211120513.1130247-13-a.heider@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201211120513.1130247-1-a.heider@gmail.com> References: <20201211120513.1130247-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-20201211_070527_485113_FE12AA0F X-CRM114-Status: GOOD ( 11.18 ) 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:433 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [a.heider[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 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_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 Signed-off-by: Andre Heider --- package/network/config/ltq-vdsl-app/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/network/config/ltq-vdsl-app/Makefile b/package/network/config/ltq-vdsl-app/Makefile index 5a84ea8e7e..48aa6b70c8 100644 --- a/package/network/config/ltq-vdsl-app/Makefile +++ b/package/network/config/ltq-vdsl-app/Makefile @@ -9,7 +9,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ltq-vdsl-app PKG_VERSION:=4.17.18.6 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_BASE_NAME:=dsl_cpe_control PKG_SOURCE:=$(PKG_BASE_NAME)_vrx-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources From patchwork Fri Dec 11 12:05:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1414875 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=oiY5/H4B; 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=mVrcIhti; 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 4CsqKK5Jx8z9sSn for ; Fri, 11 Dec 2020 23:07:17 +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=ciGF2PBpQjyoOjOQ7pkQi9zV7qprPu8ne8jgEbKayrs=; b=oiY5/H4BDdIvBEbQHtm0cdktoQ MVneqBU03sfcHvpXZwo5VH13DAFcy+myuAG8+8n9dEfVP1QmS8lkVXjyVVWsj+LpFTzY9571M46Zt c5Ld1v114skHlyT+Cey48j2EG06TvdfxZ8+G4TK9W6jgkZiIVuGSzwYu3tnnfh5yHR2Y6pmwvQpNO qZ+NOOsDFTuXdq9uqlKvkXoherTZECnUMALvA/DxmTGUP6UmkppgOsYWBVupZMicGi9brMqgwCJi4 LpD0nYCWXmc4Ly6DJIpM7golfxiaJg359GeUeT7ZnPg294iwhLAsBqHvYGvjIpkTKnb1H8WPEGd/a tUfufpMw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhBX-0005YC-G7; Fri, 11 Dec 2020 12:06:07 +0000 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1knhAu-0005JU-6n for openwrt-devel@lists.openwrt.org; Fri, 11 Dec 2020 12:05:31 +0000 Received: by mail-wr1-x42f.google.com with SMTP id a12so8771481wrv.8 for ; Fri, 11 Dec 2020 04:05:27 -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=Ogh6dp+oMLgGfwARFcX8zgN2IM4aWDAwigt4hEZHAZU=; b=mVrcIhtiyAfQuw675tkVZZXh/lhF3K9GOg43w7saIQk5sCcunG2zItoOUtngt01wNr Q7khczb6o+LDFhFOUMJd9iAJ6TZFz3fgcfuSyyPEhmCS5k5mKnHRu9Nhh79asJOpCkQX V+2zPF1a+eAYr418oLBXrBDKlbx500QBqOSNLM5p+ppiLBxdZzmRJyrHXX2hdKwniq2m zsihyZVf9pBtsJc7koE0P1Xdar+nVeHHrKn5V253Y1F4jDunQJpp6tYNnWN7vVNjNz8I heV9OfJnYafSP39DYR2/d2lxjjgH7e+agiBEmgfr0EmQA/LtMzCPg/F8WX+r+GdWp3v1 HIyA== 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=Ogh6dp+oMLgGfwARFcX8zgN2IM4aWDAwigt4hEZHAZU=; b=Jc5Mbb9pVGO57Mnf4pb6T/g8hN9lFVNZa2ORpdKOeFuv9xlOabj3Z0TmMQHG6g5GUK ET9c0/h65xreef/RG/X9wYpsATNSl9w1k+kic/vdj3v582OLK43IVD/HDeYNBX2BVUnJ FL/xERj9AIl/ez72r0yisE8gzWl3zixMVPG8ken8RZffC12rLFTJefUiRcF8BLAUsyZD j2Q7Qgk6j2u3xh82EXoE/dGsn4oxF8qOtgWQn1EcjoWGo16fmkycRGN4k0pPmnhTAy7P ub1J+i/52Gn0SjC2dFVIHsaTBCGL8ZbcPgoJ1J9cJzku7191qq9blk2ZyuuEt6k0btTl tP0w== X-Gm-Message-State: AOAM5336eBEqCT9s67IZZEoD/sH2gYv5i0v3rc6j5Yy17jb4sBs293Qd jMfgDVQHm3NySll2Zv1szmsz9W+SL51IKQ== X-Google-Smtp-Source: ABdhPJyQPPKtqmRh6MAaewC7R1n2x/BiTvE82TnuxyjpKLUv6+JjnvrwvzXjlr2SYvYYbVnyCUj9pA== X-Received: by 2002:a5d:618c:: with SMTP id j12mr13483034wru.182.1607688326384; Fri, 11 Dec 2020 04:05:26 -0800 (PST) Received: from mamamia.internal (a89-182-180-166.net-htp.de. [89.182.180.166]) by smtp.gmail.com with ESMTPSA id l1sm14552616wmi.15.2020.12.11.04.05.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Dec 2020 04:05:26 -0800 (PST) From: Andre Heider To: openwrt-devel@lists.openwrt.org Subject: [PATCH 13/13] ltq-adsl-app: bump PKG_RELEASE Date: Fri, 11 Dec 2020 13:05:13 +0100 Message-Id: <20201211120513.1130247-14-a.heider@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201211120513.1130247-1-a.heider@gmail.com> References: <20201211120513.1130247-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-20201211_070528_410368_357D57FC X-CRM114-Status: GOOD ( 11.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:42f listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [a.heider[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 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_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 Signed-off-by: Andre Heider --- package/network/config/ltq-adsl-app/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/network/config/ltq-adsl-app/Makefile b/package/network/config/ltq-adsl-app/Makefile index e03c0911a5..317f8a908a 100644 --- a/package/network/config/ltq-adsl-app/Makefile +++ b/package/network/config/ltq-adsl-app/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=dsl_cpe_control_danube PKG_VERSION:=3.24.4.4 -PKG_RELEASE:=9 +PKG_RELEASE:=10 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/dsl_cpe_control-$(PKG_VERSION) PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources/