From nobody Sat Jan 31 20:49:13 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 4f3Q3F6P9tz6QQS5 for ; Sat, 31 Jan 2026 20:49:13 +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 4f3Q3F3cJCz3Jwq for ; Sat, 31 Jan 2026 20:49:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769892553; 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=ZhtsLj4x5IvE5DJ0xY0xRN+UzBfqFOMchMeRJkPzzsk=; b=IQaVea7tCksJh79q+CuVGsNCjwq0X1jrYzjJvXGxS5V3gP4Bzmee5BDUoW5TQkK4Bj8OIv W8gU5t3V8pnOYPkU4x0qk/MmuNw30ERmNyn2ktj16XOyKciHTbKf5RdJgIAsnfsy6tnX/4 J8VZNj87MILg3oJmmMpZxM0gNWZQEIa6vFgr57T4kPqb6cmCVby5AGMwM2arv268JX7Vc2 vqHfMNM1kIy8z7YkufRjYa+3mDdqx1sjREyrBfB783nF4mS0b+jtoX2j368WB2wQs+HBJS MP3kCTHmjYWbPiyYCKyvn1+pq/ixRKMSjL3L2TR7GRykf0UzlxVUU86/KyXwbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769892553; a=rsa-sha256; cv=none; b=DwnvvMAPbiXltMxfYf5Bbg+W38kqjSU26MI3yVET0+y58zS7OBALDrM7lDXcJK7UEUK1xA KvlqGeL8AVUb1zsMN8EMaHFmaZHzdLRwMEDrSGS2RLJ2MRKDWUgFK4vCgKiTF/6RDOw7PV unyfmvCFKZ10QuoLd3wMYke3/0E6nUf0wv27NCGN4IhqErM7jHd3Js7k873ED3qdzDshba OdVjg6pwmS504I7+hIXyc+kaHLqXZti7FU7U0wp/I1xYs4HLsL6+Oy/8SOeCIPWgS7K1WT YpD84bj/rU45Fube5X7aiB49Qnq4R+KejqetYbRlAxmzcKbkI65BaZ6glFMatA== 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=1769892553; 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=ZhtsLj4x5IvE5DJ0xY0xRN+UzBfqFOMchMeRJkPzzsk=; b=f6wAWBdtoyDIG1UlMU6667ho07ZwDEjwADUTNslexuzr5OgCLeHamvVsW1YhSmY2Gp5hDC 7LQhfyHZ1c4yhXA51g5LHHS3DfbnPV/Q7w66/KyAbfYSazCsGXRem7aZ2Ss6g4AoSbuOoF GHdJlAA9KC88GQwIY2zPqyBBMnSkZGs6vkHAA3MwyopFIye7WR5TKG/LNqtzPvsoS0XDI+ PCWy4+p1Q4twU+DjHgj3UCcss8fwd5egvUu70q9gqdnXUTf5vZXZfHC5hGEFINTBu+7kJT 5H17mqMb7eZZIXul59foPWrHQQn3Dns/tFGXQYgDwaxClw74RPjsRuL3xvLx+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f3Q3F2GHCz1931 for ; Sat, 31 Jan 2026 20:49:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38cfe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 31 Jan 2026 20:49:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Osipov Subject: git: fe81e3944c08 - main - 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/main X-Git-Reftype: branch X-Git-Commit: fe81e3944c085e765c83c4f78941d7529ceb556e Auto-Submitted: auto-generated Date: Sat, 31 Jan 2026 20:49:13 +0000 Message-Id: <697e6ac9.38cfe.181ba57c@gitrepo.freebsd.org> The branch main has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=fe81e3944c085e765c83c4f78941d7529ceb556e commit fe81e3944c085e765c83c4f78941d7529ceb556e Author: Michael Osipov AuthorDate: 2025-12-26 17:27:12 +0000 Commit: Michael Osipov CommitDate: 2026-01-31 20:48:56 +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 --- 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 32b1ac1a8d20..ea4449300866 100644 --- a/usr.bin/sockstat/main.c +++ b/usr.bin/sockstat/main.c @@ -928,6 +928,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: @@ -938,6 +939,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: @@ -946,7 +949,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); @@ -962,6 +965,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));