The branch main has been updated by kp:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=73ce582a20e0f41414839ebf02cd347f899856a7

commit 73ce582a20e0f41414839ebf02cd347f899856a7
Author:     Kristof Provost <[email protected]>
AuthorDate: 2026-09-18 18:49:57 +0000
Commit:     Kristof Provost <[email protected]>
CommitDate: 2026-09-18 18:51:04 +0000

    pf: table_addr_parser parses to struct nl_parsed_table_addrs
    
    Not to struct pfioc_table.
    
    MFC after:      1 week
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 sys/netpfil/pf/pf_nl.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c
index 200f1dfca81a..ef047da9965b 100644
--- a/sys/netpfil/pf/pf_nl.c
+++ b/sys/netpfil/pf/pf_nl.c
@@ -2324,7 +2324,7 @@ nlattr_add_pfr_addr(struct nl_writer *nw, int attr, const 
struct pfr_addr *a)
 static int
 pf_handle_table_get_addrs(struct nlmsghdr *hdr, struct nl_pstate *npt)
 {
-       struct pfioc_table attrs = { 0 };
+       struct nl_parsed_table_addrs attrs = { 0 };
        struct pfr_addr *pfras;
        struct nl_writer *nw = npt->nw;
        struct genlmsghdr *ghdr_new;
@@ -2339,8 +2339,8 @@ pf_handle_table_get_addrs(struct nlmsghdr *hdr, struct 
nl_pstate *npt)
 
        PF_RULES_RLOCK();
        /* Get required size. */
-       error = pfr_get_addrs(&attrs.pfrio_table, NULL,
-           &size, attrs.pfrio_flags | PFR_FLAG_USERIOCTL);
+       error = pfr_get_addrs(&attrs.table, NULL,
+           &size, attrs.flags | PFR_FLAG_USERIOCTL);
        if (error != 0) {
                PF_RULES_RUNLOCK();
                return (error);
@@ -2352,8 +2352,8 @@ pf_handle_table_get_addrs(struct nlmsghdr *hdr, struct 
nl_pstate *npt)
                return (ENOMEM);
        }
        /* Now get the addresses. */
-       error = pfr_get_addrs(&attrs.pfrio_table, pfras,
-           &size, attrs.pfrio_flags | PFR_FLAG_USERIOCTL);
+       error = pfr_get_addrs(&attrs.table, pfras,
+           &size, attrs.flags | PFR_FLAG_USERIOCTL);
        PF_RULES_RUNLOCK();
        if (error != 0)
                goto out;

Reply via email to