From nobody Fri Oct 31 18:36:08 2025 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 4cyqS85ZL7z6DljM; Fri, 31 Oct 2025 18:36:08 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyqS851q6z44pS; Fri, 31 Oct 2025 18:36:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761935768; 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=/0wo0C9P57TOIFzWhlulvZL/8R91Yf3xzL8Z5hLN5WI=; b=nmgP27bF5/bDbU/WQgILKp1sViX6WkZLtNu/hhQzODvGnTQ2EzOmX479EFFczKDQYwFzOs YZ1h4tAQVkgLEKywkYlRCWvSPPrh56EI6JQ+Z7bLfuDjWgbQpfDJzaU/ta2v2VysRAMMgZ 1jaUxviVvtJ894JLD4mfocdvOOSha3HxXze4C5WkWob8CUyquRfVcdIs4Y4FA15CJh0LJ+ 5D2MPLM0CLjd6GmyZdRckKtmHi9AfDEbJiklaYtd5W5/Cd/YpF8rNKDaMCO9FRugUe2RU1 MahQk9fNSgT+pIQhu7A0PgSdKYM4Or+9BuWJ2oz9v89WoB7yn5vCi+BV49Yl/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761935768; 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=/0wo0C9P57TOIFzWhlulvZL/8R91Yf3xzL8Z5hLN5WI=; b=e3tqAnbX2QZjwqQJq+f0saGffarbQLxf4tobepBANQUvsWaWClssZuKLX3I873mcYdQ5kZ UJTVW0sdw+dZhsKP4ETwKTBSxSim+oMVgeTh60U91kNK8MpLQ9AX5rZTNSYDpgK632sBfS xrKnxhMWA+Tr9kWBRhONoq+x7TLiBfu8YXAZJv73wRkTyykxV18/4Hz2jlpbmoBlQH05Zg oM5LOsJAeYgr89BnWmRDEcOcQGhj4DxgNOwXjsijiLW5xVW/A0U/OV8xK3LEJlvstIFdR/ zouIroIB+0zC8H44I9+hl+Z7F01NAPZhkGXsHwky7GQiKGxWQpY+dnNHuUcfqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761935768; a=rsa-sha256; cv=none; b=Fw8wmSrx9PYxCV6u4H2PA17/t9VuYhODRecsfvyYRNOtDLWMwJjjY2D8Jt/BPKRDwS65Ck g3wqSCjNM39lx18WAHi9GK208cOw+N3CLFkUaTaVsrEN827GnM/Y2tAl6oEDxEWElfcLWe 4lhAu3gQus+DXNoMEQLMewM0TP166H85YgirTYph4+AHHXjRVRiDASdyNr2cw+ROXJuJ+e HRicE7f6PaMa4ESH0cBhnmE3qhpyGXQyziiEAoVNFPILhD1q6lQgRM4GoTI1d5xUxHYLcr SLata1wSpzJ8c+yN1z4XTAmxe/U/bQ0sbovAQVWG6JoCVRCAE7hyojfT1/oLaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cyqS84TVXz1J0q; Fri, 31 Oct 2025 18:36:08 +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 59VIa8kj004018; Fri, 31 Oct 2025 18:36:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VIa8U6004015; Fri, 31 Oct 2025 18:36:08 GMT (envelope-from git) Date: Fri, 31 Oct 2025 18:36:08 GMT Message-Id: <202510311836.59VIa8U6004015@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: f7a7c2026ccb - stable/14 - sockstat: show path state column only when useful 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f7a7c2026ccb13f1ae76d1b0b3a2c60faa99e320 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=f7a7c2026ccb13f1ae76d1b0b3a2c60faa99e320 commit f7a7c2026ccb13f1ae76d1b0b3a2c60faa99e320 Author: Michael Tuexen AuthorDate: 2025-10-09 19:16:38 +0000 Commit: Michael Tuexen CommitDate: 2025-10-31 13:34:12 +0000 sockstat: show path state column only when useful Showing the path state column is only useful, if there is at least one SCTP endpoint shown, which is not in the state CLOSED or LISTEN. Don't show it when it is not useful. Reviewed by: rrs MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D52986 (cherry picked from commit 746eadecaa7dc8913721cbaa9be4e603bd36ea49) --- usr.bin/sockstat/sockstat.1 | 3 ++- usr.bin/sockstat/sockstat.c | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/usr.bin/sockstat/sockstat.1 b/usr.bin/sockstat/sockstat.1 index eba4b1c4aed5..abd83f049703 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 October 7, 2025 +.Dd October 9, 2025 .Dt SOCKSTAT 1 .Os .Sh NAME @@ -194,6 +194,7 @@ is specified (only for SCTP or TCP). The path state if .Fl s is specified (only for SCTP). +This column is only shown when there is at least one path state to show. .It Li CONN STATE The connection state if .Fl s diff --git a/usr.bin/sockstat/sockstat.c b/usr.bin/sockstat/sockstat.c index 4548eb8a0b11..afb635179d82 100644 --- a/usr.bin/sockstat/sockstat.c +++ b/usr.bin/sockstat/sockstat.c @@ -99,6 +99,7 @@ static int opt_U; /* Show remote UDP encapsulation port number */ static int opt_u; /* Show Unix domain sockets */ static int opt_v; /* Verbose mode */ static int opt_w; /* Wide print area for addresses */ +static bool show_path_state = false; /* * Default protocols to use if no -P was defined. @@ -519,6 +520,7 @@ gather_sctp(void) ((xinpcb->flags & SCTP_PCB_FLAGS_UDPTYPE) || (xstcb->last == 1))) { RB_INSERT(socks_t, &socks, sock); + show_path_state = true; } else { free_socket(sock); } @@ -1296,7 +1298,7 @@ displaysock(struct sock *s, int pos) } offset += 7; } - if (opt_s) { + if (opt_s && show_path_state) { if (faddr != NULL && s->proto == IPPROTO_SCTP && s->state != SCTP_CLOSED && @@ -1401,7 +1403,8 @@ display(void) if (opt_U) printf(" %-6s", "ENCAPS"); if (opt_s) { - printf(" %-12s", "PATH STATE"); + if (show_path_state) + printf(" %-12s", "PATH STATE"); printf(" %-12s", "CONN STATE"); } if (opt_b)