From nobody Tue Apr 14 11:10:30 2026 X-Original-To: dev-commits-src-branches@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 4fw1lq0QcNz6Zcbv for ; Tue, 14 Apr 2026 11:10:31 +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 4fw1lp62Ltz3ZBF for ; Tue, 14 Apr 2026 11:10:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776165030; 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=YohMdh45FeL/MbKR3MCxQSLOmMPI9Zm/X+JLtWiUnS8=; b=MZcLhvZydLYlLZxeSXcDr+mREvau/5JtVLkqR4HrMb68iwNvX2gcpQ1tl5eDKsB3Vfgr74 xon7rNz3zQQJbslu+QwCPOtUav4Xd8pivJCHecyjZMv0K4QEKjf5PQAWqdt35OrOssltCO HNOgTzXRPcjTGZaUGHqIVpZ9ZtIkFxCEA50uQhcbZw+zg2o4GKhLC1lLX13eV58J5QcUM8 vtWm/EEZ2fiWAtGGrXRIYW+4BP11Lr0JIZvLTpTEOaEUpbIkX6yCuraKidrpCKRRDtZBKH JyEPkiIwsEVNF0MVznFRsHHI7It90W43cION6vj6fz4feLHBlwUVbVZaFf7fcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776165030; a=rsa-sha256; cv=none; b=EIR+lJswmoG95S+1xviA8XBV7vMI8r2ktXM+7xNornbm2OQlMj7zznaVICc01BT7EFEKsJ oeAYQSpgxfp6ni3BwtNzg7ncYe9vliZT7gQZyVwadDCSIV1DQL/+OvrfKUq9zLLAQYKoh/ EgFgx/wgjgf7iibk+SsBB7RyzypQnQSvZfRnHq+tyYBUT4avQBakYDZoPk8GQntaURSPqk EeQEn8oFMIPZvo8vWTZzUV0xj1sAL6DE7c4zt1VqyhXtE5DA3hGqvPQgp/QJiFUot8ZBxt eWTF3BOitM7v1rr9WTbDGnFT1h0CESeWQTuW8Iu7NUWh7O7pn3e7YK7qqREOhA== 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=1776165030; 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=YohMdh45FeL/MbKR3MCxQSLOmMPI9Zm/X+JLtWiUnS8=; b=rghkLhGzdyi8s+kYmuwtc1snwt2YeoZ2o3nFKzEITCK/iP80/o+K+Xa5YYzoC/BKigmnqE rmvkYP2ZfiRfi4C90QXrKy3PjBTE9PFkDoZepyU6cQ1UkgRYje8G6wPrKcEx5wz7Bk9xIs DLTSc4OuWbcl3IKdq01SgBV+y1HfALW0AJXz4808jYzHOExa2QLcJhuOrO3oBad+4fxOPr gJotufujIOzJA9basVeX353SzuIsf1ZR+42qCxyFUEfLpvJ2GUUeoIORx0ktQZAxQdFOvE dpA7y7vbifNiMybAbyCD8b4pIdbWBvuLAzPiXZFIz45G7sYXM/2Thig4RDSvFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fw1lp4wBCznSF for ; Tue, 14 Apr 2026 11:10:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34814 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 11:10:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bojan Novk=?utf-8?Q?ovi=C4=87?= Subject: git: 893b90cd9649 - stable/15 - netstat: Add -F support for -g List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 893b90cd96495f2a9a74ece2be248f16dcdde17e Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 11:10:30 +0000 Message-Id: <69de20a6.34814.35f5a42b@gitrepo.freebsd.org> The branch stable/15 has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=893b90cd96495f2a9a74ece2be248f16dcdde17e commit 893b90cd96495f2a9a74ece2be248f16dcdde17e Author: Bojan Novković AuthorDate: 2026-03-26 09:39:10 +0000 Commit: Bojan Novković CommitDate: 2026-04-14 11:09:50 +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 (cherry picked from commit cff675e83cdb6c9027e94df9d010439e42e27dee) --- 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 79830049948a..f901ddfb2888 100644 --- a/usr.bin/netstat/main.c +++ b/usr.bin/netstat/main.c @@ -552,6 +552,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 1931c38a1fad..42604cec0b16 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 July 16, 2025 +.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 @@ -746,6 +747,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 @@ -772,6 +774,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 .