From nobody Fri Aug 08 16:18:21 2025 X-Original-To: dev-commits-src-main@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 4bz8My1gnTz647PF; Fri, 08 Aug 2025 16:18:22 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bz8Mx40wmz3kRB; Fri, 08 Aug 2025 16:18:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754669901; 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=lFl88jQOeCVyBMURogvknD+6jjp0RMJGRjDmK1g4mKc=; b=N6Z5WubLetBgI4Ib6DCkmZiMR8XOuvr63CDcS7UkPIIhF3FBuxB0R/woUHzbTs6/5qLroi nKLTCnKINTVrPxPXlLX8jhlhr2IgGn9hn5PAL+KTL/ILBbFwnoduf1OeDEEsvGFQEKoVRQ gkYXKfUzreISBg28GxXyE1/tDpaN2eRjPpufKWqDLNq8JHP38RIupMnN/2u6SacvJAfkuz ijR6GyJ+0a8G3KOtcIHrW77dhgK4DF0c3iljP38/Mdht/o0UeLc41lGfTFUxbbYUEKhJ3N BMUUjtnjFrxTOEK1X0CaAArtpoqLtWOIi3ywenlb4EU0MS03jan9mbaCwMHD9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754669901; 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=lFl88jQOeCVyBMURogvknD+6jjp0RMJGRjDmK1g4mKc=; b=cGtmVcvFvAtdVs8TodSb5mUW+eAPmarWWX3XINMJg3IvEjKNNENH6PZs+7M7JWMhlOl9ff B06s0iFD118424L3TEXUbSaQRii/Kv7Q+RD7IZ8Uv+BkRlya5A3OIuvZUrEhY34v33j9rB gKAsUI9yU2XxiYtq/XLQyjIRxMxAix4hzRsRdUe/RShBh9ezNn/qrcZsrfrXiW2QcS+keU 2ApDE1UihZL4EvWezT0gJAlzkPQSJ2q+mfUCqTz6+Qp0z4MCApLhAsas2Gs8gpUu3Xu0Ek l/azRAv2yhEHpEnvGfJP4PAptHaVOiFBvuGrka1Jp6lZtcD33UkOCFSg//upGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754669901; a=rsa-sha256; cv=none; b=prFPrhTRT/juTThnofiIEAH5343DjuCnm0NFYpPkdcM1HXX6PlmrylhSmE663Ut7LhfZB7 BWkTgaWQA2Ok+jSaKHsihDLvNvGGvZrprpTgYtHWBSKb6I36PlzZLCLpJGvrkeGYEpZgn1 aApvDpboHdCpz9RqFSqPsh76xcCAThm3rPNbPp4jY5E/kaLvT9obAR3KQnAUUFqS+vqxdI +LqdEZZrWTwG0+bw4dBMunrFpnkIcpWofbyHGSKku/yIM/zpzUfSTtoqBAg8FyLuBmzaEX Y8mjFwEuZocfeKf4d9CLy0AL02FZQzlLCH/a9V13edHR6W2mQ1LSEPonAx+ewQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bz8Mx3QdjzkB8; Fri, 08 Aug 2025 16:18:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 578GILNX031691; Fri, 8 Aug 2025 16:18:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 578GILKl031688; Fri, 8 Aug 2025 16:18:21 GMT (envelope-from git) Date: Fri, 8 Aug 2025 16:18:21 GMT Message-Id: <202508081618.578GILKl031688@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 950a251823e7 - main - sockstat: revert incorrect use of path-state for SCTP connections List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 950a251823e723e9512e83883183aa1d4de9bbaa Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=950a251823e723e9512e83883183aa1d4de9bbaa commit 950a251823e723e9512e83883183aa1d4de9bbaa Author: Damin Rido AuthorDate: 2025-08-02 16:59:58 +0000 Commit: Alan Somers CommitDate: 2025-08-08 16:16:56 +0000 sockstat: revert incorrect use of path-state for SCTP connections Revert a change that mistakenly used SCTP path state and the field name `path-state` instead of the correct `conn-state` and `sctp_conn_state()` call. This was introduced in 7b35b4d during the addition of libxo support. Fixes: 7b35b4d ("sockstat: add libxo support") Reported by: Phil Shafer Sponsored by: Google, LLC (GSoC 2025) Pull Request: https://github.com/freebsd/freebsd-src/pull Reviewed by: asomers --- usr.bin/sockstat/sockstat.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/usr.bin/sockstat/sockstat.c b/usr.bin/sockstat/sockstat.c index 7355eaa272a0..6761faae5210 100644 --- a/usr.bin/sockstat/sockstat.c +++ b/usr.bin/sockstat/sockstat.c @@ -1510,10 +1510,9 @@ display_sock(struct sock *s, struct col_widths *cw, char *buf, size_t bufsize) s->proto == IPPROTO_TCP) { switch (s->proto) { case IPPROTO_SCTP: - xo_emit(" {:path-state/%-*s}", - cw->path_state, - sctp_path_state( - faddr->state)); + xo_emit(" {:conn-state/%-*s}", + cw->conn_state, + sctp_conn_state(s->state)); break; case IPPROTO_TCP: if (s->state >= 0 &&