Date: Thu, 23 Oct 2025 11:05:39 GMT From: Michael Tuexen <tuexen@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 8c197879bf55 - stable/15 - sockstat: fix column length for PROTO Message-ID: <202510231105.59NB5dMk011572@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8c197879bf55dd9bdec84397fc29c3abcf959840 commit 8c197879bf55dd9bdec84397fc29c3abcf959840 Author: Michael Tuexen <tuexen@FreeBSD.org> AuthorDate: 2025-10-20 14:26:52 +0000 Commit: Michael Tuexen <tuexen@FreeBSD.org> 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);help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510231105.59NB5dMk011572>