From nobody Tue Mar 15 15:20:12 2022 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 58D131A1946A; Tue, 15 Mar 2022 15:20:14 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KHxt616gxz4ZpB; Tue, 15 Mar 2022 15:20:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647357614; 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=+NAaMSVg+Jt5XcsPX/J7mRdmpNtL+MO8bvyyMs0jIOE=; b=DeEZHyZ1SqJOZ+keWIbPM1IHiMpMloDrlivi6cVvBIGJUa05vvEGlhD26eEEJT8zT359dE XKSwNU6Q5KeE1I+or/vwwtBPkx9Y+RZI7Vg5tKMTlNXEou4onAw2YpOIkW/Ge5V8XsOsXv 95TibRqNHtkLPv+2wF75C9hiBcpa97Uc9AfxlqZ49betsca5qgcat0ipkLD+k/D1zG493A oxl8oXzcAN0mvLIpBUytBCUu9EtdMiYcWyXhGKMH6PrVi4RFeVLAmE0tIeErZVp2wqQ7De nWwK9j7biSMkZxiQ1p0uyj/2YmbcU9hmBnf5/R4161ttD0kPgNzqWx4oleX6kQ== 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 AAC1C23E5F; Tue, 15 Mar 2022 15:20:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22FFKCZ8034440; Tue, 15 Mar 2022 15:20:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22FFKCMT034431; Tue, 15 Mar 2022 15:20:12 GMT (envelope-from git) Date: Tue, 15 Mar 2022 15:20:12 GMT Message-Id: <202203151520.22FFKCMT034431@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: e134e088c5f0 - stable/13 - libpfctl: support flushing rules/nat/eth List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: e134e088c5f02923b95d7ab60d38b47c5c9b249d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647357614; 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=+NAaMSVg+Jt5XcsPX/J7mRdmpNtL+MO8bvyyMs0jIOE=; b=qeHUvrOh0JVUrYwhfxCTr3CKF10Rs01ZZBDG2eDOZIT2ShTuFpaJhBNTvqQckKETixPj3H 7zGp5acEn+r7a2W25PM/RB5qXXc7ZTRKQCJyzGrcryiNMUyfOLrDg2zNVygsbEpDgVl+8L 1+71+48zCLVUN15K6D2+CRqUvngWrXWv/VYjkz62Nqy//WKLC7fcCUB2SZMHbA+U5euZYg bMPaQJNPI8bslzqDwqQlmsmU+jOVmUlnMnMzHbihEubgrTsmiU4QYReC/cIGW4spdwyOh9 GW2hh3ag3G2rFBAPyd2IluN6O0RNDLhdfWliS5e74ptXgUnhJdAycRMNj4s0ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647357614; a=rsa-sha256; cv=none; b=br0wDQWI9ZI05n9rzaPOtbk3qhwKNjao6G55pUXHT0uu3lpgrm1GP2+gFllbsfaK8xB72F conu73ApTIoK0L2bGtkYDaSuXYgUKVY/iXaq3d4IiwnjR79rWa6PUz3aspDaK71Q05Z1cA /C1t8PhXjhcvWQm94nFi9Pgmp+u4/hrrEpyy5BBkpKaPzYBbSG5uviGxfO2mZlBkIyEH3h s9mLRtN/lFmQPovptfDJ5zaQnOFzthAgGFQFjzLtfSJW59KrHQAwLYK5OR1ZIsHw6eutIC CdVYn6ZOwCqPl7Rygy4fURHNW4UllwOzO2NwcdKFz7tBDpjLOyCkPqa+JSF1jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e134e088c5f02923b95d7ab60d38b47c5c9b249d commit e134e088c5f02923b95d7ab60d38b47c5c9b249d Author: Kristof Provost AuthorDate: 2022-03-04 14:50:43 +0000 Commit: Kristof Provost CommitDate: 2022-03-15 03:24:25 +0000 libpfctl: support flushing rules/nat/eth Move the code to flush regular rules, nat rules and Ethernet rules into libpfctl for easier re-use. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D34442 (cherry picked from commit f0c334e4deca08b56b4226539c844a7018e9182d) --- lib/libpfctl/libpfctl.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++ lib/libpfctl/libpfctl.h | 2 ++ sbin/pfctl/pfctl.c | 37 +++++++++++----------------- 3 files changed, 81 insertions(+), 23 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 61fce7d743f6..4c110131dcbe 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -946,6 +946,71 @@ pfctl_kill_states(int dev, const struct pfctl_kill *kill, unsigned int *killed) return (_pfctl_clear_states(dev, kill, killed, DIOCKILLSTATESNV)); } +int +pfctl_clear_rules(int dev, const char *anchorname) +{ + struct pfioc_trans trans; + struct pfioc_trans_e transe[2]; + int ret; + + bzero(&trans, sizeof(trans)); + bzero(&transe, sizeof(transe)); + + transe[0].rs_num = PF_RULESET_SCRUB; + if (strlcpy(transe[0].anchor, anchorname, sizeof(transe[0].anchor)) + >= sizeof(transe[0].anchor)) + return (E2BIG); + + transe[1].rs_num = PF_RULESET_FILTER; + if (strlcpy(transe[1].anchor, anchorname, sizeof(transe[1].anchor)) + >= sizeof(transe[1].anchor)) + return (E2BIG); + + trans.size = 2; + trans.esize = sizeof(transe[0]); + trans.array = transe; + + ret = ioctl(dev, DIOCXBEGIN, &trans); + if (ret != 0) + return (ret); + return ioctl(dev, DIOCXCOMMIT, &trans); +} + +int +pfctl_clear_nat(int dev, const char *anchorname) +{ + struct pfioc_trans trans; + struct pfioc_trans_e transe[3]; + int ret; + + bzero(&trans, sizeof(trans)); + bzero(&transe, sizeof(transe)); + + transe[0].rs_num = PF_RULESET_NAT; + if (strlcpy(transe[0].anchor, anchorname, sizeof(transe[0].anchor)) + >= sizeof(transe[0].anchor)) + return (E2BIG); + + transe[1].rs_num = PF_RULESET_BINAT; + if (strlcpy(transe[1].anchor, anchorname, sizeof(transe[1].anchor)) + >= sizeof(transe[0].anchor)) + return (E2BIG); + + transe[2].rs_num = PF_RULESET_RDR; + if (strlcpy(transe[2].anchor, anchorname, sizeof(transe[2].anchor)) + >= sizeof(transe[2].anchor)) + return (E2BIG); + + trans.size = 3; + trans.esize = sizeof(transe[0]); + trans.array = transe; + + ret = ioctl(dev, DIOCXBEGIN, &trans); + if (ret != 0) + return (ret); + return ioctl(dev, DIOCXCOMMIT, &trans); +} + static int pfctl_get_limit(int dev, const int index, uint *limit) { diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index a9bd14527126..3b4e61be0165 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -304,6 +304,8 @@ int pfctl_clear_states(int dev, const struct pfctl_kill *kill, unsigned int *killed); int pfctl_kill_states(int dev, const struct pfctl_kill *kill, unsigned int *killed); +int pfctl_clear_rules(int dev, const char *anchorname); +int pfctl_clear_nat(int dev, const char *anchorname); int pfctl_set_syncookies(int dev, const struct pfctl_syncookies *s); int pfctl_get_syncookies(int dev, struct pfctl_syncookies *s); diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 342f355a0116..7dfcd7cc494a 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -75,8 +75,8 @@ int pfctl_get_skip_ifaces(void); int pfctl_check_skip_ifaces(char *); int pfctl_adjust_skip_ifaces(struct pfctl *); int pfctl_clear_interface_flags(int, int); -int pfctl_clear_rules(int, int, char *); -int pfctl_clear_nat(int, int, char *); +int pfctl_flush_rules(int, int, char *); +int pfctl_flush_nat(int, int, char *); int pfctl_clear_altq(int, int); int pfctl_clear_src_nodes(int, int); int pfctl_clear_iface_states(int, const char *, int); @@ -449,16 +449,12 @@ pfctl_clear_interface_flags(int dev, int opts) } int -pfctl_clear_rules(int dev, int opts, char *anchorname) +pfctl_flush_rules(int dev, int opts, char *anchorname) { - struct pfr_buffer t; + int ret; - memset(&t, 0, sizeof(t)); - t.pfrb_type = PFRB_TRANS; - if (pfctl_add_trans(&t, PF_RULESET_SCRUB, anchorname) || - pfctl_add_trans(&t, PF_RULESET_FILTER, anchorname) || - pfctl_trans(dev, &t, DIOCXBEGIN, 0) || - pfctl_trans(dev, &t, DIOCXCOMMIT, 0)) + ret = pfctl_clear_rules(dev, anchorname); + if (ret != 0) err(1, "pfctl_clear_rules"); if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "rules cleared\n"); @@ -466,17 +462,12 @@ pfctl_clear_rules(int dev, int opts, char *anchorname) } int -pfctl_clear_nat(int dev, int opts, char *anchorname) +pfctl_flush_nat(int dev, int opts, char *anchorname) { - struct pfr_buffer t; + int ret; - memset(&t, 0, sizeof(t)); - t.pfrb_type = PFRB_TRANS; - if (pfctl_add_trans(&t, PF_RULESET_NAT, anchorname) || - pfctl_add_trans(&t, PF_RULESET_BINAT, anchorname) || - pfctl_add_trans(&t, PF_RULESET_RDR, anchorname) || - pfctl_trans(dev, &t, DIOCXBEGIN, 0) || - pfctl_trans(dev, &t, DIOCXCOMMIT, 0)) + ret = pfctl_clear_nat(dev, anchorname); + if (ret != 0) err(1, "pfctl_clear_nat"); if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "nat cleared\n"); @@ -2628,10 +2619,10 @@ main(int argc, char *argv[]) switch (*clearopt) { case 'r': - pfctl_clear_rules(dev, opts, anchorname); + pfctl_flush_rules(dev, opts, anchorname); break; case 'n': - pfctl_clear_nat(dev, opts, anchorname); + pfctl_flush_nat(dev, opts, anchorname); break; case 'q': pfctl_clear_altq(dev, opts); @@ -2646,8 +2637,8 @@ main(int argc, char *argv[]) pfctl_clear_stats(dev, opts); break; case 'a': - pfctl_clear_rules(dev, opts, anchorname); - pfctl_clear_nat(dev, opts, anchorname); + pfctl_flush_rules(dev, opts, anchorname); + pfctl_flush_nat(dev, opts, anchorname); pfctl_clear_tables(anchorname, opts); if (!*anchorname) { pfctl_clear_altq(dev, opts);