From nobody Wed Jul 23 13:16:55 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 4bnF600Tlqz62KXF; Wed, 23 Jul 2025 13:16:56 +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 4bnF5z6Svhz3M1T; Wed, 23 Jul 2025 13:16:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753276615; 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=PzqATk3lRsPNhIvIDXzk4MoA7YPJQ0he8cBfwSHv5zE=; b=V0GsRP8X/DtkAh3r4HmIzzCXhUby8IvW8oAGwWwwMm/714b3HgUGiDq7Z6FV9z+aXm7Arf rlB+1+QIQ+Y7YVpBVOqCDGyLR4n4zUB2yL0f1Bb6SeJamz1t8yupXQ6/4Kn8koNrHq0Ofi sK8UIOm/Lau8GPWrZgzdWeuH76a0sHi9uYBUgxjZQHf5JWZBDOcGKAZjwySJBMQ5J7eryF CExNxQEtdf4V8T/DVciQ4+hW6xdMt0mgKPHfQFr94TzlaNX5TGevGBzie/mhiamX5MG3JH OwYjMCgluUHwUDnvWeqhQtnq7MdS9qgUs2Ld/nhSco6LFbTt5ey6l0PE55AaHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753276615; 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=PzqATk3lRsPNhIvIDXzk4MoA7YPJQ0he8cBfwSHv5zE=; b=UUsdtf74qkW7cauoDUk1WoOVTwyRGqGoLB1WWOJxALFs/9E+Gxy50NgGryDzLNaZEDJWW2 WRyPE6znL5zey2hG+D6cBhQ+RgBoiHXFFDeycetifLFmOQmMqjIWAPDKpQnylI0Pl0f/d0 pEZIgVQKCSO1DwUK3Wo4zkOqcWG7tFyhJhL0JR7H+uZZ3Wuh9ZxKaOQZWNA6X/PgxPqUle R1IWw+NJJAGBSYLEqbteyM3MfOVlBRLOBNFLRVM9OExcGZh3UC+lV9EofqE9ImzEW8VNd+ SuY+fYAtxkB25XjKfK1isICYj56PZ528+UOD+ByGolK2f+0W8BqPt/Wwl/IFZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753276615; a=rsa-sha256; cv=none; b=DX7U+vdrQWVarjNWYfl6rZTreb6TkTs89ZGIVkv7q9jQjmWmOWA+/rvEpvqxNC5zGQDoAb /OInuxbtB758jGcg9PlyWf11o5IKcl3cc84OX8t2dffGq3WkxjgdA00UvvswQSPqlrA++z tJM5yj7hDLMibhW8qhZrXknLG2sxiRYt6jjDUdYszKAsaxalLN6vGSzmkzPM/RG/WjJklR SUEJNAifCA7BB1w10evEMmKuetPVnHakRVGXrTS2lXLVwmQRrtV92cVbOFpL7OXseDWx/b oV/p5DI45tK8qzuZnC7ssv151eA5bl6G2RAOJ2lY7GcBHuG3PE3WuC3rDKnxeA== 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 4bnF5z5FzSzBf; Wed, 23 Jul 2025 13:16:55 +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 56NDGte6000457; Wed, 23 Jul 2025 13:16:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56NDGt7R000454; Wed, 23 Jul 2025 13:16:55 GMT (envelope-from git) Date: Wed, 23 Jul 2025 13:16:55 GMT Message-Id: <202507231316.56NDGt7R000454@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 799e21d544c1 - main - libpfctl: fix reporting of flush address count 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 799e21d544c18a29f6f2e3f854f6455dd477d997 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=799e21d544c18a29f6f2e3f854f6455dd477d997 commit 799e21d544c18a29f6f2e3f854f6455dd477d997 Author: Kristof Provost AuthorDate: 2025-07-23 09:42:57 +0000 Commit: Kristof Provost CommitDate: 2025-07-23 11:56:11 +0000 libpfctl: fix reporting of flush address count The PFNL_CMD_CLR_ADDRS command returns a PF_T_NBR_DELETED, not a PF_TS_NZEO. Handle this correctly. While here add a test case to verify we return the expected counts when adding or flushing addresses to/from a table. PR: 288353 Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 7 ++++++- tests/sys/netpfil/pf/table.sh | 29 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index e4123fe02211..d8e60075e103 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -3348,6 +3348,11 @@ pfctl_clear_tstats(struct pfctl_handle *h, const struct pfr_table *filter, return (e.error); } +static struct snl_attr_parser ap_clr_addrs[] = { + { .type = PF_T_NBR_DELETED, .off = 0, .cb = snl_attr_get_uint64 }, +}; +SNL_DECLARE_PARSER(clr_addrs_parser, struct genlmsghdr, snl_f_p_empty, ap_clr_addrs); + int pfctl_clear_addrs(struct pfctl_handle *h, const struct pfr_table *filter, int *ndel, int flags) @@ -3380,7 +3385,7 @@ pfctl_clear_addrs(struct pfctl_handle *h, const struct pfr_table *filter, return (ENXIO); while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { - if (!snl_parse_nlmsg(&h->ss, hdr, &tstats_clr_parser, &del)) + if (!snl_parse_nlmsg(&h->ss, hdr, &clr_addrs_parser, &del)) continue; if (ndel) *ndel = (uint32_t)del; diff --git a/tests/sys/netpfil/pf/table.sh b/tests/sys/netpfil/pf/table.sh index 78320375db7c..5e5fccdaca20 100644 --- a/tests/sys/netpfil/pf/table.sh +++ b/tests/sys/netpfil/pf/table.sh @@ -582,6 +582,34 @@ anchor_cleanup() pft_cleanup } +atf_test_case "flush" "cleanup" +flush_head() +{ + atf_set descr 'Test flushing addresses from tables' + atf_set require.user root +} + +flush_body() +{ + pft_init + + vnet_mkjail alcatraz + + atf_check -s exit:0 -e match:"1/1 addresses added." \ + jexec alcatraz pfctl -t foo -T add 1.2.3.4 + atf_check -s exit:0 -o match:" 1.2.3.4" \ + jexec alcatraz pfctl -t foo -T show + atf_check -s exit:0 -e match:"1 addresses deleted." \ + jexec alcatraz pfctl -t foo -T flush + atf_check -s exit:0 -o not-match:"1.2.3.4" \ + jexec alcatraz pfctl -t foo -T show +} + +flush_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "v4_counters" @@ -596,4 +624,5 @@ atf_init_test_cases() atf_add_test_case "pr259689" atf_add_test_case "precreate" atf_add_test_case "anchor" + atf_add_test_case "flush" }