From nobody Fri Oct 23 18:25:03 2026 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 4jBBJb642Qz6xQZx for ; Fri, 23 Oct 2026 18:25:03 +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 4jBBJb4WB9z3R5V for ; Fri, 23 Oct 2026 18:25:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792779903; 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=GGsoWXEZTItm1Z1KXYTP7UIFipb9JnZFZl663hotle0=; b=QCehjtCCvCGGYhnz8U2Iigj3cfJ3UGoeOn6hU12B+kNgoTp0R6OHmOvAwYTvAxw8z+hTOO k+RAe83E37msOzZRrr/d3YKheik0PLbcua0+/yjF2ry7nrS2WFxlfa7dQXdp8eYFn9if8f K22EXlsohEw/Xikgd3+Apd1F8bfmVHZlAjgC0W6FCIXCD8TEf96dmkDfj9PQaBXhVPhwdb tHhq7DfJToGzo80DyFCsGNvQFt9OeYPsO4gDwToiWOdYOduZiri2F2Lr3/LEIdTrSQAkcU aK2ZJ4k5J69PACDkVkbALkOE0V/X5MgWiKVARMdJ+6Bh2esTmrykL23iap4W7g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792779903; b=S3TjpseHLo/AlxRogL8/sZOJCD2UMABMNmRN5MIIviRd1XW2C8tjusXF24oonvlx22vofI kS1hknDaHALo0BjFkED5O6UdxKgJ1VS66o3pJ2r+EfGI8kvvYaRZkfpUu9mh9UNtpbmjPr 4C6n4OTYcsvtEd3WqSkgoghiwFbiT0s3LtkiCP0EDiSeNkZIIH+CXeDjkpkocCeM1S2SWL nii7gWVWSWSX35MCKujnaZnyD7BjvsHNLZcrO/spkH6EF6/g6Le2f1M6yzaN9PnPVeoHc/ mBaQuiMXUZMibHfc0JdVG1OUXsqgSJdRnR3zYsz6eIeOCoIy5vbkmh7g+WgVyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792779903; 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=GGsoWXEZTItm1Z1KXYTP7UIFipb9JnZFZl663hotle0=; b=jr2tZpbKCtHUEYo0AlRUeBPtvzLyNTK5STI2kBReG+z8sHKvzy7GjndFEKrNGHXXqtPagq 3Sb3ybfhVoqHcCvt6TvVMiJ6LGYoupwnHtgd0ZEgrBCKWvEbelSOyO3Vze5rfEzOy8MseM dPR8z5D3EwBJ+qqdWzIAjr0e7mmodlP3Q1dridM4hXO5f8ci3Lzbm8Y4scK/sJEGovG4+l spvuQmmnJFiXO+BGvfan+pNcNVx8T72CyrukVpRTqXWa+/eNcYsN+0mxbuT7iHYJozsLo3 aDdMgUL3WTrNx2o9sb361/xp2G2pZFldMOZZNWElrHH9vq2XRT+83zAHEgpaPQ== 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 4jBBJb4B5YzhWT for ; Fri, 23 Oct 2026 18:25:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f216 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Oct 2026 18:25:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 2001681da179 - stable/15 - sockstat: improve consistency List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD 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: 2001681da17920216251a4dd35c6778bcabb25bd Auto-Submitted: auto-generated Date: Fri, 23 Oct 2026 18:25:03 +0000 Message-Id: <6adba67f.1f216.4ebadfbd@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=2001681da17920216251a4dd35c6778bcabb25bd commit 2001681da17920216251a4dd35c6778bcabb25bd Author: Michael Tuexen AuthorDate: 2026-08-23 19:55:51 +0000 Commit: Michael Tuexen CommitDate: 2026-10-23 18:23:27 +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; } }