git: 799e21d544c1 - main - libpfctl: fix reporting of flush address count

[Kristof Provost]

The branch main has been updated by kp:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=799e21d544c18a29f6f2e3f854f6455dd477d997

commit 799e21d544c18a29f6f2e3f854f6455dd477d997
Author:     Kristof Provost <k...@freebsd.org>
AuthorDate: 2025-07-23 09:42:57 +0000
Commit:     Kristof Provost <k...@freebsd.org>
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"
 }