From nobody Fri Oct 23 17:15:14 2026 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 4jB8m21pCfz6xK47 for ; Fri, 23 Oct 2026 17:15: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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jB8m20VHgz50wK for ; Fri, 23 Oct 2026 17:15:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792775714; 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=gFb4Xgi/9lHYq/ez2lOm8WjPyTl7L8rHiGE1DkwoPwo=; b=Hph3oiU2SQHaYD7etN/Y7gSVW1s11tVnBHLv3exuXuGTYK2QVT+T0/swL8rWN/6Ysi78Fy suR+by5VWnUFcI6peoq3iWVJj1Qa5fGnVWf/e1/ZbV8R3tlraXjVMFvzfiMdy/G8DEhB4U JavrTpKd4cL+BRfefw/N9r3h6gjFqqp6UbBkHndA8wqiweosGSbY1cjNEzyYkuBR/JEU3F Ezj0prrCCddDtAuLGrZCn7MG/czNRUhzuB90vDx+Azl+j0pgp/tsCondLX7N/kBfyqDkV0 LbozX5V9S6ZB+g5CHEa+u8uKQfFMcwT+gScUEl2FldMD47ldg4uUtwwHYWrqbA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792775714; b=i3zhqoDsErnj9HK8Fkyhs616c+Wl99yhaK61CEMQmzjCgZ83R2hTifIZNXPjuDMtH/vTTL oAascXh0rwW/7wav43hqGbyJxATq6riyzOOJkd4r9Q4829Mf4NAPGZU262gC/vdXjzOKKf 9tBdg1VzRU+WzPXD3WJiBi8wD6CdLHaNGCso4+EHjGn0p8PEJlcbN7nRDXH/6qT4wYsebJ ZRq0n9Dp0ts5nyRmcEs7eWCo9aRDviriLiseZP1KYvx9kZ5UdzqDtuCKtGeWMJ6BQAo7dm myNHZ3mqLFQiagYr0/8iC3O36p7mg2pJfO89XFoBfpCBIrldj8siX6LyPLLZFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792775714; 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=gFb4Xgi/9lHYq/ez2lOm8WjPyTl7L8rHiGE1DkwoPwo=; b=SqR379ecJwo5/w58HfnqnXzmW8u1jZhVw2Sbqr+iSxJm51pbpFK6Xn5X4xssNrzfuqjn0L k8zgtzlUdC6K+/ob1TWzvI+XMR5Mn0zK34ug/QbpQGS/6BRBMolbM1RQCBt2kdCdplO1j0 E0MxiMgvp1a81oVSJkkn/xPAjOVhj1cJ4vkeVHD+IBndjqolpMDUYxiFy/L6Tj3ewNGlDf 6lk8SzV7XoaMS6V0KyJ6PPNFwZuRvBaj2Ht1JK+U5M/vGTm5tnQThnEhXf0+gOZDC7mXl0 ncnWV+XebszOaXJuBDsYRzw7wNMAvH6efDcy+xgKQ3gstetEKfUVVrStihjKtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jB8m208XKzfdW for ; Fri, 23 Oct 2026 17:15:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f14a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Oct 2026 17:15:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 71b1f005a56e - stable/15 - sockstat: improve consistency List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 71b1f005a56ea11bea1588f2b215f8714a36e71b Auto-Submitted: auto-generated Date: Fri, 23 Oct 2026 17:15:14 +0000 Message-Id: <6adb9622.3f14a.7499f679@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=71b1f005a56ea11bea1588f2b215f8714a36e71b commit 71b1f005a56ea11bea1588f2b215f8714a36e71b Author: Michael Tuexen AuthorDate: 2026-08-23 19:55:51 +0000 Commit: Michael Tuexen CommitDate: 2026-10-23 17:13:57 +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. Sponsored by: Netflix, Inc. (cherry picked from commit 732c8d2a1a0e169bad1c02b1e54a4306861bde4a) --- 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 df09245a8f0d..0664e38b89ff 100644 --- a/usr.bin/sockstat/main.c +++ b/usr.bin/sockstat/main.c @@ -1318,12 +1318,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; } }