From patchwork Tue Jan 26 08:00:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1431575 X-Patchwork-Delegate: hauke@hauke-m.de 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; 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=BdxIAjwP; 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=FtYLpc61; 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 4DPzkc3Wvbz9sWH for ; Tue, 26 Jan 2021 19:03:18 +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=J+wuAsUP3yS5oGdxTPPVecP7t4v6smwGLD91mn+0Ot4=; b=BdxIAjwPIlg9DDYioYn0VEBD4B 6i+NIRce1q+KRcpCQ71sktXWiDdVFLkFwTANW5wOV4Ij90mKdl+5bECw1wGH4uMhb1zb3kloGOwJp NYmyS3xMcykVH0wrjxpRGJKLKCaYcXpCh0GbHkNfuOQX+0vAa5u33FZfuJ1mUTMr1vGaX0zg2ouCw g1YTGHAGizEYvoN1IRmRTs+2UGf4/RC07b87Lk0nNpuABRPbEmNRCP8RhtOWK+3x0hj6fZ45iIAZL uplxZyWU0XISKa2AzGJB9Bt1dAOiP05uSNCEIm+CmVdnBYT9S4HYFxyPP1Uv6YfCS5VRSHqlLVnRa unS2GWug==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l4JHf-0005Yq-UC; Tue, 26 Jan 2021 08:01:08 +0000 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l4JHZ-0005WA-Gn for openwrt-devel@lists.openwrt.org; Tue, 26 Jan 2021 08:01:03 +0000 Received: by mail-ej1-x631.google.com with SMTP id g3so21686695ejb.6 for ; Tue, 26 Jan 2021 00:01:00 -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=IpP64Ph41zwNxTFmn8SoKKyhr6C29IDZTwy8jIMhVKE=; b=FtYLpc61kMSAAKqGM4mIAL0T1nTye0JfP4TJAOvr6vNWBS5jG2HZEozzulK5IJmJSN megNvepEw5xWjVnIrJn6WbnnG0GV1Cw8LEHSPqUjavphAp0N7HpUANJRwgHUp1Qzwnn6 vLcT0dnMiLVUnxcKA20+C0hX03GdQ3LgVGWpdr8G3aeTMURVvlpmFO/y5OnxCjyGH/7T uOA+HTIRQA53XxWJSWQ1hBrqJ07rUY6yphDOmTjJei+XTwWhlaTlr6jQNyISwEYc0QcT NMSIHd/ilc6pt31Vhq2zYD21eJSrbPs8pWRcdcPplrxXf4+ksDAQGqu7eAnjXOQWOr8j UN5A== 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=IpP64Ph41zwNxTFmn8SoKKyhr6C29IDZTwy8jIMhVKE=; b=sOxFkBUHT/OHMaB+mzzNLkoLmwBqFb2OCkXRUbAi07rXdlEQsIbQlA9QlJgZ+Goq6g dZYiRbJnoieS8dbAoOuXF6tc5R75cknSmFLzQNk0uLVwgthbv4QwqFx0f4B8XfvlX+IN XR4+D+qDglNx6Y2wx1JtI5RHVUveN2zpE8W6KuXToflg8RSGf6+uxFeIBfNHGgyno5YN 1OYXay/Kamu9vk6P4G2oDnFGZeivWgOFDIL4LnJ7BTlpRRlXFn8iXiIPutIS+wLdfX+c UPkzHFruyzPjWBNZfB0pBMWtKOSEMiL0dIkg1mLNyjpG0rvHIRxWANseXHInHmGTFFTm Y8BQ== X-Gm-Message-State: AOAM5318LIsJ3Zlnsjead3KeL8nSSHh0d09R/qQy0VjY/IyQkd7z0zU7 aNHLU8zYXOxVy8Xqln5YyMeO1CLYI52XMAqD X-Google-Smtp-Source: ABdhPJyxtRrHoEb8yl+CO81AsErP1n6+W/BgzsuKARgpufGl+NkOmocw2T9llM1gxLvpU9j1zd6OfA== X-Received: by 2002:a17:906:30c4:: with SMTP id b4mr2697890ejb.456.1611648059296; Tue, 26 Jan 2021 00:00:59 -0800 (PST) Received: from mamamia.internal (a89-182-168-222.net-htp.de. [89.182.168.222]) by smtp.gmail.com with ESMTPSA id s18sm12244813edw.66.2021.01.26.00.00.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jan 2021 00:00:58 -0800 (PST) From: Andre Heider To: openwrt-devel@lists.openwrt.org Subject: [PATCH v3 3/6] ltq-adsl-app: add ubus support to get metrics Date: Tue, 26 Jan 2021 09:00:49 +0100 Message-Id: <20210126080052.750121-4-a.heider@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210126080052.750121-1-a.heider@gmail.com> References: <20210126080052.750121-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-20210126_030101_624197_CA90731C X-CRM114-Status: GOOD ( 15.05 ) 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:631 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_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -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 | 7 ++- .../ltq-adsl-app/patches/300-ubus.patch | 50 +++++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 package/network/config/ltq-adsl-app/patches/300-ubus.patch diff --git a/package/network/config/ltq-adsl-app/Makefile b/package/network/config/ltq-adsl-app/Makefile index cfd66d0ee4..d388c43ffb 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 @@ -75,6 +75,11 @@ CONFIGURE_ARGS += \ TARGET_CFLAGS += -I$(LINUX_DIR)/include +define Build/Prepare + $(call Build/Prepare/Default) + $(CP) ../ltq-vdsl-app/src/src/dsl_cpe_ubus.c $(PKG_BUILD_DIR)/src/ +endef + define Package/ltq-adsl-app/install $(INSTALL_DIR) $(1)/etc/init.d $(1)/sbin $(1)/etc/hotplug.d/dsl $(INSTALL_BIN) ./files/dsl_control $(1)/etc/init.d/ 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)