From nobody Sat Feb 7 12:18:43 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 4f7VNz2fLqz6PlDq for ; Sat, 07 Feb 2026 12:18:43 +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 4f7VNz22YZz3Sf8 for ; Sat, 07 Feb 2026 12:18:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770466723; 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=X+YnjrTQpXiGdSSO+GPAXcAejOXi1AoJ2ixWnXERGYk=; b=bY1aSBk3NPh0v9R+V0Sa1SyXxUOuoEjZ6WdS+O2pwLy7hnUyFqdiTzy0Iu3Q1IyqJA5WPM l1LDgNJwgBF7lg0nsq7TuY6BXKrnSGhUjxL0XEp7Sf7DP9uq8b72YGut+J47hqn52GDOSu IDZw+dpKpC2C1v9HAFDMEKaRQVWFqVRvs6rIq4tvd97O28Ru6WVDq+TeelqG40QDYVtDWU H7fp29PxP+3S4+vkpoAtuofQ5560R1cdCAfU3tDmfhGe3ufgjn2iAt22LDsjy0TrpL2HMJ +l8brxHgM9rOyCB976Ft3SjvZE08KYrXEdAzXaIRX2Id9yrsBU5arW7R1L+BAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770466723; a=rsa-sha256; cv=none; b=YY1vHe3PjUJCRPY45hPm9g1MX/V67EA/GSfmhiKoX9mMzj0bYpHbZSduKXOAtY6XgAAi46 gW95WrA79fLV8M7s96lmFh+kUiN6vw+HDCOf1SVuQGWa19M3zdXTY9q2OdVg8rMsNfbe5q 88vJqq03UUwA+5aZ6XYKJxXLNQ6lpoWI8PZfQLos41C0axd71LJteANOtUcCVepgBo5OIr yht2Ma2J/K2/crclGzHMYc6zBqMuEiEeMn1nZjapx+K8FxLEU83e/v4uzYMrJX69+TrWS0 TA2XLd/JlttwVm99cMwQB6qT+yVQbQHkmR8XDS7Kd7J+9QuikhL0VNvZTkkNYw== 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=1770466723; 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=X+YnjrTQpXiGdSSO+GPAXcAejOXi1AoJ2ixWnXERGYk=; b=JLvNWUSeBDQCfQNoiVEUiF2p5ZFprnh2MgcXcvdzp1SWrqYJ0aki049NsZbwaYJoZwhCJ+ YLnRZRmv1ZF02XIUPtdvYifzJTLIDVsJX/FV+jMYx2BH2iUZWUvAr2kFgjwlJqTaHwhb8x eGwCd4w/xraIpEgULRWUCDoPp8zMC4G72/UTvBrvoRD5jUsYvN+pOJhfDgjz64dpf7aA1S 9jaAfxepx1ovmNnxyhZ2X/g6ClA514FtksKO8SDVF5yEzFKKJ2XFrZb0APO/HFJQbPs+vr wqnadapzKfliVyKDKpvHYgV98vuUqNnO9wBzOioKmbaQftddc1lqyXMXHhKRZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f7VNz1bBkz11K6 for ; Sat, 07 Feb 2026 12:18:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33e7a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Feb 2026 12:18:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: e5cb813ac477 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: e5cb813ac4779d46b2dd9a483d2983ae5d104bcb Auto-Submitted: auto-generated Date: Sat, 07 Feb 2026 12:18:43 +0000 Message-Id: <69872da3.33e7a.6aa00058@gitrepo.freebsd.org> The branch stable/13 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=e5cb813ac4779d46b2dd9a483d2983ae5d104bcb commit e5cb813ac4779d46b2dd9a483d2983ae5d104bcb Author: Michael Osipov AuthorDate: 2025-12-26 17:27:12 +0000 Commit: Michael Osipov CommitDate: 2026-02-07 12:18:27 +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/sockstat.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/usr.bin/sockstat/sockstat.c b/usr.bin/sockstat/sockstat.c index fed63d6031f3..0b874de2b0ab 100644 --- a/usr.bin/sockstat/sockstat.c +++ b/usr.bin/sockstat/sockstat.c @@ -61,6 +61,7 @@ #include #include #include +#include #include #include #include @@ -855,6 +856,7 @@ printaddr(struct sockaddr_storage *ss) struct sockaddr_un *sun; char addrstr[NI_MAXHOST] = ""; int error, off, port = 0; + bool needs_ipv6_brackets = false; switch (ss->ss_family) { case AF_INET: @@ -865,6 +867,8 @@ printaddr(struct sockaddr_storage *ss) 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: @@ -878,6 +882,11 @@ printaddr(struct sockaddr_storage *ss) if (error) errx(1, "getnameinfo()"); } + if (needs_ipv6_brackets) { + if (port == 0) + return (xprintf("[%s]:*", addrstr)); + return (xprintf("[%s]:%d", addrstr, port)); + } if (port == 0) return (xprintf("%s:*", addrstr)); else