From nobody Thu May 8 13:10:42 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 4ZtXYw1btTz5wJSl; Thu, 08 May 2025 13:10:44 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZtXYt5Tgsz3Lys; Thu, 08 May 2025 13:10:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746709842; 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=zcRrhBsqvwsRp2pd8WUOycR3kWBwkOJqGT5/7W6vRT0=; b=Iv/x4SVgVm9uK4rqP4Lz+mS/i0Se+zJlfP9JtFT7XTnolJRm03/9/DeZfyqFx4J9XmPGRU 64jK0BrzvpNy4WG3PM3kAZsbLXFk3YCxVbTu7ajcWH069Pd3uzKWhpaproXt/3tbPuWVZt H8gdHOPEhM00K9OTMlsoKqp6HulWfX+y6p+Uy5mSjtYs9kogZ+liqO6qgOiDYw4wXY1cLY hwglpR4kjYH43y2FzHYCjcojDinG+xea+eDiJAl1vNhZZhmWq3ljn5Fojbb0A/AxQwthJU NU83M7nQRuwvDzJSTwygBfu/writnnoPEPTZS7lQMDsDdqcMMbSsTZs9d6TbHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746709842; 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=zcRrhBsqvwsRp2pd8WUOycR3kWBwkOJqGT5/7W6vRT0=; b=AfusUfkgZw9RHm5GUjZOgq+PjD2jzQqicZsnQaH3HD1TIEKPqZCdA2+/qiwjN3UBzWEi4u MaiYzcO3nvEDVzzrqpn+sNoh6tHzEYu0B02wIiLc74mJbOC/5TUOTLUmfa9uAL7SblK/VT DUWSRrJ4CCpp1VwnMj/e7A5BqzRenOScBRNspqNCrX22PSAo06o7gb0IRFgZ8qB8+aENjs EBFOaQx917CGgDs0ypEt+20NoTy+was3WPohzmQ094/rOd28OCkqwTcQ6Racu8qcJ+dE2R kDd9vrhmDoF830ywx/B4HPZdNJVNf0bumqE0O+kUnIsfheIj2VbTUuqrhrjIXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746709842; a=rsa-sha256; cv=none; b=iuG1ptScwlu0YK9OkxyomfdzV4BpSs52rH0w7aAC/gLOouWH/MBsI5liDu/RAiWZObtZ2f OAlF2AreFyD9FOp+P1w4LuFFGtjtlLHtWmBJ0ErCyXmjgZQZ5J3dNnWnpYe9tfOHZUwhbm XFWe1N4hMfKmDEbt48sd57tjNtdkmvmnMsc4t9+eSG1Vt5kxGj+viOOTojBUlPc3BHNKTD 5bFgOav3PtimJ06O9ZxXi+JMcgnZ5fJ81+UTomoFYbfQSGt1Xq+jj7fslyiUcDUWlgTZi2 8fqA445LzEL03UCUzhEW/NcFi9bfVz4ZQrfJDpw3IVWYol+cqT8SDYkaTDlLQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZtXYt50zJz1lk; Thu, 08 May 2025 13:10:42 +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 548DAgEq047139; Thu, 8 May 2025 13:10:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 548DAg6f047136; Thu, 8 May 2025 13:10:42 GMT (envelope-from git) Date: Thu, 8 May 2025 13:10:42 GMT Message-Id: <202505081310.548DAg6f047136@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: b543f426c25e - main - pf: convert DIOCRCLRADDRS to netlink 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: b543f426c25ecd7d4723918021178ad57031c1ff Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b543f426c25ecd7d4723918021178ad57031c1ff commit b543f426c25ecd7d4723918021178ad57031c1ff Author: Kristof Provost AuthorDate: 2025-05-06 15:15:53 +0000 Commit: Kristof Provost CommitDate: 2025-05-08 13:10:25 +0000 pf: convert DIOCRCLRADDRS to netlink Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 42 ++++++++++++++++++++++++++++++++++++++++++ lib/libpfctl/libpfctl.h | 2 ++ sbin/pfctl/pfctl_radix.c | 15 +-------------- sys/netpfil/pf/pf_nl.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ sys/netpfil/pf/pf_nl.h | 1 + 5 files changed, 90 insertions(+), 14 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index e607cc78e613..271fb33babfe 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -3324,3 +3324,45 @@ pfctl_clear_tstats(struct pfctl_handle *h, const struct pfr_table *filter, return (e.error); } + +int +pfctl_clear_addrs(struct pfctl_handle *h, const struct pfr_table *filter, + int *ndel, int flags) +{ + struct snl_writer nw; + struct snl_errmsg_data e = {}; + struct nlmsghdr *hdr; + uint64_t del; + uint32_t seq_id; + int family_id; + + family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); + if (family_id == 0) + return (ENOTSUP); + + snl_init_writer(&h->ss, &nw); + hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_CLR_ADDRS); + + snl_add_msg_attr_string(&nw, PF_T_ANCHOR, filter->pfrt_anchor); + snl_add_msg_attr_string(&nw, PF_T_NAME, filter->pfrt_name); + snl_add_msg_attr_u32(&nw, PF_T_TABLE_FLAGS, filter->pfrt_flags); + snl_add_msg_attr_u32(&nw, PF_T_FLAGS, flags); + + if ((hdr = snl_finalize_msg(&nw)) == NULL) + return (ENXIO); + + seq_id = hdr->nlmsg_seq; + + if (!snl_send_message(&h->ss, hdr)) + 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)) + continue; + if (ndel) + *ndel = (uint32_t)del; + } + + return (e.error); +} + diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index d8a7d1b6ebc4..4d481f436674 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -556,5 +556,7 @@ int pfctl_get_tstats(struct pfctl_handle *h, const struct pfr_table *filter, pfctl_get_tstats_fn fn, void *arg); int pfctl_clear_tstats(struct pfctl_handle *h, const struct pfr_table *filter, int *nzero, int flags); +int pfctl_clear_addrs(struct pfctl_handle *h, const struct pfr_table *filter, + int *ndel, int flags); #endif diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c index e4659a30b234..9739b0f238e1 100644 --- a/sbin/pfctl/pfctl_radix.c +++ b/sbin/pfctl/pfctl_radix.c @@ -113,20 +113,7 @@ pfr_get_tables(struct pfr_table *filter, struct pfr_table *tbl, int *size, int pfr_clr_addrs(struct pfr_table *tbl, int *ndel, int flags) { - struct pfioc_table io; - - if (tbl == NULL) { - errno = EINVAL; - return (-1); - } - bzero(&io, sizeof io); - io.pfrio_flags = flags; - io.pfrio_table = *tbl; - if (ioctl(dev, DIOCRCLRADDRS, &io)) - return (-1); - if (ndel != NULL) - *ndel = io.pfrio_ndel; - return (0); + return (pfctl_clear_addrs(pfh, tbl, ndel, flags)); } int diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index 3a5ae2f233b4..fb1f5f1f470e 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -2073,6 +2073,43 @@ pf_handle_clear_tstats(struct nlmsghdr *hdr, struct nl_pstate *npt) return (error); } +static int +pf_handle_clear_addrs(struct nlmsghdr *hdr, struct nl_pstate *npt) +{ + struct pfioc_table attrs = { 0 }; + struct nl_writer *nw = npt->nw; + struct genlmsghdr *ghdr_new; + int error; + int ndel; + + error = nl_parse_nlmsg(hdr, &table_parser, npt, &attrs); + if (error != 0) + return (error); + + PF_RULES_WLOCK(); + error = pfr_clr_addrs(&attrs.pfrio_table, &ndel, + attrs.pfrio_flags | PFR_FLAG_USERIOCTL); + PF_RULES_WUNLOCK(); + + if (error) + return (error); + + if (!nlmsg_reply(nw, hdr, sizeof(struct genlmsghdr))) + return (ENOMEM); + + ghdr_new = nlmsg_reserve_object(nw, struct genlmsghdr); + ghdr_new->cmd = PFNL_CMD_CLR_ADDRS; + ghdr_new->version = 0; + ghdr_new->reserved = 0; + + nlattr_add_u64(nw, PF_T_NBR_DELETED, ndel); + + if (!nlmsg_end(nw)) + return (ENOMEM); + + return (error); +} + static const struct nlhdr_parser *all_parsers[] = { &state_parser, &addrule_parser, @@ -2302,6 +2339,13 @@ static const struct genl_cmd pf_cmds[] = { .cmd_flags = GENL_CMD_CAP_DO | GENL_CMD_CAP_HASPOL, .cmd_priv = PRIV_NETINET_PF, }, + { + .cmd_num = PFNL_CMD_CLR_ADDRS, + .cmd_name = "CRL_ADDRS", + .cmd_cb = pf_handle_clear_addrs, + .cmd_flags = GENL_CMD_CAP_DO | GENL_CMD_CAP_HASPOL, + .cmd_priv = PRIV_NETINET_PF, + }, }; void diff --git a/sys/netpfil/pf/pf_nl.h b/sys/netpfil/pf/pf_nl.h index 55cc9c991b18..0f2f0b01415c 100644 --- a/sys/netpfil/pf/pf_nl.h +++ b/sys/netpfil/pf/pf_nl.h @@ -66,6 +66,7 @@ enum { PFNL_CMD_DEL_TABLE = 28, PFNL_CMD_GET_TSTATS = 29, PFNL_CMD_CLR_TSTATS = 30, + PFNL_CMD_CLR_ADDRS = 31, __PFNL_CMD_MAX, }; #define PFNL_CMD_MAX (__PFNL_CMD_MAX -1)