From nobody Tue Oct 14 20:47:52 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 4cmRB02TCWz6C2rQ; Tue, 14 Oct 2025 20:47:52 +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 4cmRB01yfdz3JWR; Tue, 14 Oct 2025 20:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760474872; 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=cX2LWYkgiws+/nn2FmzsIs8vMZpY8ucvNA1AJRdNIsI=; b=YaN6A1MSq4g2njFOEPw5bqjU3HiVMTPnIbmoRmPH4Tvenhif6+4cy239CyyBnlSWbavKeX YXG7BFUSKZhOtMoYn9E4i5MrvNLUaBJGEwdofMB8f8Fo8YL9YRuH7cIPUgbtUgYPd49XbZ W+PUAJm/TvUHnwc3YjPwUv51+LKqQFq91fTCz8J93ipo2O/8uFnIkB2ib4XIW9poTeadSV 24i79CmbOh5a0xGQv+lMi209/oYd652fx3yvEAlqYk8tvZLSbe1Bhx128R1IMVlOX6f7Tx fE1CdRJKjQ7OM804fi1MOuVmj3bBn3RxW5XIAWAK/qOayYBYStd73UpNAomJ5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760474872; 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=cX2LWYkgiws+/nn2FmzsIs8vMZpY8ucvNA1AJRdNIsI=; b=kBUNtnaydrB6dL4Bnm2YhpAcTaKJsLizGQbMlQgxNOY4x1fbTfqUkrP4SwjYQjGE+9Ept7 y5Vg23hu66xvX4yyGMjyC8CyW6PxRkbJV+lKtQtA3anMVgNWXLPuiLVpiL6yKIH2A0maT/ mhZDiMLDUb/gufFOSPMqIZ3wmf4RKBL4fDnA/LxsXDvx3LPa/6/DqfQG31pc3zS4ZfkABw 7uq5CnSxQpwkoDCSBEGdY89m0Ryg9qylC+a7k6fLVtNjzbuuZZl2ScCkM9dQ2szjzu+Uq7 OMxhlCHE83QJhI66BCzmvthAy94CTzkptyxPdp9VcQ13sz2uu1mP6VgfSYXGNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760474872; a=rsa-sha256; cv=none; b=b0qxc7OC+3pfe0iXvtytbOIv7XXQ2zcjpSy2mORMgDyptIRqRAUbRx9KXeKth6Z3yBl8Xe MfvnFL3FkK4btyaBm1Vk3wnFv+P/7Gsob9nULhIOzUjM0yY06nMFRHgO62JgFnqJeEw8na tK4tz3dt5R4eFzFw+jzkhUHmNczCv0qXRsh4KJLJn4Iot0gdlyhmtGbXP+/YG3A/0gaRSG tQkSV8O3KPUbETE7wFQlUIm6qOigLy97driYNOggp9H89jLmRwPhDGJVnPhe9RNxtV2L4a 4sYaLBCa3plKiGTdzGBH5W225Mq4rvy17m3ufo+PygnCcfpFZTjx5I55ex1Vug== 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 4cmRB01Qmkz17Q2; Tue, 14 Oct 2025 20:47:52 +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 59EKlqN3066670; Tue, 14 Oct 2025 20:47:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59EKlq3w066667; Tue, 14 Oct 2025 20:47:52 GMT (envelope-from git) Date: Tue, 14 Oct 2025 20:47:52 GMT Message-Id: <202510142047.59EKlq3w066667@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: 7e567f51ff59 - stable/15 - sockstat: improve output formatting 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/15 X-Git-Reftype: branch X-Git-Commit: 7e567f51ff59d169b5fd0bc350d0c7dfc9fc2609 Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=7e567f51ff59d169b5fd0bc350d0c7dfc9fc2609 commit 7e567f51ff59d169b5fd0bc350d0c7dfc9fc2609 Author: Michael Tuexen AuthorDate: 2025-10-09 19:10:53 +0000 Commit: Michael Tuexen CommitDate: 2025-10-14 06:52:38 +0000 sockstat: improve output formatting Fix the format when the output for a socket spans multiple lines. Reviewed by: rrs Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D52984 (cherry picked from commit 98b2a2265f5ee47bd932347699e6117df2f41488) --- usr.bin/sockstat/main.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/usr.bin/sockstat/main.c b/usr.bin/sockstat/main.c index a917672120d5..f0eb83eb3e9f 100644 --- a/usr.bin/sockstat/main.c +++ b/usr.bin/sockstat/main.c @@ -1545,18 +1545,30 @@ display_sock(struct sock *s, struct col_widths *cw, char *buf, size_t bufsize) else if (!is_xo_style_encoding) xo_emit(" {:cc/%-*s}", cw->cc, "??"); } + } else if (!is_xo_style_encoding) { + if (opt_s) + xo_emit(" {:conn-state/%-*s}", cw->conn_state, + "??"); + if (opt_b) + xo_emit(" {:bblog-state/%-*s}", cw->bblog_state, + "??"); + if (opt_S) + xo_emit(" {:stack/%-*s}", cw->stack, "??"); + if (opt_C) + xo_emit(" {:cc/%-*s}", cw->cc, "??"); } if (laddr != NULL) laddr = laddr->next; if (faddr != NULL) faddr = faddr->next; + xo_emit("\n"); if (!is_xo_style_encoding && (laddr != NULL || faddr != NULL)) xo_emit("{:user/%-*s} {:command/%-*s} {:pid/%*s}" - " {:fd/%*s}", cw->user, "??", cw->command, "??", - cw->pid, "??", cw->fd, "??"); + " {:fd/%*s} {:proto/%-*s}", cw->user, "??", + cw->command, "??", cw->pid, "??", cw->fd, "??", + cw->proto, "??"); first = false; } - xo_emit("\n"); } static void