From nobody Thu Oct 09 19:19:05 2025 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 4cjKRs5VC8z6Byk6; Thu, 09 Oct 2025 19:19:05 +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 4cjKRs4zrCz3Pjh; Thu, 09 Oct 2025 19:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760037545; 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=WD0Ck2tNqdkN3nRcwbHxZOE/h2gUYIAAS4lY5PrLeBs=; b=D6gP0zap3M8Td1GISHky2+6BSd3ZdZFKYJh5SqsbZ5LC0m2j8d2ATcp0xp/s+hS26HQdVV KHoFY9HnvO2Yq6UfyCvQOcGMY1kF2H56mx00ixm58wNKj31SbYiZ2O22eLWHmoUeoUM2R8 D9Eotq5WSS0LLjpIejRmp9h8gUeqUHveGek30JmCZ1HKvyH8mKDsxr8n87XXlqdzjCUcWL xXrqxZ3ZDPqnWsne5/WZeo2ea3j50YwPNGMiTxqAxlsWdov43Y4iCNqmO10cKCobk95rNA INNanFKeL+q5YCQ1oP+8fdZHAE0FlnYMGwk/uesojnlT5RzMK3Yb7jOVdg3yDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760037545; 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=WD0Ck2tNqdkN3nRcwbHxZOE/h2gUYIAAS4lY5PrLeBs=; b=eeHOSuiu4822bklumCLdN8pN2wZ3DBNLIAj9rKHgvY+KDmE4zCKLvgX0ucu3X5RwElGISR ADF8Oyd/BdPBgAKEZO/ex2KiwTYBwWEbdDL4THcQfpYRMMkG1FzOw1wuaijfhBimaFD3hn uYyPeM7EVjOvLgdzoQpZ3Rldznu06ClAxUksTMWrD4fe11bvdZeBNSAWTgpDN1U4j1BV1E 9WWvvGrfTu02X6X/vE4rh8MXURW+Mggz6PIB09nIBa6iZmpcQZ8on0fl/FmN2IXIifWWSb KNGFoJVPsxZ41sy/3R7YrDxiKoeogbDasx0GTxKBxSpAXmv+NrzMGJMbn2GlJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760037545; a=rsa-sha256; cv=none; b=gh64MEHofvsXCVaQ9SCO5sSwCX1RbHNvj0qGq2akZ17yducPaQzCjVmYV/6S7fG8mny74N VgWM6Tqpjxn/bAX3qRxII3cEIkLE+uD6kOt89bpvfkkrbVEhCnpkZx9U98ulSVGEzk10lX QQNR0ZI1VlTYm8+OReEMQ6OLE+O0O84SV8pxipwxZnh48XtyZeSySo5kfpla2aAgaSAasc FpnlogbMNpssPFGXZXYfdG2Qus1/yb1uz0MUIQBDEjjsloVMU9di9ASZUANPcZ9hpN5LPr 81XpJGSgUp6htd/kUmYoOjjqZOfaaCEg7GHQFFL7mFKex4UBjDc5vjd3YrMQAA== 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 4cjKRs4GnYzVZf; Thu, 09 Oct 2025 19:19:05 +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 599JJ5Vh028529; Thu, 9 Oct 2025 19:19:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 599JJ5dd028526; Thu, 9 Oct 2025 19:19:05 GMT (envelope-from git) Date: Thu, 9 Oct 2025 19:19:05 GMT Message-Id: <202510091919.599JJ5dd028526@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 746eadecaa7d - main - sockstat: show path state column only when useful 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 746eadecaa7dc8913721cbaa9be4e603bd36ea49 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=746eadecaa7dc8913721cbaa9be4e603bd36ea49 commit 746eadecaa7dc8913721cbaa9be4e603bd36ea49 Author: Michael Tuexen AuthorDate: 2025-10-09 19:16:38 +0000 Commit: Michael Tuexen CommitDate: 2025-10-09 19:16:38 +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 --- usr.bin/sockstat/main.c | 8 ++++++-- usr.bin/sockstat/sockstat.1 | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/usr.bin/sockstat/main.c b/usr.bin/sockstat/main.c index f0eb83eb3e9f..7fedfd5b8724 100644 --- a/usr.bin/sockstat/main.c +++ b/usr.bin/sockstat/main.c @@ -103,6 +103,7 @@ static bool opt_u; /* Show Unix domain sockets */ static u_int opt_v; /* Verbose mode */ static bool opt_w; /* Automatically size the columns */ static bool is_xo_style_encoding; +static bool show_path_state = false; /* * Default protocols to use if no -P was defined. @@ -584,6 +585,7 @@ gather_sctp(void) !(local_all_loopback || foreign_all_loopback))) { RB_INSERT(socks_t, &socks, sock); + show_path_state = true; } else { free_socket(sock); } @@ -1485,7 +1487,7 @@ display_sock(struct sock *s, struct col_widths *cw, char *buf, size_t bufsize) } else if (!is_xo_style_encoding) xo_emit(" {:encaps/%*s}", cw->encaps, "??"); } - if (opt_s) { + if (opt_s && show_path_state) { if (faddr != NULL && s->proto == IPPROTO_SCTP && s->state != SCTP_CLOSED && @@ -1632,7 +1634,9 @@ display(void) if (opt_U) xo_emit(" {T:/%*s}", cw.encaps, "ENCAPS"); if (opt_s) { - xo_emit(" {T:/%-*s}", cw.path_state, "PATH STATE"); + if (show_path_state) + xo_emit(" {T:/%-*s}", cw.path_state, + "PATH STATE"); xo_emit(" {T:/%-*s}", cw.conn_state, "CONN STATE"); } if (opt_b) diff --git a/usr.bin/sockstat/sockstat.1 b/usr.bin/sockstat/sockstat.1 index dabb3042bfd4..d14eb967ad0f 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 @@ -205,6 +205,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 shown. .It Li CONN STATE The connection state if .Fl s