From nobody Sun Aug 23 20:12:11 2026 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 4hSlZM4MKxz6plWZ for ; Sun, 23 Aug 2026 20:12:11 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hSlZM24FQz3RJr for ; Sun, 23 Aug 2026 20:12:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787515931; 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=F7uBuqoiEsYNQm3zO0aUfYSZCBr5sjOyOLV2oLQBUJw=; b=S7iHsPZ1Mkt7Q7CM4x4MSXk16J8HMETomPfV3ihn3NJAcmRIZ1mwm5ctb5K9Ld8DtMpMDu BZNNj1LT10PSrebHP35RTgKQ2C2N8dS4ya8MeoEjIitGH/TDK98yrEFuwwV4rX+wxoU8Uq xCqT3W0Iy4Wia4j2bilziYV2yYX9w1VK8NFY6WaRTL6w62eKbVQ0kyoPwYZpkkmheUel0K nzzUp8QOezHRqYHagmXpdyl3HK8u7CqGqfPm1QZ82V/YkSXCT02DXURkhQcrGId6bAxuy/ TyjcHqHGGV+5wpLdWMBY3P4xwal9cQPuFmnaeW3WwrCLj8dAx65vIJFdxWdwaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787515931; a=rsa-sha256; cv=none; b=EJ7lePWv/MghDFRwFu/CLB4WJfp74igN8zzIRz2RWOfFLb58+wUXp+ArBgKhVvWgGWzAbP WhXblPCAAOEbfQSeYhhmYU9Jp925E0HZTUdX4WmhFK99pveOqU2fzp9wzIxRmy1y/eOyz6 TSMZmn36k4Ndv1p+m9+tr/6cirQwgfAseEvMPrIb30xipdPHsbYkPieEdF6ZbOejcimckG ILqAFeq2mzVOmAZUHf80TxikhT4M54DFUzj+5yjK8A5ZSDhuENemVfXKlnAsDSfSku7qiN tl89924GXPt5XImt7mJSEDhJ7Qxm/IMWMLC+FtrIK+pJsFO2PABWnXgaIui9/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787515931; 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=F7uBuqoiEsYNQm3zO0aUfYSZCBr5sjOyOLV2oLQBUJw=; b=qBblZeKbBD41ckoukJmsBEUxvijNAsPPJD3VTfSkRl5cowiBxGTJYWo69YBVtvt96EEa4x IVHtZsJTk8jgiZUbZIQgUbKFTjan4xvtK6vJWFi1BYsfbU9qvcOd2Z0XVeSPturzWkk4jD py78BHFT4OJ2tvk85vLe+mUO2asbt3jWGs6EIQGvQwT3ddzrn2l772Y6bE7rZ1HBkMcMZe WJE7X8PT4kQsagk9ro8ExZIp1OmnxOHjK3zWsnhu1Lt0wWYI/qWIfy20Yh3KiJv6MHWCfL 2BV/wniTLSLtAEVjA7vhqCkiyhtY4trHixdV0KmpkZUkHyO9o5oawxEdoXoHww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hSlZM0sfWzYns for ; Sun, 23 Aug 2026 20:12:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bfd0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Aug 2026 20:12:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 732c8d2a1a0e - main - sockstat: improve consistency 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 732c8d2a1a0e169bad1c02b1e54a4306861bde4a Auto-Submitted: auto-generated Date: Sun, 23 Aug 2026 20:12:11 +0000 Message-Id: <6a8b541b.3bfd0.4b00df74@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=732c8d2a1a0e169bad1c02b1e54a4306861bde4a commit 732c8d2a1a0e169bad1c02b1e54a4306861bde4a Author: Michael Tuexen AuthorDate: 2026-08-23 19:55:51 +0000 Commit: Michael Tuexen CommitDate: 2026-08-23 20:11:24 +0000 sockstat: improve consistency Include the entries of the BBLOG STATE column in the computation of the column width as done also for other columns. Also set first to falso only when needed. MFC after: 3 days MFC to: stable/15 MFC to: stable/14 Sponsored by: Netflix, Inc. --- usr.bin/sockstat/main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/usr.bin/sockstat/main.c b/usr.bin/sockstat/main.c index 7acfdc08b0a6..d448f7fcf005 100644 --- a/usr.bin/sockstat/main.c +++ b/usr.bin/sockstat/main.c @@ -1312,12 +1312,16 @@ calculate_sock_column_widths(struct col_widths *cw, struct sock *s) len = strlen(s->cc); cw->cc = MAX(cw->cc, len); } + if (opt_b && s->proto == &protos[TCP]) { + len = strlen(bblog_state(s->bblog_state)); + cw->bblog_state = MAX(cw->bblog_state, len); + } + first = false; } if (laddr != NULL) laddr = laddr->next; if (faddr != NULL) faddr = faddr->next; - first = false; } }