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