From nobody Thu Oct 09 19:14:14 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 4cjKLG6Mnyz6BygK; Thu, 09 Oct 2025 19:14:14 +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 4cjKLG5Zjhz3P9d; Thu, 09 Oct 2025 19:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760037254; 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=RtjsrUlIjQRIxadpG36W4YycMMi9GcSxupQeSUPTMiw=; b=kzJQrGURCWrmAeqitXGFysjXX/ibyRxCim1RwL4C/NF2bRXMXmItScijwe/kqyz+khu7tj Jm/JQHAc5UqRT8Y+LKgIomHsCIUpHDKMHW2R1CY8LPHZCkSsYgQW671VZ74mfTuXcMJQ4t HxnsW8c+DZJ6DtvEutO8yy2xMlDuMGkBzgk75cC4XbNfK9rCDcklfT2pwz5r1Z6B7MgXgR n8bxROPTAjBk3RfX5SosINGylXk5SQs79xHOSzk5KWr33fOdKH+Jt81zpdzmJm/huMUtuO jMWkderE8YhiIwInjIgItGycPfNSGdXMm/2fmRGvI/ArySBS295PvKjckHJUBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760037254; 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=RtjsrUlIjQRIxadpG36W4YycMMi9GcSxupQeSUPTMiw=; b=us7Hdyn0woEF63EdeLinBNl9nZZWq0/qSHZNwxLVz7Kl8VXf0K10LNGvv0MNfJoKJemWiY Y2HvTM5Cw9FMW6w+TCffaQFN6h84j4zgi2kMnFnvYlwDPtPkDUA82lBnjjUATqOIrA3bis rPci0LSEBa3bt5yEGjNMvqaySa3Ozu0m0kJmVD2C1cWv4liVQojhOXMD+y4lsOqLUC67gM Mg/icGHfy301ZtNieMUyHH3xIZci2tV6nbCBhOu2lsnB4G19cgXImjGwijMjuD3w8BVuYl PQF5mygdkXg2kifx78MUvSpWk943d3AwMNNh1LvmwmbkZsKAhgPKgFdy6fLBNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760037254; a=rsa-sha256; cv=none; b=R1ZpbXDMS4TTVZ+H6XJupPcYsrzyzuZGVsayY7u9wbpC/wgknFNG+xQ5cu/KwTWlALuaHG UlosF0sLzdZNHPmX2QEVHRJJ287cJjuVAqY3kCeAL6iCEk6xfw6dhR3Rk/+EJv3Ibfy0kV OQPsSOcbAtUmPN3HU+QXIt9K172L/XB6M8f7/KSazIo/+jlF7n4zLPrSJaIdVpeKRKw1wA wGcGtMh8uS1EmeUGGFAIA8B+VEWMAncf/DcUy7gQt9d+BMba3gnpvAx7cZzH78kABFP4/S H3labvnovUAvmVJp0oKwM7N6rqgyunv4hBwQpnT7YATmGx3h9Nw7+2xc/FdmJA== 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 4cjKLG54MrzVbY; Thu, 09 Oct 2025 19:14:14 +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 599JEEiD027025; Thu, 9 Oct 2025 19:14:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 599JEEAE027022; Thu, 9 Oct 2025 19:14:14 GMT (envelope-from git) Date: Thu, 9 Oct 2025 19:14:14 GMT Message-Id: <202510091914.599JEEAE027022@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: 98b2a2265f5e - main - sockstat: improve output formatting 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: 98b2a2265f5ee47bd932347699e6117df2f41488 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=98b2a2265f5ee47bd932347699e6117df2f41488 commit 98b2a2265f5ee47bd932347699e6117df2f41488 Author: Michael Tuexen AuthorDate: 2025-10-09 19:10:53 +0000 Commit: Michael Tuexen CommitDate: 2025-10-09 19:13:56 +0000 sockstat: improve output formatting Fix the format when the output for a socket spans multiple lines. Reviewed by: rrs MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D52984 --- 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