From nobody Mon Feb 9 03:09:50 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 4f8V6k3vt1z6S8TL for ; Mon, 09 Feb 2026 03:09:50 +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 4f8V6k35STz3nHx for ; Mon, 09 Feb 2026 03:09:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770606590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jDlTWVoZrZK27EQyC7ELVgSIt1N7RgPf4PkGBRSeV9I=; b=TXdksovmW1su4t5Q32Y1mKEf8gT4e6fj88dqhAXgNcLMYGngOyohnsiVPvZkbrTlJqA5c0 B7Fh6b+SesjJB40EOBIB6HvWyxpUcVH0Q9N1BDov5EDub83LQPhO+ZbQcC92Y3jTYUJUZP nVH1ZDvqAjxY946FwgO9pCMGfb1ngRU+eVpmYF07h/sZT9XsZUJjaQe3zKaXA4ftQ0vY++ 6t0bJwSpZqtomy8SEKOGkOPHcuKGXDRAh+RQFCJyXHwZYg1VKyqsqe/BtAZ+MWZek3v/5G Pbh/VnthHyjCn4EuJkMGvaEUwKdv++shtq31tHqkNqq2L/b/cGihONlxV4wG2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770606590; a=rsa-sha256; cv=none; b=ZMIwwqZswXoiSB/2q8ODt0kV0m2f774YNFQP4XiQ6BusYXfdmvW1BvQFR84FMbfWE/z9W7 zr/UFpw9GxSklo4ofV9oasjl2VMQX/BEvz+NHIHxM25KSgwtVRLvQHDjQ14zSJTiYKDsCq z8k11kAZtSafAl/IFR2ZiskAhBJmX4B5vQu/Klx2iYv2vt2slRzyd7W6B28K/D/oWYI/y9 N6oBbr3n68Sp0GomIq3N/5p7KSb0wJRQYmH/rmfxkbDofXwasesUKSsOSHkEQ2y3zIGB1c gVju2hc86dkh/9ZM2cm/GFgHufEJQCi/8+rzLlupVjVlbFpM7YDyCS5iSM6DUw== 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=1770606590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jDlTWVoZrZK27EQyC7ELVgSIt1N7RgPf4PkGBRSeV9I=; b=ufVUTiidzbPXmudrI/f+SNfyecKUeQ5swmLsO8L5eyF2Wli/fuXbcMB9MFgNAT6Jr0Sf52 w7B/FvPMBJHTzqGKuFPJ/zYK0MXylipPcHMcdJkt8GLWiOxQ4m0adMX9BkVkep8YUfNUxL cOP5pH1q+Q4kTbBNzPYBvIuphsxnm10wwKwPh4XuEbi1WD1esyZpMSCvXGJiqKBwNN/ff7 8TEpAHJsQH9pJgSTy9+pSyhoZa7++yMLvKWQajyME4O0MsQKMbhh07d/0vOCkwEwA4jPCL Kyvai/zlFKMSTojXtbsn2q/kMqf9yYImallbMWCDgVx/THZbNKCREbAqMEM/Kw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8V6k2drhzc7 for ; Mon, 09 Feb 2026 03:09:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fc67 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 03:09:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Michael Osipov From: Colin Percival Subject: git: 11b616d9de3f - releng/14.4 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 11b616d9de3f1d106cd9f2bfe4c45013f3b1528f Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 03:09:50 +0000 Message-Id: <69894ffe.3fc67.7cc9dfca@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=11b616d9de3f1d106cd9f2bfe4c45013f3b1528f commit 11b616d9de3f1d106cd9f2bfe4c45013f3b1528f Author: Michael Osipov AuthorDate: 2025-12-26 17:27:12 +0000 Commit: Colin Percival CommitDate: 2026-02-09 03:09:35 +0000 sockstat: Surround explicit IPv6 addresses with brackets Approved by: re (cperciva) PR: 254611 Approved by: otis, tuexen, des MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54375 (cherry picked from commit fe81e3944c085e765c83c4f78941d7529ceb556e) (cherry picked from commit 03c8e3e77114530f61e0dd9f2b1757eeea033d0e) --- 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