From nobody Wed Feb 19 02:57:27 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YyLfJ5qFMz5nbbg; Wed, 19 Feb 2025 02:57:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YyLfJ10N8z3Jvx; Wed, 19 Feb 2025 02:57:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739933848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FD4qYU7QtqQ7NCBkbIiwmFE4IaUo8seOfNIpPzDuT98=; b=fDgDjMFsU/lrHJEjvxAft9GUxx1xclXLpNaqPXoVEUvPv6WR1N4rwQCkaX/CjXK9VgmbtS LpWF9oRu38WSztmAYSXLUGvDTA+N/kUP8+2O0oci+lGVl/5I7rbTBFL99lwm3FUerP86Uc q/gLe5RLsugCrmPaMgqm9yyVoanVfckkDukrgQjODpHDAvRmnNbJdf15cVjEOUx8iZefpd AZRsYOBKrRPy16oLBPEZQ8AXoMCvxGC5YltNNLqF5bv3JXl+Iwogah363cu6TNh3VZAq+s y3VA/0HD+T66LAVWPXX9BxNmTxR7YxRZbPRMHJOKzCWmLam5HgK4p1/Wl12zhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739933848; a=rsa-sha256; cv=none; b=kKA2a3WA79jrhZaLv6MlmZq0XZdnG5SAnB91EBDNiJFVpQQ/h0YjaCHXn/+fjflcGlfzL5 w60gjBYpSsR7tmjquASJBbB3sTPNdIsnBqTVzZn19bK3VxlMC6o6YglziKjfGUVwa/zYuc tKleZz2kA1sW3Efw+17jIqRkzJMzT2dTaquxo6m9QOPnpKTxSPDSreJrNpDQNCZ2mQtJzk K1JXiOx3pYTfZx7aECnPspaOZt8AfF9m5YpeluZpa5Jmj5brZSq+4rcROabeVlmXmZ1gPt syY17nHrQK/u7sWZkcv40T1ZQ6tH5Tb1P+m62NklpGRsT9yC5dxU9bDuMkoZIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739933848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FD4qYU7QtqQ7NCBkbIiwmFE4IaUo8seOfNIpPzDuT98=; b=VLpxcHMmqozq3tYVyMB56Paz7oUfJjgr1wiES2fUvZ1CQrsMw5dm616FOcX7ScGRw8XA9H Z1jWXC0K8z0lCYo1jHFnKlZsPICXUMD0IBAqXWSjSTi2A6gZECAzIc32B7dwpqGdKPQ8yP btTxU7axCAl4sOQUYB1x5VwX3ssw6pJylzzglzKXHgn11kMuAQIEQiixEY9pXSa4/g+idc aBIBFuaLEKqGlZDIRywiEzVLSo6EcPUVTZjy3zaQYlN7sErYpKbG+st4iJ2NyeNItknpCG llMqDz+cxdbrL+QLbYaAk/6mKPOcLV4UGHLQT/iqxMnHB/FknhKsFRWJNYRQqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YyLfJ0bcczn9W; Wed, 19 Feb 2025 02:57:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51J2vRi8049770; Wed, 19 Feb 2025 02:57:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51J2vRTI049767; Wed, 19 Feb 2025 02:57:27 GMT (envelope-from git) Date: Wed, 19 Feb 2025 02:57:27 GMT Message-Id: <202502190257.51J2vRTI049767@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 61ce42253180 - main - wlanstats: move from tools to usr.sbin List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61ce422531805307d413bf04c9ad1aabd7f3a879 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=61ce422531805307d413bf04c9ad1aabd7f3a879 commit 61ce422531805307d413bf04c9ad1aabd7f3a879 Author: Bjoern A. Zeeb AuthorDate: 2025-02-19 02:50:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-19 02:56:59 +0000 wlanstats: move from tools to usr.sbin wlanstats is an incredible tool to get a quick overview of state of affairs of wireless by looking at the counters. And it makes it simple. Having landed the LinuxKPI HW_CRYPTO bits I was asked by users what to check and I realised the answer is in wlanstats. It is annoying even as a developer to manually build it for each installation but given it's also useful to users and support make it available with the general installation. Probably very long overdue. Adjust the Makefile and make build again on main. Hook it up to the build conditional on MK_WIRELESS. Discussed with: adrian Sponsored by: The FreeBSD Foundation TODO: man page MFC after: 3 days --- tools/tools/net80211/wlanstats/Makefile | 13 ------------- usr.sbin/Makefile | 1 + usr.sbin/wlanstats/Makefile | 14 ++++++++++++++ {tools/tools/net80211 => usr.sbin}/wlanstats/main.c | 0 {tools/tools/net80211 => usr.sbin}/wlanstats/wlanstats.c | 6 +++--- {tools/tools/net80211 => usr.sbin}/wlanstats/wlanstats.h | 0 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/tools/tools/net80211/wlanstats/Makefile b/tools/tools/net80211/wlanstats/Makefile deleted file mode 100644 index f3b6f718d44e..000000000000 --- a/tools/tools/net80211/wlanstats/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -.include - -PROG= wlanstats -BINDIR= /usr/local/bin -MAN= -LIBADD= bsdstat -CFLAGS+=-I${.CURDIR}/../../../../lib/libbsdstat/ - -SRCS= wlanstats.c main.c - -CFLAGS.clang+= -fbracket-depth=512 -Wno-cast-align - -.include diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 3904594bb2d9..a35c34ee23fc 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -207,6 +207,7 @@ SUBDIR.${MK_UTMPX}+= ac SUBDIR.${MK_UTMPX}+= lastlogin SUBDIR.${MK_UTMPX}+= utx SUBDIR.${MK_WIRELESS}+= wlandebug +SUBDIR.${MK_WIRELESS}+= wlanstats SUBDIR.${MK_WIRELESS}+= wpa SUBDIR.${MK_TESTS}+= tests diff --git a/usr.sbin/wlanstats/Makefile b/usr.sbin/wlanstats/Makefile new file mode 100644 index 000000000000..d6d29dcc57ad --- /dev/null +++ b/usr.sbin/wlanstats/Makefile @@ -0,0 +1,14 @@ +.include + +PROG= wlanstats +MAN= + +CFLAGS= -I${SRCTOP}/lib/libbsdstat +LIBADD= bsdstat + +SRCS= main.c \ + wlanstats.c + +CFLAGS.clang+= -fbracket-depth=512 + +.include diff --git a/tools/tools/net80211/wlanstats/main.c b/usr.sbin/wlanstats/main.c similarity index 100% rename from tools/tools/net80211/wlanstats/main.c rename to usr.sbin/wlanstats/main.c diff --git a/tools/tools/net80211/wlanstats/wlanstats.c b/usr.sbin/wlanstats/wlanstats.c similarity index 99% rename from tools/tools/net80211/wlanstats/wlanstats.c rename to usr.sbin/wlanstats/wlanstats.c index 74b1e7ffc989..8795333ccb17 100644 --- a/tools/tools/net80211/wlanstats/wlanstats.c +++ b/usr.sbin/wlanstats/wlanstats.c @@ -50,7 +50,7 @@ #include #include -#include "../../../../sys/net80211/ieee80211_ioctl.h" +#include "../../sys/net80211/ieee80211_ioctl.h" #include "wlanstats.h" @@ -460,8 +460,8 @@ getlladdr(struct wlanstatfoo_p *wf) if (p == NULL) errx(1, "did not find link layer address for interface %s", wf->ifr.ifr_name); - sdl = (const struct sockaddr_dl *) p->ifa_addr; - IEEE80211_ADDR_COPY(wf->mac, CLLADDR(sdl)); + sdl = (const struct sockaddr_dl *)(const void *)p->ifa_addr; + IEEE80211_ADDR_COPY(wf->mac, sdl->sdl_data + sdl->sdl_nlen); freeifaddrs(ifp); } diff --git a/tools/tools/net80211/wlanstats/wlanstats.h b/usr.sbin/wlanstats/wlanstats.h similarity index 100% rename from tools/tools/net80211/wlanstats/wlanstats.h rename to usr.sbin/wlanstats/wlanstats.h