From nobody Fri Oct 23 18:28:42 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 4jBBNp4BTkz6xQmt for ; Fri, 23 Oct 2026 18:28:42 +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 4jBBNp3hx3z4CwN for ; Fri, 23 Oct 2026 18:28:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792780122; 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=RfE1cht0y1sC0ghP8+VQDmrG2YXKfgqnRbDVXUGL1lE+0aavget5APw0pM+KN/eZthuq1S yFshdyhm+L3RilcNopFaAThbkwmc4tNLjGRLEJ2zFrzCi0hL8hBzfIB4ybe6lWA+EklS8k R9FfoLS8Ca/bX//kGbAgS1a29SHscJn4TMR+e3ELuH6mAG4YVgyP+5CzZ89BREgR3whe15 34xbr8YndDE3KZVwnaphg6709SOAoKuW0neE4CZa15EVamoR4BxLGJRjO4DBDHBAaT2lmF LD/2eS3wH2oHSxJMrjsgGFWzh8+aLy+ZIsT+yefYTMfLCLs4z146gOc0g32toA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792780122; b=GtI2hUrMuls9gOTeGWjz94Mz/upgGMnEMUY6yhWygg1RRYAb4IvJa9DcQ6QCLOKrXpzGge WPW3ixwYcCNY17zI/vZ1muWKASy/pzbI0+Y++AlSmM4wjqZUiKmA7ofgtilma7msCCyWgn 6EmvbCuBj/81TPNAus3aCKjdqIMm8s1qxqyPV6mxG8/l/ysmlgjkPQAo2P9hB+R/KqT+hg wnwQhIDSh9zrSGoyWbAmTTwQhLru0EI4paIhtDuZKkqdgI/1TMnb2u2hxWFddfuZ/6vTp5 LCgDgdlD8pWoh18oGf1H36HMqGgTlZaimHKF7bYA5H9V9/QP9LkhZaukGW1rlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792780122; 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=MjNyNBeTIZf2rrOVTPyOA5JClJPfq+uXrh6kpgHc/5HWCHIYIFewOIdD1rEtNxEznSRe8x jQYE9/kDM7c1acbQKvXCiAZ7yA/SwxRlP+QbGqnOzygaXlzvvASxFK+jBnJho9V9Qk5i8c V+O+o4Ite1EbbVWq4vIAvo+X9LCu94Chypy8YKShL5Op3ysMwnxOXtmmN62lmzaRLbppjT zXdwQEmeNeIvTb5Rycr7bH91WFb6RZF13vtgjOtqdNvf1cT7mwGon9Wm/8psvIS2mMmMr5 fwuxUGF6j25yzSyjV2oWtOdCMlvZ339d7eVVYAyE5xN13/PMQhFe7FWswGh4RQ== 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 4jBBNp3MHFzhRk for ; Fri, 23 Oct 2026 18:28:42 +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-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: 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; } }