From nobody Mon Oct 20 14:30:28 2025 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 4cqyWm50Tvz6CVtY; Mon, 20 Oct 2025 14:30:28 +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 4cqyWm4NpNz3Cj6; Mon, 20 Oct 2025 14:30:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760970628; 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=evYNlDkamZTVLSArhV+aXjUzeTzoauj/jdKIXfjj+Rk=; b=avA+YXQ0x85ZmkH9j4sawhyveuSSYd+9hVYOvZfQp1yo/qzDrWF7ef/atgxEmx4Mn2JsST 9jjDu4Sh/KPxNw9yrgVFEHMvSZ86FD6bRVce/qj2uGfg8hJKumJVbuWYr+0htbMvF+t9NR Pr9aUwNjDLEMYrq+A7Q5xl6YJ1zC2yfKLLeYuIeNdFeW/Zl9qHd6V7vhwecGY80lp5F18T hvPqk7OA/i0fepXAWb4WiPON8v570XHjQqZn/wSHFG+L+Ku1L1crpXRkWKPMJ4jbHdEWfS x9KkNv8JnWXg8SAIxmJwZ9/jezMJu+apT2Iw7LQCahqy3HhWwB6p7rybRwpYpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760970628; 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=evYNlDkamZTVLSArhV+aXjUzeTzoauj/jdKIXfjj+Rk=; b=Knyshilk1vhWPCJY/wOuOcoGEfnGvtkg0nC2u+62Ch4RL6ci4WhRBg37SSFlFDsjUyhpSD JK7JQBLCKXtwGP6G4vAas6rhFP9MXH0KhG8dtvaIS4jy4XmjjcqyP1xDS0p0x1bikMguOb WugD/N0mjTzCi8k9eBV1SiUnar+W4CZEofGIZGxftCfjAXjZcNKYmRH9MwjdqdLD5cYtnw feds2rhSBfU2+Uc3S9mEGbO4YpFtFzkiw0SYW0RflJstpfWfBp0vWsvjeiMdIOvU0W0nUb VCE0shzARuHcXkHuZqMy+TvkVhsgznYRG5uJKYVXVyHJQu844TfNZ4GxucBLjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760970628; a=rsa-sha256; cv=none; b=mOfU9UD+xxvvua8AblMNJ2u0WyTv1kPNsPjY4wMXklUcqZQF2p5cJkoQ+b9gUAdj5i5ttR B32mjt9f2/Bf9HqKxryHHUi8cNemmu0CytzSb8EjNQQkdij/MD190Juu7KHzSkc/lKvUQo 1RIracUHGxzR2Smrz4HaupMS71fsJe6Xa+Dfk8rnaGf4Kd4rrgta0nNNdlIPBCnj7p6n6v 4PzjnT29Gxv0nKBx/nApuzQ3bkhRjKUHWrOWf75ij/X5K0LeISWFlLzovMUX0aC1/NWzaA Ipy0jWEn9C19mMvASteQqhwj4AfNYHMLC+MRODtIMH3Wsjs8COroYX/ZFGP9iw== 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 4cqyWm3WJGz1hc; Mon, 20 Oct 2025 14:30:28 +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 59KEUSbs043356; Mon, 20 Oct 2025 14:30:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KEUSVJ043353; Mon, 20 Oct 2025 14:30:28 GMT (envelope-from git) Date: Mon, 20 Oct 2025 14:30:28 GMT Message-Id: <202510201430.59KEUSVJ043353@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 4ee0ddae1dab - main - sockstat: fix column length for PROTO List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 4ee0ddae1dab05dd8e3f273d861043c3e2919f23 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=4ee0ddae1dab05dd8e3f273d861043c3e2919f23 commit 4ee0ddae1dab05dd8e3f273d861043c3e2919f23 Author: Michael Tuexen AuthorDate: 2025-10-20 14:26:52 +0000 Commit: Michael Tuexen CommitDate: 2025-10-20 14:26:52 +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 MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53212 --- 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);