From nobody Fri Oct 23 18:28:42 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 4jBBNv5vzSz6xQv1 for ; Fri, 23 Oct 2026 18:28:47 +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 4jBBNv4F8sz4D01 for ; Fri, 23 Oct 2026 18:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792780127; 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=sxlZoUzENTjdz0hDpZ9j4BLwb9tWl5g4ENl5oQDKpMo=; b=U99YNMng9H1fobCcCSGHbATIeBbzdjBg6RqonadhoPn5VDKaj54579BHS/tXRtc+EapWb/ skF3k6skjQQG+geSSAbeQne1ou/UZcCMNXuh2LTtEvAN5fafPlXo5WxFDg48cJNInHNTj+ hjQhfZl1OfnDvZvUJTtwzQraBVzE+6+D2juQP7RgH+3bSop91xyiaLmQB0sZNjg4dGgosy cwbvQij0P0sNJe/hykcIwqmFedL/vPJXHtSBnphmxnMuAeq3xKHBVTnN43ms04D/MJt0R3 X2bcOs/nRIwEvrhrn3D/QSoKLzCk0qbNekewHpqML9sEgGou6h4WKhN+JkJYGw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792780127; b=JFjFjK+1ml5R6nLekW7uJNwvRXtBqs2R1nEgAj8aDrWiM6FBqj2UUYXvvkv+kTUCS/VZYv HTvuSMroWAwe8aY/BQxxTp+cUqTCmUx4aAs7i5ttEwa5B11KNhpSfGn2D2b0VuowwhfwDV iFbrsj5QG4eXOnUF6N9h1ykLvCTE7XWVuJdyOaVXXfNw5bejPtCQLoIBbnoyrBcHeIcfLK y/huNf036XR3U6gRcvq6ztscHnMu4U1BLFERt36I/aNROzZVSGNUAq0rMuuB4ebgC97Oy/ RTSz4uh1fvpkMtElEYW2kfGkJZTl/jD5cnhOkDtDV4GlvZ7/8G8mQXvlMe+nxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792780127; 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=sxlZoUzENTjdz0hDpZ9j4BLwb9tWl5g4ENl5oQDKpMo=; b=BOAvkcKEdr88s89Uk2r3+P1nMhps3qNddkT62pugUkGhfyu/PD4WyGqaNsMYndO8zoSZWz j0E5u6rqqCXOnz7MBomzTJTKyDDBWnDlpEbRJl1jyRjetIMFnf753NXEE2+qs7Ag3fgmSB w2oJUFzGAyJbX3hyPsM+PQpvMxGznqJGMhZYykakl36T7bFkyyMS585XzQeECRQzciHiFE uCou0fJW4HmAOwYCfUlfes+WXh39DG1cdizvf5enx7vppZggl87y2e1WYFMMy3WrHcsUjG 3NY5oHZKZ+IzzWzhs5xDdniT/xSGfjQ+bWc0VpLVbucwKjvVglgyRqEifEuIAA== 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 4jBBNv3vKrzhsP for ; Fri, 23 Oct 2026 18:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f720 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Oct 2026 18:28:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: c31cc4376dac - 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: c31cc4376dac87067c03c64e6bb1227f92b7fe0a Auto-Submitted: auto-generated Date: Fri, 23 Oct 2026 18:28:42 +0000 Message-Id: <6adba75a.1f720.291e4628@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c31cc4376dac87067c03c64e6bb1227f92b7fe0a commit c31cc4376dac87067c03c64e6bb1227f92b7fe0a Author: Michael Tuexen AuthorDate: 2026-08-23 19:55:51 +0000 Commit: Michael Tuexen CommitDate: 2026-10-23 18:27:50 +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..f334ba13d681 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 == IPPROTO_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; } }