From patchwork Wed Nov 4 22:52:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Bauer X-Patchwork-Id: 1394693 X-Patchwork-Delegate: mail@david-bauer.net 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=none (p=none dis=none) header.from=david-bauer.net 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=r1XfWbA3; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256 header.s=casper.20170209 header.b=WVyX73Z8; 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 4CRVn55lv0z9sSs for ; Thu, 5 Nov 2020 15:25:28 +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: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:In-Reply-To:References:List-Owner; bh=dnWpHiqshC/l00DOURikrojBMuWGPzmXMwxyaY+MUJ4=; b=r1XfWbA3TIKJM6Q0e99LyBWG0b Ddd22LHxvtCKU1cnc7gMQBOFjpQEfCh//hQDsAYlTitIah5GT70SEPa3p4NL+/er9dzlAenQ0oSny zZGae3joJNqae6WaqAqIYzcjKQS81yjn8J72co4py4baWeWkWmuub/+Q/hUIgogah8GOnKoDdq/rl 1SHba6Q2Cs/qmvQURwYen7vUW6mSpaQk9p/FfArJJ8QszRMEP/qBC5MwVxN/e3SbnBsBSMFeqGECi 2KgbncfpV8cS0fMbVDFAoI6qFFVGFXqXGwDeXMy86UdrWIyiwL/926hcwSaZE1ebLbimZteTKRMVp 7pBsGPMw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaWo8-0006a9-Vn; Thu, 05 Nov 2020 04:23:33 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaW5s-00016k-DA for openwrt-devel@merlin.infradead.org; Thu, 05 Nov 2020 03:37:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:In-Reply-To:References; bh=ZovqUnz9vCc9wYTVco7hLgErz8L0b9d5kO4NF4IRc3Y=; b=WVyX73Z8zGq7aX6pqn3X4O6thm vsrQuiQ9hi7+LIkMeVqRwzc6rx1LC2wOTRopw8yAgucLtWJ05hRAAwoJLm4dBO5bmu/S7FM4NxjxS o86elFatUJOuN2Mo5B121u5lXgKD5WEEpmZ90+z6P0nb0wmJ4v8tCiv0FkDAPiKUctGuRQKabtyRT rZ/eO1U5KuDeXDDEBA7VI+ZTA/SwUgbJqgIva3Cdcpf4s7T4/GIj5TdtQ0tl9KCR8zOSJsWjZFBBu 0OzTF+xstfnmu0pCs5ObQb+RRiPp0qf07oQ3578LYdVtSjto0AwA+WGdyE4l3GQeZj/R2SljOSaVf XFjpArXQ==; Received: from mars.blocktrron.ovh ([2001:41d0:401:3000::cbd] helo=mail.blocktrron.ovh) by casper.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaReY-0001c1-DE for openwrt-devel@lists.openwrt.org; Wed, 04 Nov 2020 22:53:21 +0000 Received: from localhost.localdomain (p200300e53f09910071ed4fe20973e1a4.dip0.t-ipconnect.de [IPv6:2003:e5:3f09:9100:71ed:4fe2:973:e1a4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.blocktrron.ovh (Postfix) with ESMTPSA id DFE8F1E379 for ; Wed, 4 Nov 2020 23:53:10 +0100 (CET) From: David Bauer To: openwrt-devel@lists.openwrt.org Subject: [PATCH 1/3] hostapd: ubus: add driver information to client list Date: Wed, 4 Nov 2020 23:52:58 +0100 Message-Id: <20201104225300.28283-1-mail@david-bauer.net> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201104_225318_691086_002BA829 X-CRM114-Status: GOOD ( 10.35 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.4 on casper.infradead.org summary: Content analysis details: (-1.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 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 adds information from mac80211 to hostapd get_client ubus function. This way, TX as well as RX status information as well as the signal can be determined. Signed-off-by: David Bauer --- .../services/hostapd/src/src/ap/ubus.c | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/package/network/services/hostapd/src/src/ap/ubus.c b/package/network/services/hostapd/src/src/ap/ubus.c index 33b9995e06..3bad4d2e0f 100644 --- a/package/network/services/hostapd/src/src/ap/ubus.c +++ b/package/network/services/hostapd/src/src/ap/ubus.c @@ -215,6 +215,7 @@ hostapd_bss_get_clients(struct ubus_context *ctx, struct ubus_object *obj, struct blob_attr *msg) { struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj); + struct hostap_sta_driver_data sta_driver_data; struct sta_info *sta; void *list, *c; char mac_buf[20]; @@ -257,6 +258,29 @@ hostapd_bss_get_clients(struct ubus_context *ctx, struct ubus_object *obj, if (retrieve_sta_taxonomy(hapd, sta, r, 1024) > 0) blobmsg_add_string_buffer(&b); #endif + + /* Driver information */ + if (hostapd_drv_read_sta_data(hapd, &sta_driver_data, sta->addr) >= 0) { + r = blobmsg_open_table(&b, "bytes"); + blobmsg_add_u64(&b, "rx", sta_driver_data.rx_bytes); + blobmsg_add_u64(&b, "tx", sta_driver_data.tx_bytes); + blobmsg_close_table(&b, r); + r = blobmsg_open_table(&b, "airtime"); + blobmsg_add_u64(&b, "rx", sta_driver_data.rx_airtime); + blobmsg_add_u64(&b, "tx", sta_driver_data.tx_airtime); + blobmsg_close_table(&b, r); + r = blobmsg_open_table(&b, "packets"); + blobmsg_add_u32(&b, "rx", sta_driver_data.rx_packets); + blobmsg_add_u32(&b, "tx", sta_driver_data.tx_packets); + blobmsg_close_table(&b, r); + r = blobmsg_open_table(&b, "rate"); + /* Rate in kbits */ + blobmsg_add_u32(&b, "rx", sta_driver_data.current_rx_rate * 100); + blobmsg_add_u32(&b, "tx", sta_driver_data.current_tx_rate * 100); + blobmsg_close_table(&b, r); + blobmsg_add_u32(&b, "signal", sta_driver_data.signal); + } + blobmsg_close_table(&b, c); } blobmsg_close_array(&b, list);