From nobody Tue Apr 7 14:41:36 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 4fqpmc3rQpz6YMZn for ; Tue, 07 Apr 2026 14:41:36 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqpmc3HBKz3fyP for ; Tue, 07 Apr 2026 14:41:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775572896; 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=jMg5oXww/o2whRoHDZMWS9acz9HHL1XygxIdZsk/Y0s=; b=hOOp91k7BOhW2YrxDjBiwP5LvjcnNrSrXmmtNq2DG+f2o+E/El9x4d35gWwRl2oZo7m4P3 6Olwhev29Bv4O3HFhsZj283Yc/q6DBH1a81UvbaOqfLiKJH9wdWpSyoT393LvwTtT6QkO1 f5cGN7RVy6WbFCLRVY9tVRNIMtj/mqilyrJagZg+pBKXjXu/t7Cbry5DbRlIFM+g5negOP MMjIQDr97YnUKuqOFx/k22j3P+RfQgh0JrsfIpgEmKN2wzEwuVltV+fEokCe3oSk7Z4ETP luLYhEB8crtpD0akmL4YlVEPu23Ql0Tfh5RGS3k8W8AwQjtVRuFYHUB1vACFxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775572896; a=rsa-sha256; cv=none; b=ejy1n6aEHW3YfH6dWTuonuKuGEO31KV8xBuRCa2rJfu3ukXH+qciOWkBniTW+IvKEQ4mZk lT+VyTN9AVFsBAv8w/OEewOgKG+F5eTYednkxA2qP0W5CUUa+nVPkSPgG99L8Lz3M9/QYi GNmroInuY2MibvbPUu+pqDpzSKiTt61YL1riUELAFAB1z5SGVuWh8Sm15BdAgmz5w0zu7i +/LEtE2CGICd8plBF24XZmeX7WSUlloWyEQQ2n9ak8kQUj8A0WeoU1Y1VZSm26eUqO/bBd LWYQU3zFyBanz479Ogp/Pn7C4yBZ46C264y2o9tREv7WjGUngfH/X3uLzhslxA== 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=1775572896; 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=jMg5oXww/o2whRoHDZMWS9acz9HHL1XygxIdZsk/Y0s=; b=IxOcQr8H0AjTowxoJbPRrK5DlGPa8tlDGZUUtoDm7jk8zL87kzsOZp5Sf6XOPMG13nmGcN zjufeY92Xdn0DEX7nuaHYIsN+gVys6GysnqlkKm72YWqCgon7hJFUai9Yjm6L1TNPTQltS 1yC92F6jq+blHPZoMYR5atKcL1SbSJRlWAMlddXklil4FzRdh8lVLLi/unvXSyqmaGEtSO c8YJXBcX1pefA9exM95ZI7h+vAC7Gloqe44aUUUQthK7Dn1tNaESjfNjsWxaozuKHPs1Wl rhcEcJe+cjJF/gx+WwUjGxIrUpXR3XrVvjqA/zqj0n2ls2x6efhtq3OnN3rb6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqpmc2pWjzkgx for ; Tue, 07 Apr 2026 14:41:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3eba1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 14:41:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan Novk=?utf-8?Q?ovi=C4=87?= Subject: git: cff675e83cdb - main - netstat: Add -F support for -g 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: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cff675e83cdb6c9027e94df9d010439e42e27dee Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 14:41:36 +0000 Message-Id: <69d517a0.3eba1.376d3d7e@gitrepo.freebsd.org> The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=cff675e83cdb6c9027e94df9d010439e42e27dee commit cff675e83cdb6c9027e94df9d010439e42e27dee Author: Bojan Novković AuthorDate: 2026-03-26 09:39:10 +0000 Commit: Bojan Novković CommitDate: 2026-04-07 14:39:51 +0000 netstat: Add -F support for -g This change adds the ability to examine the contents of multicast routing tables for other FIBs without the need for executing `netstat` with `setfib(1)`. MFC after: 3 days Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D56205 Reviewed by: glebius, markj, zlei --- usr.bin/netstat/main.c | 2 ++ usr.bin/netstat/netstat.1 | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c index d81e7c5e8307..0084426540f6 100644 --- a/usr.bin/netstat/main.c +++ b/usr.bin/netstat/main.c @@ -550,6 +550,8 @@ main(int argc, char *argv[]) if (gflag) { + if (fib != -1 && setfib(fib) < 0) + xo_errx(EX_DATAERR, "setfib: %s", strerror(errno)); xo_open_container("statistics"); xo_set_version(NETSTAT_XO_VERSION); if (sflag) { diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1 index a726c703752f..5c7f2336c06b 100644 --- a/usr.bin/netstat/netstat.1 +++ b/usr.bin/netstat/netstat.1 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 3, 2026 +.Dd April 7, 2026 .Dt NETSTAT 1 .Os .Sh NAME @@ -94,6 +94,7 @@ .Op Fl j Ar jail .Op Fl -libxo .Op Fl 46W +.Op Fl F Ar fibnum .Op Fl f Ar address_family .It Nm Fl gs .Op Fl j Ar jail @@ -738,6 +739,7 @@ See .Nm .Fl g .Op Fl 46W +.Op Fl F Ar fibnum .Op Fl f Ar address_family .Op Fl M Ar core .Op Fl N Ar system @@ -764,6 +766,15 @@ See .Sx GENERAL OPTIONS . .It Fl W Avoid truncating addresses even if this causes some fields to overflow. +.It Fl F +Display the routing table with the number +.Ar fibnum . +If the specified +.Ar fibnum +is -1 or +.Fl F +is not specified, +the default routing table is displayed. .It Fl f Ar protocol_family Filter by .Ar protocol_family .