From nobody Thu Nov 19 10:31:22 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 4jVZWZ228Hz72Kr9 for ; Thu, 19 Nov 2026 10:31: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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jVZWZ1K3bz4vGl for ; Thu, 19 Nov 2026 10:31:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795084282; 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=/hFkLDpEzMLTMAImoVlo1CC4PLCKD0nMMs6fLnBTmrM=; b=DsdEB+9a+aW1b/SBIWBlYfMGAwxTZUox78IL1Uu1i9pBaLRUIvOuxiGKvWThiXLUP1Ay9T SE1A62gQJoT2TD1aW6DN8/aaBByaz2KFkHk4UBMovkh1rRj1i3rI7La3CZjVVk892G/wR/ 1U0TkfJ9Xs2oQ9L9boI/AQZDfbl7kKHVIaZQ1M6djYzGZMMlrYZj7Zxk56Jri4HqyrJaQY trGyEV8AjNufXfyDC/rG7w/1iJMWIFioJYcfHsu6rT3o56cM7OSpKIH64/uo/wxKgROWHg BlgGuqFLGSVnIj2tckUVSLrnbEIaCzq88weYjIaMpg6XlAD1OYeffLb/THg4Dw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795084282; b=DFPgXByntpaXdaNIiwX8izVor/LvGdrzMfCWdc1i+e1XwtGgVDN74du8hFuK3J+JyKvXdK oBfHSWM7FkoQRs2OlNbytzxLqDoNt5DDDu3IlINaEMPR9AckRYMaTxHtR5SzYHN9hOTvvD Muh4o1buDRgHLN2svvcLvp8PsNFI1uJzaBJMYpQfCtABn3fpZba1Psstr/npPrkft+1TYZ UVK5P6Jxk5b6Y0lebNurfjWRz/03dwIVUfeKIDksLRC5otndmyP8xqOMejbG0k5KvnB8yh EFZlsE3RU9jpY3qneMbGYHmoLGuKT97CWh/OHqkLS1OuZkIe8Qvd09WJkbVU/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795084282; 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=/hFkLDpEzMLTMAImoVlo1CC4PLCKD0nMMs6fLnBTmrM=; b=iDEku0XSkgGU8iHd6UA7ZQvlH0jRpk3NB3+f/6UYM/akQ/QBfqauRyuR/MdV4XDZE4iv+L 20vczrq42J/7eywduoaqzs0eF+lienyvE+JyQ5LxPZa2dV4/CwGpD1fnEp362+VhcOfUEO QCfO5xVyrDqeME5vrkiyal9uFuBEiXXD5OxrCUtCcpeOLIGrT3DiMfmL1hPfb4e1kFxK6P 449yRuSGuNBPv93YA5d/ElSccrSeyDl8v0SZ+ShDFIWwRQ6efkjxafqeAdF64ewkgtDVaP xTaPqcEdqX/+HXFpKu2N+cBWriqIHiFbkEija2urs2t0HhWGXivOf1Shccz5jg== 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 4jVZWZ0zbrzxRt for ; Thu, 19 Nov 2026 10:31:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id db28 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Nov 2026 10:31:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 0c1a482b4e4f - stable/15 - libpfctl: fix tstats address count List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 0c1a482b4e4f8ad0e5efe5da75614ca240706057 Auto-Submitted: auto-generated Date: Thu, 19 Nov 2026 10:31:22 +0000 Message-Id: <6afecffa.db28.6acf7a02@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=0c1a482b4e4f8ad0e5efe5da75614ca240706057 commit 0c1a482b4e4f8ad0e5efe5da75614ca240706057 Author: Kristof Provost AuthorDate: 2025-12-17 13:59:34 +0000 Commit: Kristof Provost CommitDate: 2026-11-19 10:29:39 +0000 libpfctl: fix tstats address count Reported by: Marcos Mendoza See also: https://redmine.pfsense.org/issues/16588 Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit ad7f49f98b1ae7504f69db897901a055613c8300) --- 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 35d2a31906bf..ea44becb4a36 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -3484,7 +3484,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 213d63af8927..90c8849960a0 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" \