From nobody Thu Oct 23 23:37:21 2025 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 4ct2WQ0nP0z6DsCh; Thu, 23 Oct 2025 23:37:22 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ct2WP1LBLz3RqH; Thu, 23 Oct 2025 23:37:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761262641; 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=FNJK0ZBZ3Jgc4ByoqXJ+8df8qv5n5fSnKGngeNVtQrk=; b=VUHMPdkDoFfgpkCaY0Q1hfD+I/jaD+ZLcknp+JpIHY3wr7JhvSYRTyLZGsHXjd5c3j5Xcc KcnIkeuMjO6TBoe2882REzGj4zx5GDZUVYRzMb5OGXHbJCEbnyHwGBYaDnS3flRdpi9HOj zLeuiu5gZvD01wvUnoGPLzDYsw/LvvcmIcux0pknsTuFmCjGENUuYCczIcZflCSS3LAvzD M99IIpf2g0CkEv29hEirc/uDjXF6Pt2RLnUAQ+WVyC/pJrFD4W4dL4tmmtq1aDuUZb3cRC 4hY48a3Zae/N+NFLYtmPgMDvW53VqX6q1+t7ckC2CR00W0NLVDG5I8tT6vltMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761262641; 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=FNJK0ZBZ3Jgc4ByoqXJ+8df8qv5n5fSnKGngeNVtQrk=; b=oBtFFvbG8UcnNynxrzI7oRWJf+8fpOw4QdtZYjco1K6wxPy8+Jv4N5Tv7BcEaSGXwQortY sM4B9NEytsmcPcLdkBDdYy9uwCTz5AvS/wxhA0hscRSgT6IF4Ud9Eab4hAA/2f/POyGyM+ Pv6zmsVUNfPBvgTQlJSDw418/pGbGmo3Oe+R/+aO+0U34Lnk2/N8v63vUzFYanVehBSN1B jgOec9iDb/k5q5QE742O1s5r7jtgoc8IiiCttpRRZ6gnHY5FV7gtX4v+bEvU6czjXrksWd Q3edjRVArsMFQBYoizOkawQViXO0/Zz69eYLafHMlqPdHscXwWwpuzZQ/tNT9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761262641; a=rsa-sha256; cv=none; b=xIac3Hpiyg02Hq3W9ySUCHsvGE9R3vh/Z/IoxyEha84zxGj0uQe0537CJYmwTYKtekLOy2 R0g5WFxdO4pywmWpg+QQJv0N+jD3tGqWa2v1nfZHIa8qZ2PTKz14JHc8/V2yqCoSFdrF59 74k+ntuK42IRDLjLQnjzIITtDSGdk9WKQRDG5FiDAwBq4b+lvzFmT2p/zrSTd54aEY5m/u VD6fJasDPBkVIqzdQ8qSEzEp+oFH2hC+9R/j/xnSwPH2VMKbjm20ggO61i13fmDNAw1ifI csLV+YPkY0QW/Y/TYF6Mt/WTCm5uTgtbJ7Q75iUxQTVmbab7NCPbCSaLf8EoqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ct2WP0kvjzcTS; Thu, 23 Oct 2025 23:37:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59NNbLpQ026622; Thu, 23 Oct 2025 23:37:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NNbLii026619; Thu, 23 Oct 2025 23:37:21 GMT (envelope-from git) Date: Thu, 23 Oct 2025 23:37:21 GMT Message-Id: <202510232337.59NNbLii026619@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 369ef36d0857 - releng/15.0 - sockstat: fix column length for PROTO List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 369ef36d0857f59a2178db707d963daf6ecfcccd Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=369ef36d0857f59a2178db707d963daf6ecfcccd commit 369ef36d0857f59a2178db707d963daf6ecfcccd Author: Michael Tuexen AuthorDate: 2025-10-20 14:26:52 +0000 Commit: Colin Percival CommitDate: 2025-10-23 23:32:34 +0000 sockstat: fix column length for PROTO The computation of the length was not taking into account that IPv6 endpoints, which are not IPv6 only, have a suffix of 46. For UDP and TCP this bug was not relevant, since tcp46 and udp46 has the same length as PROTO, but sctp46 is longer. Upcoming udplite support will also be affected. Approved by: re (cperciva) Reviewed by: asomers Differential Revision: https://reviews.freebsd.org/D53212 (cherry picked from commit 4ee0ddae1dab05dd8e3f273d861043c3e2919f23) (cherry picked from commit 8c197879bf55dd9bdec84397fc29c3abcf959840) --- usr.bin/sockstat/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr.bin/sockstat/main.c b/usr.bin/sockstat/main.c index d1ea6b1bc958..abb73acafc2f 100644 --- a/usr.bin/sockstat/main.c +++ b/usr.bin/sockstat/main.c @@ -1196,7 +1196,9 @@ calculate_sock_column_widths(struct col_widths *cw, struct sock *s) first = true; len = strlen(s->protoname); - if (s->vflag & (INP_IPV4 | INP_IPV6)) + if (s->vflag & INP_IPV4) + len += 1; + if (s->vflag & INP_IPV6) len += 1; cw->proto = MAX(cw->proto, len);