From nobody Thu Feb 19 16:00:44 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 4fGyld08dZz6RVWl for ; Thu, 19 Feb 2026 16:00:45 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fGylc4MhJz42FZ for ; Thu, 19 Feb 2026 16:00:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771516844; 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=Zkqe1bWjitlwq/tMi7byNCuWSnCi12aHXzlc61Wynyo=; b=HmwSLTQ1m4ll/I1XC7OX+oVeRmscJF9DtwXaiLhCGgKr/noN/zpu892C5nbEOrDE0pH9fu fPETflwcu1dm2p3LkTlALOMVPW+r1V+QtcqAu8ZhTO5a3evUfBz4x90dpqJCGPPLfiKe0N YoiTgR/NsPZUvQrIUcPQfX8/BpB8s4sw0A8m5iSrWB/9itCo+YOYxoHm0Y74UBhe6HYK1F kioK3yZCD4LI/rcxWjanZNLpMuOMRdzODlZcpbAMtiJngkCb5mxTTUEJQsc5GIeKB1YCep sMDLhLHGcPJj+iSek+m7nqCJ8mQHY1ZfZLUknyDeu91slfzS3syEs+patklHAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771516844; a=rsa-sha256; cv=none; b=gaPYKf608d9zbD7pxyggD6Lqk91SjifrwqXEpMuMRDoS3QCNgr0sIj5wmmZAWdN0yFnNV4 ES/HVMpjyEdi2d02hrKxC934gQ/s1KQms1kz6CSKZP6OX2uaGYHzmyFprRNmMonwxQyJon 2xnXY1WhmX8nL7ZMicnmPYdgPzPueHPP2/1ORPqALMENKOzY/CqY+WgJ6l7oolwBGdIyFc inEo9vmESCiV5LZM0G6Q/CKkVgl8nOQktok6Oln1lA8U98wDi5/Jg1ejqMYwPgVSQzsA75 QL+evwla4ITZVIDxRU4PO4p3sUY9qGMFZu7JL+AmVhtOp/9H/frY67pEIMfN+Q== 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=1771516844; 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=Zkqe1bWjitlwq/tMi7byNCuWSnCi12aHXzlc61Wynyo=; b=AB44/CczuE3KSvMHDoqSZyxlz0miZ5zDs7jogPYRdghtNZDY8L7uUG2VuPE7JSot7ubLQ5 njgxd4KPQl7LRCV5EESXcR95MoIH/dw+P28oY/e1TQ9Fiu7+jWZOTG4hatLcUbRUhejfRX C8aPsCWKfrCYAmEdgfoDRfkiMmQdrQalZVRCHwucaj0m57DpQ8MHMXmOLREj7L9ukd+ODT iCGlQ5QEi8xJoGJAFUlYrYNVm4cYeu63DXTUsMGDCn3q2aqg3ccBuf/DRqYz242BT56QO8 Ttlgr4uE1y9qviQ5sNfioKWKvsK3RDf7QsXOa0txqPaEM9b37UUNEC+1XyIUQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fGylc2sG4zq3K for ; Thu, 19 Feb 2026 16:00:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31223 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Feb 2026 16:00:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Eric A. Borisch From: Kristof Provost Subject: git: 4d0186cd12a7 - stable/15 - libpfctl: Sort order of snl attribute parser 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4d0186cd12a79269d5ddb607eff8deebe4667f67 Auto-Submitted: auto-generated Date: Thu, 19 Feb 2026 16:00:44 +0000 Message-Id: <699733ac.31223.1fdb63d@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4d0186cd12a79269d5ddb607eff8deebe4667f67 commit 4d0186cd12a79269d5ddb607eff8deebe4667f67 Author: Eric A. Borisch AuthorDate: 2026-02-12 00:26:26 +0000 Commit: Kristof Provost CommitDate: 2026-02-19 16:00:19 +0000 libpfctl: Sort order of snl attribute parser snl atttribute parsers must be sorted by type, so PF_GS_BCOUNTERS (16) must follow PF_GF_PCOUNTERS (15). Fix ordering and add a call to SNL_VERIFY_PARSERS. Without this fix, byte counters reported by 'pfctl -s info' with a loginterface are always zero. PR: 291763 MFC after: 1 week Reviewed by: kp Signed-off-by: eborisch@gmail.com (cherry picked from commit 363b57d579bafa8a52cfb5a1dcb98af821b1ecb6) --- lib/libpfctl/libpfctl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 0b3bb25163b8..74d319cd2ad1 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -389,12 +389,16 @@ static const struct snl_attr_parser ap_getstatus[] = { { .type = PF_GS_FCOUNTERS, .off = _OUT(fcounters), .cb = snl_attr_get_counters }, { .type = PF_GS_SCOUNTERS, .off = _OUT(scounters), .cb = snl_attr_get_counters }, { .type = PF_GS_CHKSUM, .off = _OUT(pf_chksum), .arg_u32 = PF_MD5_DIGEST_LENGTH, .cb = snl_attr_get_bytes }, - { .type = PF_GS_BCOUNTERS, .off = _OUT(bcounters), .arg_u32 = 2 * 2, .cb = snl_attr_get_uint64_array }, { .type = PF_GS_PCOUNTERS, .off = _OUT(pcounters), .arg_u32 = 2 * 2 * 2, .cb = snl_attr_get_uint64_array }, + { .type = PF_GS_BCOUNTERS, .off = _OUT(bcounters), .arg_u32 = 2 * 2, .cb = snl_attr_get_uint64_array }, }; SNL_DECLARE_PARSER(getstatus_parser, struct genlmsghdr, snl_f_p_empty, ap_getstatus); #undef _OUT +static const struct snl_hdr_parser *stat_parser[] = { + &getstatus_parser, +}; + struct pfctl_status * pfctl_get_status_h(struct pfctl_handle *h) { @@ -405,6 +409,8 @@ pfctl_get_status_h(struct pfctl_handle *h) uint32_t seq_id; int family_id; + SNL_VERIFY_PARSERS(stat_parser); + family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); if (family_id == 0) return (NULL);