From nobody Tue Jul 28 08:18:42 2026 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 4h8Sz66Bqvz6mKj1 for ; Tue, 28 Jul 2026 08:18:42 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h8Sz65dJNz4PY7 for ; Tue, 28 Jul 2026 08:18:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785226722; 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=S1A4492wzuq712SYaKBK3Jc5DI9jy3UEtS0SgIBHds4=; b=ArbUYXQ7jRybcFVPZQiT8HCp4s8CIumgg06vcxwBm8dHSWE6/bFIzTwpdnp99s8sblFNVz orX9RfQOoNvQPP4AVIJxXL43gfEZcqoJCC/AV2p50dP2IJpLliS4VFxm3vrQKye1eKAAJG OGpFu0h/fzCNhwDBgpL8Dzf789rq3AqUyrKBvtZIq7jpLQ7FBv8Bmt3lOjCTOd+sBnM3Pj HN3t1ebCBUHYuwvlOnfZ37lB5F6c41aOPVwOjCmyik5pkWNyi3RdTSc8cWTYrtYXCSjpPE MiUCvlyzVNX03wp7Go+B8Xmv8nWOu7DMLAc8v70pxdLVi8BZxAMR16tev/soPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785226722; a=rsa-sha256; cv=none; b=iOHVmEDgKFRlDGWUiKn9jKlzruXWRgRLTzoKrAiAx6vuzKIMqzAY9ALyoKvhgwjAtNxagG J4LnDFV78xk4JBEsInPsWC76t1SrTQhm1fvwv8S4oHfDfTRcr+E1VaM/Dg4juQY8O1qsSZ UBGydJ4LzA/VFo5y5gGQxwHwjlCvc+iAOB+4fNlBTtvJm9mrYTQqVEnvVYYNEiGnvUpSBe +D4MRwoqTu5Fi7cmkMeg2mHxnoU4YwHrIsWu73ZKxSH3nCVc9P3N+QCCQb6z1ZIAkp9qtz BMAKVR00wlTykcyzzJlMXekz41PeUg5KDtBstAwQ1zkxS0OzVMiLbXCYSIJtLA== 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=1785226722; 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=S1A4492wzuq712SYaKBK3Jc5DI9jy3UEtS0SgIBHds4=; b=sUF/pGFt0H6LsaV05lcpCB96WSlbMRDaiKlMRMJfIrt5Ih46PVtl0+pGkrf6jzI8NGIHOs MJxzm86RsjtyP57lArNplNAfbRYkJgB39r+c9gUBeK+CN5eboPCfhmtmWblnJvi/m1oNNU hJYWwRpc9+tGAjQYaNpJHNTUZ0hTB3ZMQ+SkRQrDVKG1+8W2RBmjqIMp2aSJkDls8mKC9Y T5bGpNJr5YFqj8QBnyKCAlCAsNAvmDnug7kHLnejVY6xuNHUAWGRdkmj7JbqQsA+TRJ3EQ 7Y94skv8X3M0ChiTjK8kSafGytSWO/tuiRCtEfOoU5ofSl6IL5VcgxtgWENFDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h8Sz64QCSzXR5 for ; Tue, 28 Jul 2026 08:18:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4346d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 28 Jul 2026 08:18:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 5286cbea9118 - main - netstat(1): Emit nhop flags for encoding styles with Wflag 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5286cbea9118f79b43fb7416d9fc4f081c400949 Auto-Submitted: auto-generated Date: Tue, 28 Jul 2026 08:18:42 +0000 Message-Id: <6a6865e2.4346d.1d119df4@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=5286cbea9118f79b43fb7416d9fc4f081c400949 commit 5286cbea9118f79b43fb7416d9fc4f081c400949 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-07-28 08:16:14 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-07-28 08:17:32 +0000 netstat(1): Emit nhop flags for encoding styles with Wflag Show nhop flags like invalid nexthop to debug cases like the PR below. PR: 296883 Reviewed by: glebius Differential Revision: https://reviews.freebsd.org/D58347 --- usr.bin/netstat/nhops.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/usr.bin/netstat/nhops.c b/usr.bin/netstat/nhops.c index 48ec2006994e..d40211e7ff77 100644 --- a/usr.bin/netstat/nhops.c +++ b/usr.bin/netstat/nhops.c @@ -91,6 +91,7 @@ static struct bits nh_bits[] = { { NHF_GATEWAY, 'G', "gateway" }, { NHF_DEFAULT, 'd', "default" }, { NHF_BROADCAST,'b', "broadcast" }, + { NHF_INVALID, 'I', "invalid" }, { 0 , 0, NULL } }; @@ -114,7 +115,7 @@ struct nhop_map { static struct nhop_map global_nhop_map; static struct nhop_entry *nhop_get(struct nhop_map *map, uint32_t idx); - +static void p_nhflags(int f, const char *format); static struct ifmap_entry *ifmap; static size_t ifmap_size; @@ -281,10 +282,10 @@ print_nhop_entry_sysctl(const char *name, struct rt_msghdr *rtm, struct nhop_ext snprintf(buffer, sizeof(buffer), "{[:-%d}{:flags/%%s}{]:} ", wid_flags - protrusion); - //p_nhflags(nh->nh_flags, buffer); print_flags_generic(rtm->rtm_flags, rt_bits, buffer, "rt_flags_pretty"); if (Wflag) { + p_nhflags(nh->nh_flags, buffer); xo_emit("{t:use/%*lu} ", wid_pksent, nh->nh_pksent); xo_emit("{t:mtu/%*lu} ", wid_mtu, nh->nh_mtu); } @@ -440,7 +441,7 @@ p_nhflags(int f, const char *format) struct bits *p; char *pretty_name = "nh_flags_pretty"; - xo_emit(format, fmt_flags(nh_bits, f)); + //xo_emit(format, fmt_flags(nh_bits, f)); xo_open_list(pretty_name); for (p = nh_bits; p->b_mask; p++)