From nobody Thu Mar 23 00:17:28 2023 X-Original-To: dev-commits-src-all@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 4PhmBJ5sT4z41VCG; Thu, 23 Mar 2023 00:17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PhmBJ56Vjz41qG; Thu, 23 Mar 2023 00:17:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679530648; 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=SGfXfaRKcVQxGQCF1djYPLpYthQGe9F4iZTJnzqQUrM=; b=RrkRcwATsQJivzhX55qp55F8xoBVsnZf233RnHu6HmSNZylKQehjph8lxAVB1ZPX7+QyP3 z9XgeuwA3rVNlvjILehjA0VcuzJB8n7Em40ImsLVTPiSCj38VE3uuSI11EG9o46jFMVVUC uHAYVISY2TWxbSlysnK6Fh26YYDHTuKj8Zw5KdhhytcRZZDqygIIAcmNmC8J8qz/pqTlLP sKWHfEuryQATpK0LIViORyXRqUt0dCEzxUsCTOdmKVrzTb8BhCsg686HRPsFm9HvYGRJFv s8mph6uhmib+psTlVgCrLrf9f1F8ebbAwrtjz8YxGhDLHNpg9rCt5Q/LGT7tGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679530648; 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=SGfXfaRKcVQxGQCF1djYPLpYthQGe9F4iZTJnzqQUrM=; b=NES1uCcZ5zBrDvqt7E6fk9Zc0xu5hRMEQwiGtVFuzbf7VN3Pz5wiMiE5SmEiOp1AH6yl35 FkGzzJesp7HiL4gxLfBwXVidt4/iePWaTTtn7yMjWDz6mYRAsR3FYoha78HWQzjUofaBeH /7XP5UkujTp44YwkPMBv6+CMYHaXRnNBE1rIpV3b4bH0+SC/S2CBCq9OmUBrIX3QfyzM8Q L/G/hDPIjy7uIHdYkwVXEcvSjgNlN5Z/0Xj2WnuZD18cHgpfMP9jKEEpmbV2upl11HOC9j vmi8qtcTkFWHjANcDiP6czPZEzbw9cWoqKt0vzNl4oe+1Vv/pcxmy7qQFi4mNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679530648; a=rsa-sha256; cv=none; b=AZxrUB8sLjDm+7UKSE0D7feioyNem5mwKYrNtax3RvACv0yLR6msFpWnGskvTdaCeEkjU+ fyHOj9dSc91ZPTf5ND5K/S13hzpzet1lUGKnQ65cD0g4A9xI7eGwlaGK9qDuOv/EpVhMOR 6q8u09e45h86OEsByjkTh0r9aBRHLbcGq47yPFWcmICYQp0K1KXSQ9PACaWNoPlr3op9hc 0+n9CiBwGSkoM0hCTekT+XgLHHbz22vrXLkGW3wZqIP8S73g2YgMRkCn6edAxad3LJNCVG Flb1P9xyQClD20ovA5VqduLytk/RBMT2OF7MTEA2Q5weVMairQt6poKDi5dsHw== 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 4PhmBJ3sglzFNF; Thu, 23 Mar 2023 00:17:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32N0HStp082181; Thu, 23 Mar 2023 00:17:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32N0HSp2082180; Thu, 23 Mar 2023 00:17:28 GMT (envelope-from git) Date: Thu, 23 Mar 2023 00:17:28 GMT Message-Id: <202303230017.32N0HSp2082180@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: e091be417add - main - ifconfig: ifieee80211: print bssid name List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: e091be417add7e9130653462012a9ab2f4fb5269 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e091be417add7e9130653462012a9ab2f4fb5269 commit e091be417add7e9130653462012a9ab2f4fb5269 Author: Bjoern A. Zeeb AuthorDate: 2023-03-21 21:25:28 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-03-23 00:15:15 +0000 ifconfig: ifieee80211: print bssid name In certain setups (e.g., autonomous APs) it is extremly helpful to have a way to map the BSSIDs to names for both normal status output as well as the scan list. This often allows a quicker overview than remembering (or manually looking up) BSSIDs. Call ether_ntohost() on the bssid and consult /etc/ethers and print "(name)" after the bssid for the status output and "(name)" at the end of the line after the IE list. MFC after: 10 days Reviewed by: adrian, cy Differential Revision: https://reviews.freebsd.org/D39192 --- sbin/ifconfig/ifieee80211.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c index cb465a02b794..065a141da0f1 100644 --- a/sbin/ifconfig/ifieee80211.c +++ b/sbin/ifconfig/ifieee80211.c @@ -3716,6 +3716,17 @@ printmimo(const struct ieee80211_mimo_info *mi) mi->ch[3].noise[0]); } +static void +printbssidname(const struct ether_addr *n) +{ + char name[MAXHOSTNAMELEN + 1]; + + if (ether_ntohost(name, n) != 0) + return; + + printf(" (%s)", name); +} + static void list_scan(int s) { @@ -3767,6 +3778,7 @@ list_scan(int s) ); printies(vp + sr->isr_ssid_len + sr->isr_meshid_len, sr->isr_ie_len, 24); + printbssidname((const struct ether_addr *)sr->isr_bssid); printf("\n"); cp += sr->isr_len, len -= sr->isr_len; } while (len >= sizeof(struct ieee80211req_scan_result)); @@ -4904,8 +4916,10 @@ ieee80211_status(int s) printf(" channel UNDEF"); if (get80211(s, IEEE80211_IOC_BSSID, data, IEEE80211_ADDR_LEN) >= 0 && - (memcmp(data, zerobssid, sizeof(zerobssid)) != 0 || verbose)) + (memcmp(data, zerobssid, sizeof(zerobssid)) != 0 || verbose)) { printf(" bssid %s", ether_ntoa((struct ether_addr *)data)); + printbssidname((struct ether_addr *)data); + } if (get80211len(s, IEEE80211_IOC_STATIONNAME, data, sizeof(data), &len) != -1) { printf("\n\tstationname ");