From nobody Tue Oct 14 20:43:28 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 4cmR4w2rKdz6C2tq; Tue, 14 Oct 2025 20:43:28 +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 4cmR4w2B5Rz3HQg; Tue, 14 Oct 2025 20:43:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760474608; 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=r71dr7BZl/W7LALcmN51udb86TapNtUUjoA9ZniuFiI=; b=S/dFczgR10TGOlgzZG3X+IS59VvBMl4bx8Bs172ZUy2mJuL0MglU8Yp4OixOPvpN5ShSPD pgzZiD07HZr7Pw722ky8CzChlKY7sHP9lNnAJUDkmVv4WdOvmr5dqCA4GALQ4BxZrsuAgF X79kGYugEOgDjBvMqxzVo9Mug4tVxmZSiGqyZW6EaH5ixuef1snD8XBsaHguvltZZ7LAzo 8sXym3+MQY6ZjC3DnqCqmj+js257t3o0h3kraGxHT4iZW7m4novYEhjvYPyVoANQN1XBQo 68/vdAMf+LDGd3QvSCO9psxcGGEofnqJtCKTp8e8BlWuo7sZSKswWQCEC9ac9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760474608; 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=r71dr7BZl/W7LALcmN51udb86TapNtUUjoA9ZniuFiI=; b=PealjznEc4BpUsi0L0q01OXDBZ+py+JhgZRTYgK4dytyUZZWA4+kehzUZofAzZ267PSf/p Xb+SH21rq+tZsW2PXQNtRMKATjW+lE0/+7MYBQyIPHuAWkOvcKioseyi4pjn4lGNlekZin NVlpzVt9rSc8O1GXWGj7e4QH2DIop9zdty2rdv9I//1KFAaa9CTFX91/P4cCdr0U7zEZ4U mhsUIWivb0eyeU2KgErDQGvb2gZiiD1nUdaIim9dLdOWe4ZA+YKVo2xpjcYPFa7rb8wWHc H/mg9NXXRh83TGEkBQZZfQnCqomEWhwLJjFy2y65E7XRxaay+MmUdV/2uN6ZTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760474608; a=rsa-sha256; cv=none; b=Th7pNXiVqC1gGf2grnOad5PcaPvGg+6G/YxMoo2MK4Fk9jX1PzSDiVup3zERNs+Q5OH571 AxX8cXdJnvK8m75AD/r16qBG2lIfd6M+jmlZTRI7NGtMoOh2U9CDMgs8t53vo984ddgLDL Tp9j7uDcRRSZyBMsT5kpnmZ7rnOvrdc+KqDaVHOYCRx6N/bca9S14wHNZ8KJL9IfzzqeIH gY99ogUSaFHkHuHFMJ4QUnKp+pv6KV/v80FTXTngJLAjmUTbV8NLSMKKyCcNHCYxTZ0pTU QPQ/RzXtMujuUktXuIBNBHZP862OJ62HFRt8SsjtDN9IY4hZ2PMrbkZa+lAQWA== 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 4cmR4w1cFpz17BR; Tue, 14 Oct 2025 20:43:28 +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 59EKhSTO065157; Tue, 14 Oct 2025 20:43:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59EKhSoe065154; Tue, 14 Oct 2025 20:43:28 GMT (envelope-from git) Date: Tue, 14 Oct 2025 20:43:28 GMT Message-Id: <202510142043.59EKhSoe065154@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: 97e858f5b335 - main - sockstat: improve handling of path state 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: 97e858f5b335ae8f98619f9cee8ab9a0501cd06d Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=97e858f5b335ae8f98619f9cee8ab9a0501cd06d commit 97e858f5b335ae8f98619f9cee8ab9a0501cd06d Author: Michael Tuexen AuthorDate: 2025-10-14 06:39:37 +0000 Commit: Michael Tuexen CommitDate: 2025-10-14 06:48:43 +0000 sockstat: improve handling of path state Only suppress the path state column when producing traditional text output. When generating html output, always include the column. Please note that when generating json or xml output, optional fields like the path state are only generated if they is applicable. This has not been changed. The changes in this patch were suggested by asomers. Reviewed by: asomers Fixes: 746eadecaa7d ("sockstat: show path state column only when useful") MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53005 --- usr.bin/sockstat/main.c | 8 +++++--- usr.bin/sockstat/sockstat.1 | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/usr.bin/sockstat/main.c b/usr.bin/sockstat/main.c index 7fedfd5b8724..d1ea6b1bc958 100644 --- a/usr.bin/sockstat/main.c +++ b/usr.bin/sockstat/main.c @@ -1789,9 +1789,11 @@ main(int argc, char *argv[]) argc = xo_parse_args(argc, argv); if (argc < 0) exit(1); - if (xo_get_style(NULL) != XO_STYLE_TEXT && - xo_get_style(NULL) != XO_STYLE_HTML) - is_xo_style_encoding = true; + if (xo_get_style(NULL) != XO_STYLE_TEXT) { + show_path_state = true; + if (xo_get_style(NULL) != XO_STYLE_HTML) + is_xo_style_encoding = true; + } opt_j = -1; while ((o = getopt(argc, argv, "46AbCcfIij:Llnp:P:qSsUuvw")) != -1) switch (o) { diff --git a/usr.bin/sockstat/sockstat.1 b/usr.bin/sockstat/sockstat.1 index d14eb967ad0f..1498fb1d88f7 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 9, 2025 +.Dd October 14, 2025 .Dt SOCKSTAT 1 .Os .Sh NAME @@ -205,7 +205,8 @@ 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. +When using traditional text output, 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