From nobody Sat Feb 7 12:17:47 2026 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 4f7VMv3CNBz6PlB4 for ; Sat, 07 Feb 2026 12:17:47 +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 4f7VMv2Wtxz3SBj for ; Sat, 07 Feb 2026 12:17:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770466667; 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=fD94nsFmo+Rncavh8MnY5HykoGy4wFisgT8wLWC7m2U=; b=S0PhpBYstKBT0JHu97VXyOdM2nFvl3hU+raSFI2vATZRcRDp9ep1GEZOVSUMSTIzynlpD2 O+xMUT5oCoDKK9VNUDjma9xVzWBWUCGmy8n+txE0P1ExvIGWj81u0wYXuEC1sv5CsmpUxY uGXe5BZfCBuNR+0KXaMzIehKfRyVRT8rf6+WB8GQqbT0nH+SfNasGFgmy/7I1CEzXqCb/F dQi1p0aUA9lKbFwYMiIC5ugkDEEMtWHKoGH8HXQVv7q5YnxNu2FBv3j3Kl9NXNfhqHTrkX lWfBsHTTdrEV5zFMKmXtQ15abeZqj38x8NpxjlLD9v/s7jvtCCJoP9GIxi/ERg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770466667; a=rsa-sha256; cv=none; b=UDddO5F593qC1+8L8VBbkfqs0+bUSSM02w094DKF8xU02Q7PHaa6XNbl2zJipXjt9oInv4 aJnSnDOESlJCfG2yxzIOyhOhT0blB2Qi/KsS26UNnRli64j0/zQ3SnQPHBEiMXph2BBV9O Vq2/YKST1trBrbac0prF8CKqe0kTeeHPlM+yVwLPWDENGgHS8gwlw65jhg2KS0PRduxqL1 yFqv/OnF+k/4ahjB3RvfWPdxSSx3OmmzJ70JqdtlXOI7aQSBrtzAWew3CN1mibHZHdjnAr ert7qhDDjH4AmvQ/kGHINWv38w7q28zCyGjaI0gMkiSgYoFuTkiNC143a79CIg== 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=1770466667; 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=fD94nsFmo+Rncavh8MnY5HykoGy4wFisgT8wLWC7m2U=; b=MOgk+uV7FL3WZncefANa/CNGhniyXO+3tdf2x/HsqRVVobU96FD0tC5DtUZF7t46J1SI4L xpSUEeIJsrBu/AtbUStbGCXq2rhHgzRHGlsUNDcC4cYqizKYEFacXoB/MmFe8vVE3nDUHr MA3bHnaUq65Ytm2MKaV5XsLi1oPMRIsl4XIP5c89grwMcXPUmug7J/LpDJOv6uw486mVf2 WPvUC7uXtq8twcmP9BHq0dzeQf59n29lSotHzcBOeUiDD+daToLKSDyykBizFLzh+3MRhK Bbbo3x0kFdsj1TPMAdo3+UMs32KutOZyzfrZs4fkueNYyh40/YnQ/gU7GOZgnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f7VMv26Twz11PY for ; Sat, 07 Feb 2026 12:17:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33b6e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Feb 2026 12:17:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 03c8e3e77114 - stable/14 - sockstat: Surround explicit IPv6 addresses with brackets 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: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 03c8e3e77114530f61e0dd9f2b1757eeea033d0e Auto-Submitted: auto-generated Date: Sat, 07 Feb 2026 12:17:47 +0000 Message-Id: <69872d6b.33b6e.5b66c44a@gitrepo.freebsd.org> The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=03c8e3e77114530f61e0dd9f2b1757eeea033d0e commit 03c8e3e77114530f61e0dd9f2b1757eeea033d0e Author: Michael Osipov AuthorDate: 2025-12-26 17:27:12 +0000 Commit: Michael Osipov CommitDate: 2026-02-07 12:17:08 +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 805e48715529..58950c92cafb 100644 --- a/usr.bin/sockstat/sockstat.c +++ b/usr.bin/sockstat/sockstat.c @@ -64,6 +64,7 @@ #include #include #include +#include #include #include #include @@ -956,6 +957,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: @@ -966,6 +968,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: @@ -979,6 +983,11 @@ printaddr(struct sockaddr_storage *ss) if (error) errx(1, "cap_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