From nobody Thu Oct 23 11:05:39 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 4csjr40vX3z6DBt8; Thu, 23 Oct 2025 11:05:40 +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 4csjr40GN3z3xxD; Thu, 23 Oct 2025 11:05:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761217540; 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=XTdupAnHz0uorH8JN9NAXl7+J3J9IKnXUfrf9hCDd6M=; b=mex1+VkH/Aws9gU4OdTWWNRJfmiU99ODlB3U+mXZPyb/dmICAadI7MDcbKrSaAoTAU0OVn DhxvH9d0QLlC1qE/tvTDN80K26+oxBMsw+ONKvgDgo/Hpbo8CRQGersjwfK5wIZO6qyNlW aKCv7M/I60mFzkshq63cNLj7BYON0qFxcmnxzq/K4VG8ibVansQ5x4ZgkXzkm5M3JYGhwx WqbiJiRTExqZL3uRAb0b5l+P3n5zDnZXGyx9gkwcQiYAzcGxkqPs2e2PGQLt1yalIVn5nC V5yzHKMyAUL9veMmsFZ3o/ypoU855TAK/rpHjqCYHwu5cC3tzral8ry+yYSCYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761217540; 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=XTdupAnHz0uorH8JN9NAXl7+J3J9IKnXUfrf9hCDd6M=; b=l/XS+6nlhMCHXoKLOMSQw+MgN1gkzXesgtRSuz7K/LfNSXf8zgmy8ZLMK8sxTZExl+VGNG 2PIALv4w/fTEvW5OtAs6qI45qx41TlGsfO7VvRcfntcrcMqgolFBlDEl4m2Xrn3rAh/t3s 4QbMQ4sczfm3v515JXXm2PaNXm6jYLbnmNz/HDIWJ5nr9LffWoTMUOshZYhFZUrgcHI6my SzsyFI+VV+CvMgqku/LEH5gkgDPYJMynHxP+phXAMHwOp2OHOppJgVxr6epcxV92N1v+uR lcYOtlar+O1HtxMvwzf7r1W7gle4I79+E3yM9dzHo/+Lsu1POY2yaRT/mMrEag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761217540; a=rsa-sha256; cv=none; b=x3tAJsSXdErGL3DdJTcePR1Tb8WlKt+h3MBKMkNZppim5a3i4IDHDomN5k7poFO6Um7LQy BGEe/KQdJZ4sv0/Wo/5FxgOLTjsAVZb7dtB8+Qw29/VNjWP9O2qFa6UEO6PczbeDh9cGca SC5ywypCZ8jr3I0QBwsW70zWmIlMv+StquTaEmrY6gQ39XMzNxtVSe5BKRxkUv0JnQjFXz 1i/RhqPtxPXAEbX3evQumDuJRYOqark7YLxQr8r4sB1NRjSw7o+8QTFXz5FLt0vLuTlKA+ vVFzklIdDmDQ8UKBmK1Ra3UyeEJbeLViOiQqnNKyQzaEDOE4F5OMZMIDWqIGCA== 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 4csjr36pV5z1BW1; Thu, 23 Oct 2025 11:05:39 +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 59NB5dDU011575; Thu, 23 Oct 2025 11:05:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NB5dMk011572; Thu, 23 Oct 2025 11:05:39 GMT (envelope-from git) Date: Thu, 23 Oct 2025 11:05:39 GMT Message-Id: <202510231105.59NB5dMk011572@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 8c197879bf55 - stable/15 - 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8c197879bf55dd9bdec84397fc29c3abcf959840 Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8c197879bf55dd9bdec84397fc29c3abcf959840 commit 8c197879bf55dd9bdec84397fc29c3abcf959840 Author: Michael Tuexen AuthorDate: 2025-10-20 14:26:52 +0000 Commit: Michael Tuexen CommitDate: 2025-10-23 11:05:27 +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. Reviewed by: asomers Differential Revision: https://reviews.freebsd.org/D53212 (cherry picked from commit 4ee0ddae1dab05dd8e3f273d861043c3e2919f23) --- 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);