From nobody Tue Mar 08 13:02:12 2022 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 54CA919F6DB7; Tue, 8 Mar 2022 13:02:13 +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 4KCb8510Y8z3nGC; Tue, 8 Mar 2022 13:02:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646744533; 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=jaP4v6wUVSdJzbmsEXCBv8g6RmD1RPOUD5D1YJejRVI=; b=e0Rq3jiW9vwRJHiyL/4NJdtv4/JwXgZpCcFOehEl7qDZUGh8+GO+5VJYaNeGNwUPT2Xvzf Z3Nfin0bCWEffyZZu5tu4ximeg/tLl4cttbXyxndKj30P1jBGGAyolq94J12fer7R4zmp7 c1+dYe1b0e0/E5CtqDKjIQOT9Fxit3O/Nwlh5VFAoCxiT7mE99nM7LWz73iQonjJwnpJMD 2MluTrfrBNtL6g1BGiiLqJEPf+IYyKnk7I6psISNmL0i9fB592Iku3BxLc/HRNqEOcm1Mr ku9bTEh1gKG0Jl0rgsZPA055M5482aRFNGuTZZTh8kNazQ09asoXiXQSwTYJzg== 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 039E51D2F2; Tue, 8 Mar 2022 13:02:13 +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 228D2CXt098770; Tue, 8 Mar 2022 13:02:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 228D2C0H098769; Tue, 8 Mar 2022 13:02:12 GMT (envelope-from git) Date: Tue, 8 Mar 2022 13:02:12 GMT Message-Id: <202203081302.228D2C0H098769@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: f0c334e4deca - main - libpfctl: support flushing rules/nat/eth 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: f0c334e4deca08b56b4226539c844a7018e9182d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646744533; 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=jaP4v6wUVSdJzbmsEXCBv8g6RmD1RPOUD5D1YJejRVI=; b=KFMZsmtXfpzhtFwJzmxNzT89EqscZjcg64zCoSKPm1V+PiuoGTminlKkQ7TNjbMM+rwqcJ rSFhPc4hBarHckqstnNSlK403msd7fKTvhKqGWGhcW7Pa5eQxLOuDW6ck8dDwlaDGVr7zW o9YuJfAGrU6qWO4Zd1HfSROAQ27N0AA3z1jXMVdHNatnPbCx3YTBs6OpKFtXh3NekhuJ8A nuxOShaGxVoaFLkGgqX4MZ1LKR1ZZoQb8FwgJfnwNciDV5ZJWARE2eJ3SsUomS2ibn0CjM BRdexl3MWHjS45EqpTtERf61dyhwCY44+yRy7jV9es4jbdRNZon076fJpa0xTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646744533; a=rsa-sha256; cv=none; b=X5H+0xKV6bbA93FDxrhs1ci0tj1VL4LK9Zc5+edORQZnsUhGdIAt+QMV3vooAgKcL+z2Sk r5EQB3RlWeLUq975d2Zq22q2Hc9aHhz/yq3n56kiWdXumZBnltKpc3zx4xCIrGvSWsNXvU +xqBRDm1pgjJNW0Iu+wGiQPCFtg/2qCMTfFsXU8WhqLPMPSSgK0/nRLfJH5HepJim0eiZB K0VqiuUjsXAsknKwzrMlqRS5feI52KoOJyloztVNHrgtbKeG01n1i2o5u0rKfy9t7N+qpx mkes6vppyS0LBs0Iwxk/Z+QEuKYzPHXAd6Mhvrc+hSAN7IjwLa7Mk+zuZHqNdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f0c334e4deca08b56b4226539c844a7018e9182d commit f0c334e4deca08b56b4226539c844a7018e9182d Author: Kristof Provost AuthorDate: 2022-03-04 14:50:43 +0000 Commit: Kristof Provost CommitDate: 2022-03-08 12:57:45 +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 --- lib/libpfctl/libpfctl.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++ lib/libpfctl/libpfctl.h | 3 ++ sbin/pfctl/pfctl.c | 58 +++++++++++++------------------- 3 files changed, 116 insertions(+), 34 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 07699d66deaa..3010ca76d075 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -1169,6 +1169,95 @@ 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); +} +int +pfctl_clear_eth_rules(int dev, const char *anchorname) +{ + struct pfioc_trans trans; + struct pfioc_trans_e transe; + int ret; + + bzero(&trans, sizeof(trans)); + bzero(&transe, sizeof(transe)); + + transe.rs_num = PF_RULESET_ETH; + if (strlcpy(transe.anchor, anchorname, sizeof(transe.anchor)) + >= sizeof(transe.anchor)) + return (E2BIG); + + trans.size = 1; + trans.esize = sizeof(transe); + 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 4f8f55945d4b..0692a71bd488 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -373,6 +373,9 @@ 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_clear_eth_rules(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 b1d6c6899716..e0d839c6b8ba 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -75,9 +75,9 @@ 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_eth_rules(int, int, char *); -int pfctl_clear_rules(int, int, char *); -int pfctl_clear_nat(int, int, char *); +int pfctl_flush_eth_rules(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); @@ -460,32 +460,27 @@ pfctl_clear_interface_flags(int dev, int opts) } int -pfctl_clear_eth_rules(int dev, int opts, char *anchorname) +pfctl_flush_eth_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_ETH, anchorname) || - pfctl_trans(dev, &t, DIOCXBEGIN, 0) || - pfctl_trans(dev, &t, DIOCXCOMMIT, 0)) + ret = pfctl_clear_eth_rules(dev, anchorname); + if (ret != 0) err(1, "pfctl_clear_eth_rules"); + if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "Ethernet rules cleared\n"); - return (0); + + return (ret); } 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"); @@ -493,17 +488,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"); @@ -2926,13 +2916,13 @@ main(int argc, char *argv[]) switch (*clearopt) { case 'e': - pfctl_clear_eth_rules(dev, opts, anchorname); + pfctl_flush_eth_rules(dev, opts, anchorname); break; 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); @@ -2947,9 +2937,9 @@ main(int argc, char *argv[]) pfctl_clear_stats(dev, opts); break; case 'a': - pfctl_clear_eth_rules(dev, opts, anchorname); - pfctl_clear_rules(dev, opts, anchorname); - pfctl_clear_nat(dev, opts, anchorname); + pfctl_flush_eth_rules(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);