From nobody Fri Oct 17 17:59:35 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 4cpCJR3NHBz6CR9p; Fri, 17 Oct 2025 17:59:35 +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 4cpCJR2Fwkz3WXq; Fri, 17 Oct 2025 17:59:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760723975; 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=Z9SAMeYJ97Y6h+rQLYxe5QeP4kaLYvZfzMyHUpcSkag=; b=Z6n9MvKEXZgM0+fPkdsMrS3OkxvJkNZnT+bi5J1zgpI49Ypp9koTu75F4eYPNS7zolni46 eYF1r3fYMZxj8uPyo8Z4hbYhiogTOcDOBkdZOEjLTzW//wOvk4SWB37eaIPlwVpWBzRl2a kfUQQEsYqJJLHTPMNN0e81LPDw5DMxSoZ2wXprGEeAvNtI/MnYru5oTZ11xhKy9dmYz1pm kdf7XMDcQRhg6zLYaoDjZkR9wpcQrT2FKdSG8ryTslkd15guIabAOJEnToQotuqAHf+uVq tQgEizdVGjlUIBRty/lg1aOOUbl0rJ4NBtnSxobAb3hoxJ0PPe140mAyQ5gpGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760723975; 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=Z9SAMeYJ97Y6h+rQLYxe5QeP4kaLYvZfzMyHUpcSkag=; b=jtx2TmAekTQAaTWeSKunt0/L2eoqQTgoGgneiB5gs9/qfFRaemtpd/beSzFABaotC5o37N o+PtW48jjyLZEIXnMH3KLnESPoSDd0eZVPjJRLmoGBTM/PsTIwyVX0fA9rbZvzJOo/kopn qPLvgRGEiGoP79h5Cd+qjGWkCXjjueuLNyQLrYYbVN9FSYISqr5/M0RJpsURv5ypRejh8y Q0xBh6RnGNMpxkhBGxasy7Tom7kdGl2xtzovSskJVtftpmt0A98MKP0A/M9pzfblNFnKKS TP/th/xdnnzQjD8kA7RunCMDTP+kV8KDuAadI/j7zlSHOFpO5T6dzmqVOgLFwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760723975; a=rsa-sha256; cv=none; b=BO5vtAfMDxQpEKPi5hfnwyGLp/xw46tsZnq5YxrfYUpfr+RTJBjK6/Ujfgp89XCcR3UE/9 THLYJdBPtgyfsgdceCOR6p27gnWc4j3b3UGyHC5KjXRzfLetWhJsZkWcPGcsLoFLzAeQzv KOeeyRIh3i9y84x/pKi9XE4LVgKNoaBzRV8bSr2B2asl+stKckOzdZvnKKBrEfqDGlTPwC JBBnmA/Sh6BKERBF2JR+1lJW7VLUmmtkrpOB6Pwtwh8ojvnLQvxi1IvfuzGsW4OXZKO2mN te0Px5xdGnxZ/qLT4xODuGqUkR5msf8vff3hN8DmzFxRtKzt5gri4jMz8Rip2w== 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 4cpCJR1fNxz14Gx; Fri, 17 Oct 2025 17:59:35 +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 59HHxZB1086170; Fri, 17 Oct 2025 17:59:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59HHxZTj086167; Fri, 17 Oct 2025 17:59:35 GMT (envelope-from git) Date: Fri, 17 Oct 2025 17:59:35 GMT Message-Id: <202510171759.59HHxZTj086167@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 25d7786e3290 - releng/15.0 - sockstat: improve handling of path state 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 25d7786e32907f27929ae7a3af6a19f341cfe8be Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=25d7786e32907f27929ae7a3af6a19f341cfe8be commit 25d7786e32907f27929ae7a3af6a19f341cfe8be Author: Michael Tuexen AuthorDate: 2025-10-14 06:39:37 +0000 Commit: Colin Percival CommitDate: 2025-10-17 17:58:57 +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. Approved by: re (cperciva) Reviewed by: asomers Fixes: 746eadecaa7d ("sockstat: show path state column only when useful") Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53005 (cherry picked from commit 97e858f5b335ae8f98619f9cee8ab9a0501cd06d) (cherry picked from commit f6923c0a68a67d69762e188273f0e87f231ec964) --- 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