From nobody Sat Feb 7 09:52:16 2026 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 4f7R810pWbz6PYLJ for ; Sat, 07 Feb 2026 09:52:17 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f7R803srgz3CL1 for ; Sat, 07 Feb 2026 09:52:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770457936; 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=0eSrkX7DiK7R1QS8VQaxJ6Qu/ZgYnC6He3dOm9I/kDM=; b=shPeMYzj2ISLQpPcsvMxottjGyUvGek3rt3M/3stk0Xpq/NIwIDvdZnT1gn49RDBU5okaT DJ0mGx4iasWbF/9VE9eoAFA3pY0fdHG34B5vprEvvUSJy0AU/JniIvb1sKzl8IG+BBz/iW 4IX0G+LgIPq5Ad05WTaCzb9XZxBKNCQWxU1sEFphsLadgjjaTJYfkQxsafmUqX5WrETBt+ FOezK0sxX5nfyAFLSFngpDClWNuMBCqEoVCspydLR2CboMxQ9u7ZtNqteRxrWeu/4buMss 2PG9GcnOL/ssptgE3DiayERUHOS5zXZ/lnYDNrQAAlJ1CqBsXSJYCQ+QSFuScQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770457936; a=rsa-sha256; cv=none; b=nn0KN5ExalNV/8joUI+AZJ1faJjGzTlva5WwZjUR9o1H17vBEbuy1M9M4TrJiJ7TxqAy9h PmJyXaWVC5Smv/sVpgi2lrx11+UV5lb2g32KD/ansaIEyz+Pwq3Xi8oP5wqjRou55BCSII 6MpVsa0gSnpiRBzEl7vPCGGbxLHGPdLaq0M3AxO573XHB36MKchjmlnMip5dwFSs5eqMPD ScdQPdlX39axEWtyJkmwq/4uIYDbAQTqRBwNdObENl1UeYAJ7vSocC/NWYtzxKmFfmoI2A Es5A1TAtRE6LMn1fQMmLEvfsJRjGET8ECUPi+kSWkNIbYGhyHcfUk5vPtJ3n3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770457936; 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=0eSrkX7DiK7R1QS8VQaxJ6Qu/ZgYnC6He3dOm9I/kDM=; b=J7jJ+efrYCaoICFq9lcZ0Slnv8p13ul3pK/ygKX4IPrTy99llqkzSV/IL/0wE84BDkuqEl rTPk9+V4C7/gDhC/jKjM6J4ky7503ynkWOBkK4kphZaKyO399tblAW4jNxr+DUcr/gihG/ NOjt6QhxnbU/44k2q61GLPHYSsnPe0faCclRxV6u9lvCrV06qksg+JXRZJEsktsFFOm+WF w9LW50VhLf+aBCU4gpTmugeZmD0Q4EWZhhZpILhHtxuSaDGAcUnN+b0e/Qi2rzcYh7n3F7 DCTfuiObmYnvfVe63pI5pE68WSvi83Q9X0jvIF250CyE8ShddqmayszIwT9VcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f7R802gzyzx64 for ; Sat, 07 Feb 2026 09:52:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d9a2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Feb 2026 09:52:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 58a369a6f6ce - stable/15 - sockstat: Surround explicit IPv6 addresses with brackets 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: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 58a369a6f6ce6786ef7aa4715c96548f36ae3962 Auto-Submitted: auto-generated Date: Sat, 07 Feb 2026 09:52:16 +0000 Message-Id: <69870b50.1d9a2.173537f9@gitrepo.freebsd.org> The branch stable/15 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=58a369a6f6ce6786ef7aa4715c96548f36ae3962 commit 58a369a6f6ce6786ef7aa4715c96548f36ae3962 Author: Michael Osipov AuthorDate: 2025-12-26 17:27:12 +0000 Commit: Michael Osipov CommitDate: 2026-02-07 09:51:50 +0000 sockstat: Surround explicit IPv6 addresses with brackets PR: 254611 Approved by: otis, tuexen, des MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54375 (cherry picked from commit fe81e3944c085e765c83c4f78941d7529ceb556e) --- usr.bin/sockstat/main.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/usr.bin/sockstat/main.c b/usr.bin/sockstat/main.c index 75c4b2aad223..df09245a8f0d 100644 --- a/usr.bin/sockstat/main.c +++ b/usr.bin/sockstat/main.c @@ -897,6 +897,7 @@ formataddr(struct sockaddr_storage *ss, char *buf, size_t bufsize) struct sockaddr_un *sun; int error, off, port = 0; char addrstr[NI_MAXHOST] = ""; + bool needs_ipv6_brackets = false; switch (ss->ss_family) { case AF_INET: @@ -907,6 +908,8 @@ formataddr(struct sockaddr_storage *ss, char *buf, size_t bufsize) case AF_INET6: if (IN6_IS_ADDR_UNSPECIFIED(&sstosin6(ss)->sin6_addr)) addrstr[0] = '*'; + else + needs_ipv6_brackets = true; port = ntohs(sstosin6(ss)->sin6_port); break; case AF_UNIX: @@ -915,7 +918,7 @@ formataddr(struct sockaddr_storage *ss, char *buf, size_t bufsize) if (is_xo_style_encoding) { xo_emit("{:path/%.*s}", sun->sun_len - off, sun->sun_path); - return 0; + return (0); } return snprintf(buf, bufsize, "%.*s", sun->sun_len - off, sun->sun_path); @@ -931,6 +934,11 @@ formataddr(struct sockaddr_storage *ss, char *buf, size_t bufsize) xo_emit("{:port/%d}", port); return (0); } + if (needs_ipv6_brackets) { + if (port == 0) + return (snprintf(buf, bufsize, "[%s]:*", addrstr)); + return (snprintf(buf, bufsize, "[%s]:%d", addrstr, port)); + } if (port == 0) return (snprintf(buf, bufsize, "%s:*", addrstr)); return (snprintf(buf, bufsize, "%s:%d", addrstr, port));