From nobody Wed Oct 15 06:08:53 2025 X-Original-To: dev-commits-src-all@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 4cmgdL3Nt7z6Cn7C; Wed, 15 Oct 2025 06:08:54 +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 4cmgdK4KJ8z3JvM; Wed, 15 Oct 2025 06:08:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760508533; 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=gaSgPrJFuDhRmkpo13g4gHlp6Cw9znM/RsRJBUS6Qac=; b=BBKPJWrCdo4W3w2kOMk8FNYtKV1w8doNXWAMsyqFS/GVKoqtNGr9bkSG3TY8BCoYwop7SX B3nZ+BqpBtKDAFmfaUlbEklJ7Ney0DcxBaPGlYuiaS3K9dQQsdSTfCCHwI4TDiD8WqUaRi u+vcl61+swX42q6Km1JBIG0Riso1Q9PxHAynmK19iGX5lR5ohnpkWYMFhiWlhDVvKNiqPC rZCkqCnk+TbigjoM63v4FTCnWnKNw4YJFNMTDIiAbO8fNuiv4VGY1YsPH7HidmopwZPy59 HLUyiotPhSs8AK/ZSxVmop/jIUPsVd+pYBVRitZJvj37Z/AMo+vPUkrpwkAekw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760508533; 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=gaSgPrJFuDhRmkpo13g4gHlp6Cw9znM/RsRJBUS6Qac=; b=C/oWsCXbThLNWPP+GxAZlIHCJPI4TDqUd/tjNDsmpeq3m9yajaVuyLgy7Iwzr0tSqToaen 2Es0/PkL6FhYYbWlP4++a5zk6xvGfLsb5s5uTXGmU+Bwix6B/cMajOkoebIuZviW+n6yuT dF7jzQR4akGmoMC6QpJ6Bwz+xySv59+TLKRNqWcc+tC4GQo96FmntP4Zp3w33YTW5ZLVLY jQdGqdPeK9U9CVcwJjyHeB8cHd0DrBxyorr7FYNh7AJutDJITrhLVb4BmhTeYzbCKtbByk C2HLMcuvjqupM6n5Hsvfp7CIqtGFU1+yzFB/z4Wg2jul8crrp2oD8IqGckn+9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760508533; a=rsa-sha256; cv=none; b=lNyyCKUxX4T3GPyAExKsgdwFvTp/LJM6VFSm2D7y8wsid684zRkepssLU/cUhvmqbPD2+J 42LViWtdZpjAT9nkpf62BX61O5mYOxILziR8ZHZ7gT8stg3vON/9Re17GfNKHU/HtTxXoC Phf9J64kjnq2Vp1keZhyfOdRtMTg76aZQF00HilCI/yjUB6bpBnpFHeWsd+YbYKszhT44C KLL8rQl/QWQ3n5PB4hQbBJwayTWZmunPZrrcpR4eiD19BivF/KMgMUP2U/EsOtAxC9zd52 b1DAnP8NSSA8jApG9HQW+XU6Uvtgg1jRsJwT+nDDPh2uvXIwFs/jBygljNy1bw== 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 4cmgdK3jsKz9ZK; Wed, 15 Oct 2025 06:08:53 +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 59F68rck023263; Wed, 15 Oct 2025 06:08:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59F68riK023260; Wed, 15 Oct 2025 06:08:53 GMT (envelope-from git) Date: Wed, 15 Oct 2025 06:08:53 GMT Message-Id: <202510150608.59F68riK023260@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: a9ffe497c864 - releng/15.0 - sockstat: improve output formatting List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: a9ffe497c864775e4979a7190ad3feb7884aec66 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a9ffe497c864775e4979a7190ad3feb7884aec66 commit a9ffe497c864775e4979a7190ad3feb7884aec66 Author: Michael Tuexen AuthorDate: 2025-10-09 19:10:53 +0000 Commit: Colin Percival CommitDate: 2025-10-15 06:08:09 +0000 sockstat: improve output formatting Fix the format when the output for a socket spans multiple lines. Approved by: re (cperciva) Reviewed by: rrs Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D52984 (cherry picked from commit 98b2a2265f5ee47bd932347699e6117df2f41488) (cherry picked from commit 7e567f51ff59d169b5fd0bc350d0c7dfc9fc2609) --- 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