From nobody Mon Nov 04 14:56:34 2024 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 4XhvgQ5qWdz5c9jx; Mon, 04 Nov 2024 14:56:34 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhvgQ5CK0z4YCV; Mon, 4 Nov 2024 14:56:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730732194; 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=tdKhLexhWltEnK4kJV/yUNoh5FFEfnlyVRzGm6fJ118=; b=uJ9u9ifPXpzxxZK0mhhN+9iRXnNsD3FTUhb0oiVYlk+TTmcMY3C/DC+0HrgEs6XWDHSJoO AuHsqwnmoBETk+XTuP5iLwdTw/T6E+7b2OCzdd65MGCgFYR5bci0qpOXg3uL2TtZBr/DFf cld+EJqVPSy8rmfktDV5/zSAirsP0vsiR58RWKbmtgiLohI/VWKKTHpvwplyLifpBoF8yB xs8qvHE1UDkDnZCJbqXvjWMt1BAPqk8W0xdtgPeGtKZR0YkhX5VeIfSLBtBvP+ab0VBpcB pmTK+chVH7G3w1JuuxPPg8nG9gfSndlv/1XpgnMx+RNgn5lgleaDbJvI4f/5Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730732194; 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=tdKhLexhWltEnK4kJV/yUNoh5FFEfnlyVRzGm6fJ118=; b=TWOETtnORNwgwWYyp9U31UxDIdd0bh1hWNhjya4SuyTC1I2tPLD0+88SfBJ3Wfld63asHg un/Vh+mcFucHcRduBde53BBxEXTecP7UkPNSQUfdovx987h340t5SWGbYIXYCdcDsJ4YNI X4sN+6Z5JYh53X8IxHWPc3r8OxMI7W9N+1rZCsNr0kjuI77I77ipKx0AeSaTFapmEfTZHT fU8ItAm58ewIzXkSjgtl47nqVifp/yRDwwxtkqg24u07K/Zq3zOjvZwA/ILkY6uOfcF2nf ugaxXWzXSb74SGEq8LiKQ/JaBSgmi2kAU6GZHKsKJABA2lRBO8YbPu5AHPbOrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730732194; a=rsa-sha256; cv=none; b=kRl1p56j1OIZ2owqUAyqQ7zFNzJMjBQsCZ706PFV8NvEyvw9k+eiSc0sgVAkgBLNdwSlaO 0/MqR6yUOCQGGG6M3ReGufnHnKrH3OSHSsp18tZarUoNIxZ2IUdBaC3f6HltWrfHxfCWcp CA3HRUKfIqN2Pa6++AhNhULZKjEPyst2oH6oCSXpYgLRUODm7vT5DvYT3WC9ys3P/vZGb/ 27k5fFWbB/ektxWCLuQLcwCOjvRc0/FUDQMG3aWPBa2US+VrR9H797aXls5IS3j0HsaHpL xiJXdbQSDChZmdGAC40JRkXNi5+4tmSne0m1myAGTiPyovlbtAadiTFWr1HuvQ== 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 4XhvgQ4fNkzdbN; Mon, 4 Nov 2024 14:56:34 +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 4A4EuYdS059744; Mon, 4 Nov 2024 14:56:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4EuYv3059741; Mon, 4 Nov 2024 14:56:34 GMT (envelope-from git) Date: Mon, 4 Nov 2024 14:56:34 GMT Message-Id: <202411041456.4A4EuYv3059741@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a471d2b401c9 - main - sockstat: Add a -f option to show FIB numbers of sockets 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a471d2b401c9b2d3a95d9139c9a6b123f686a8e9 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a471d2b401c9b2d3a95d9139c9a6b123f686a8e9 commit a471d2b401c9b2d3a95d9139c9a6b123f686a8e9 Author: Mark Johnston AuthorDate: 2024-11-04 14:40:30 +0000 Commit: Mark Johnston CommitDate: 2024-11-04 14:56:19 +0000 sockstat: Add a -f option to show FIB numbers of sockets Reviewed by: zlei MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D47316 --- usr.bin/sockstat/sockstat.1 | 7 +++++-- usr.bin/sockstat/sockstat.c | 22 ++++++++++++++++++---- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/usr.bin/sockstat/sockstat.1 b/usr.bin/sockstat/sockstat.1 index d7174b48f8d5..ca486a088b13 100644 --- a/usr.bin/sockstat/sockstat.1 +++ b/usr.bin/sockstat/sockstat.1 @@ -25,7 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd July 9, 2024 +.Dd October 15, 2024 .Dt SOCKSTAT 1 .Os .Sh NAME @@ -33,7 +33,7 @@ .Nd list open sockets .Sh SYNOPSIS .Nm -.Op Fl 46CcIiLlnqSsUuvw +.Op Fl 46CcfIiLlnqSsUuvw .Op Fl j Ar jail .Op Fl p Ar ports .Op Fl P Ar protocols @@ -59,6 +59,8 @@ Display the congestion control module, if applicable. This is currently only implemented for TCP. .It Fl c Show connected sockets. +.It Fl f +Show the FIB number of each socket. .It Fl I Show the local address of the socket to which the current socket is spliced, if any. @@ -228,6 +230,7 @@ $ sockstat -6 -P tcp .Xr fstat 1 , .Xr netstat 1 , .Xr procstat 1 , +.Xr setfib 1 , .Xr inet 4 , .Xr inet6 4 , .Xr protocols 5 diff --git a/usr.bin/sockstat/sockstat.c b/usr.bin/sockstat/sockstat.c index d2581d9f042e..b18c56ca6f88 100644 --- a/usr.bin/sockstat/sockstat.c +++ b/usr.bin/sockstat/sockstat.c @@ -82,6 +82,7 @@ static int opt_4; /* Show IPv4 sockets */ static int opt_6; /* Show IPv6 sockets */ static int opt_C; /* Show congestion control */ static int opt_c; /* Show connected sockets */ +static int opt_f; /* Show FIB numbers */ static int opt_I; /* Show spliced socket addresses */ static int opt_i; /* Show inp_gencnt */ static int opt_j; /* Show specified jail */ @@ -140,6 +141,7 @@ struct sock { int family; int proto; int state; + int fibnum; const char *protoname; char stack[TCP_FUNCTION_NAME_LEN_MAX]; char cc[TCP_CA_NAME_MAX]; @@ -771,6 +773,7 @@ gather_inet(int proto) sock->splice_socket = so->so_splice_so; sock->proto = proto; sock->inp_gencnt = xip->inp_gencnt; + sock->fibnum = so->so_fibnum; if (xip->inp_vflag & INP_IPV4) { sock->family = AF_INET; sockaddr(&laddr->address, sock->family, @@ -1204,6 +1207,12 @@ displaysock(struct sock *s, int pos) default: abort(); } + if (opt_f) { + while (pos < offset) + pos += xprintf(" "); + pos += xprintf("%d", s->fibnum); + offset += 7; + } if (opt_I) { if (s->splice_socket != 0) { struct sock *sp; @@ -1329,6 +1338,9 @@ display(void) "USER", "COMMAND", "PID", "FD", "PROTO", opt_w ? 45 : 21, "LOCAL ADDRESS", opt_w ? 45 : 21, "FOREIGN ADDRESS"); + if (opt_f) + /* RT_MAXFIBS is 65535. */ + printf(" %-6s", "FIB"); if (opt_I) printf(" %-*s", opt_w ? 45 : 21, "SPLICE ADDRESS"); if (opt_i) @@ -1453,9 +1465,8 @@ jail_getvnet(int jid) static void usage(void) { - fprintf(stderr, - "usage: sockstat [-46CcIiLlnqSsUuvw] [-j jid] [-p ports] [-P protocols]\n"); - exit(1); + errx(1, + "usage: sockstat [-46CcfIiLlnqSsUuvw] [-j jid] [-p ports] [-P protocols]"); } int @@ -1469,7 +1480,7 @@ main(int argc, char *argv[]) int o, i; opt_j = -1; - while ((o = getopt(argc, argv, "46CcIij:Llnp:P:qSsUuvw")) != -1) + while ((o = getopt(argc, argv, "46CcfIij:Llnp:P:qSsUuvw")) != -1) switch (o) { case '4': opt_4 = 1; @@ -1483,6 +1494,9 @@ main(int argc, char *argv[]) case 'c': opt_c = 1; break; + case 'f': + opt_f = 1; + break; case 'I': opt_I = 1; break;