From nobody Thu Dec 18 13:45:28 2025 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 4dXBkc3VZcz6KyFf for ; Thu, 18 Dec 2025 13:45:28 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dXBkc2KTGz3N1W for ; Thu, 18 Dec 2025 13:45:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766065528; 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=j2KYeopk/qDdfVh7fZPTWO7YBrsivZcNuTp2sc9ToU0=; b=W1HrFVrAQi1LMERGPc9fTiPgTVFqPErf3440j5uHZVINt/q7RDRgh215PXn0s2aLcz8QFd FY+JR28+cnvI7+gP5YyE0tMC9KoQlYsBnNJzVG8TczpgONqmtrAshVwLb9YAQPcLkXfzvJ AX8GwFrIJLmygaZ5c49E9O7AfzgnURHQV0v8Nw69d40kczVrrg3nok6+jxUB9uniTH431Q TRpnVP1gm5HTHnf5OMwhewGtMz46C2YNlWs32pvk4SPBOXyOvWhXkKlHJioInfead+y7DP YvSw3dTZH8+rlbY0IdBEVsbPp48i0Kce3Dz0GioGje+jqVe8RODUbZ/sFtCFmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766065528; 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=j2KYeopk/qDdfVh7fZPTWO7YBrsivZcNuTp2sc9ToU0=; b=Yr7tCiX0fRR3NMPnRHoN2G1Z8gS9G1W9of/0Wu5aV9auW9zCLpdnHDDjlWhutvlK9Hgve4 UB3LkGwkAPdmm/h1H5YrUTniyuN6h3fjDvl8efYwiT/b4qUehaa4ukbNnGXPLoXY543TiS J6T5w/BA4sTs25tBUP+VjtO4OVg/zPQ5R6E5pWQwGThJO1krN5drkCMssw6ETTaf6camOJ fqOhWj29hlLEy4o6BPxc1E9zrDwptMUGvgE6BYNvS+VLZaSwk4vY3n2NUUXjYoHYt0rd6c Kgb6EKqn3pfMcz/N1uLMsUEkC6833BtNDtxWWn9QCf8Mxl1RPecuGBupB/KA+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766065528; a=rsa-sha256; cv=none; b=fTjo3pmFeszkCf8s3IVEDym6hRY8hJRrzA4kWioikhLO1xdiobiPbGLEgu0tcwQgJThbRg rTvefJyzg0uV4LBLjilorXbXktVCNKA2a7gzoxlz/56e6BCOVGYSxgJ1LkHeYIXnbmKibE 2MiMH88j/DtZLLPPv2UUjUIz9UxYvxdTIivWKKGpFBt3FT41bu4eb6pU3QGaYEKqKGLej1 LmC99LXMLm8D9QvmN4xSSbHT92qDk1hSXtaYxlds0OxIvFUg7EhODiKrK9MMqXFEJ2mWCp Lb2p3U9oql0k2oHMD6MpIEv7T0f81yiAq4+Ch5Qkkm970tDfOB5iwBPR5IOetw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dXBkc1sZ5zh9H for ; Thu, 18 Dec 2025 13:45:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33ba3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 18 Dec 2025 13:45:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: ad7f49f98b1a - main - libpfctl: fix tstats address count 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad7f49f98b1ae7504f69db897901a055613c8300 Auto-Submitted: auto-generated Date: Thu, 18 Dec 2025 13:45:28 +0000 Message-Id: <69440578.33ba3.6a54275e@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ad7f49f98b1ae7504f69db897901a055613c8300 commit ad7f49f98b1ae7504f69db897901a055613c8300 Author: Kristof Provost AuthorDate: 2025-12-17 13:59:34 +0000 Commit: Kristof Provost CommitDate: 2025-12-18 13:39:27 +0000 libpfctl: fix tstats address count Reported by: Marcos Mendoza See also: https://redmine.pfsense.org/issues/16588 Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 3 ++- tests/sys/netpfil/pf/table.sh | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index ab49dabe88c2..1959f7bebc39 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -3611,7 +3611,8 @@ static struct snl_attr_parser ap_tstats[] = { { .type = PF_TS_MATCH, .off = _OUT(pfrts_match), .cb = snl_attr_get_uint64 }, {. type = PF_TS_NOMATCH, .off = _OUT(pfrts_nomatch), .cb = snl_attr_get_uint64 }, { .type = PF_TS_TZERO, .off = _OUT(pfrts_tzero), .cb = snl_attr_get_uint64 }, - { .type = PF_TS_REFCNT, .off = _OUT(pfrts_cnt), . arg = (void *)PFR_REFCNT_MAX, .cb = snl_attr_get_uint64_into_int_array }, + { .type = PF_TS_CNT, .off = _OUT(pfrts_cnt), .cb = snl_attr_get_uint64 }, + { .type = PF_TS_REFCNT, .off = _OUT(pfrts_refcnt), . arg = (void *)PFR_REFCNT_MAX, .cb = snl_attr_get_uint64_into_int_array }, }; #undef _OUT SNL_DECLARE_PARSER(tstats_parser, struct genlmsghdr, snl_f_p_empty, ap_tstats); diff --git a/tests/sys/netpfil/pf/table.sh b/tests/sys/netpfil/pf/table.sh index 0b2b56592404..cd83ac90e559 100644 --- a/tests/sys/netpfil/pf/table.sh +++ b/tests/sys/netpfil/pf/table.sh @@ -194,6 +194,10 @@ zero_one_body() jexec alcatraz pfctl -t foo -T show -vv + atf_check -s exit:0 -e ignore \ + -o match:'Addresses: 2' \ + jexec alcatraz pfctl -vvsTables + atf_check -s exit:0 -e ignore \ -o match:'In/Block:.*'"$TABLE_STATS_ZERO_REGEXP" \ -o match:'In/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \