From nobody Tue Mar 08 13:02:14 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 9689219F6BD9; Tue, 8 Mar 2022 13:02: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 4KCb863JsVz3n8b; Tue, 8 Mar 2022 13:02:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646744534; 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=SIZ/WVf0DOKa5xn81LdfbDiNwMuNqnmRtntyN1bEtjQ=; b=hzWm4otxUvJHEmhDiyakctsew5TNa2TrV6w7+h97WRZNUfHcM+Eyah95x/PbWnHlwDctdV RKQVVepFAa1IWW2YT7ZVME9Y8hUb+dSuMexamWBrbFiKs+VXDzs9uoSArM9EgevYD0/XhA +vbTpPZv43c3e9k7iwdh8sLckey6pFaL2YbXTGqU6uBy5E9xatGMO9jGbRk5gnfTZ46CN8 /jE87eQIC6UZ3XiA/MFBpX84v8RlbS5YxF7oOpse9W1GHZElJbyfVR8khCfkojkhGnBadZ 19XigXD0tCf+eHrgD2qcNuUP4l94F8dyXSxm/2H8e9KvSfcfv9iKCu/Pv10foA== 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 3C2911D127; Tue, 8 Mar 2022 13:02:14 +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 228D2EFd098794; Tue, 8 Mar 2022 13:02:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 228D2EGg098793; Tue, 8 Mar 2022 13:02:14 GMT (envelope-from git) Date: Tue, 8 Mar 2022 13:02:14 GMT Message-Id: <202203081302.228D2EGg098793@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: 8c1400b0a108 - main - libpfct: factor out pfctl_get_rules_info() 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/main X-Git-Reftype: branch X-Git-Commit: 8c1400b0a1083c9e2bf8f3418eb3e3cfba1a8444 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646744534; 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=SIZ/WVf0DOKa5xn81LdfbDiNwMuNqnmRtntyN1bEtjQ=; b=kflp7oL3tbiazVBAMzBaXmcUBl11xhfq0j+0tIclYrKFt2G1bXPfaBGvXSPpekEhc2CotM E1p81vMwQk8jFJvg+ljLNA0TFJ8TxHU8HSpsQYFu/6m9UKpbceqfOe1OBfMyKH0d4RRWld fs08Sijd3252CxwENeMpVocGeo1OQ7bZ8DHZQGFypY+OkeYEoPnf6+NWYFKh+6aygW5KP4 WfY7mwxXvhdZJSNtoIQq6IOE0A8qeG3NHb6kHwov7Tr3iQj2des7q3S476bx68JYugiYts bSKwY6BM1WdB7AEZhDub8RDp5ZOdHj3sBjbaZoa0OmDHp6u6jAOek+IlhceXNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646744534; a=rsa-sha256; cv=none; b=ejKEonIASzjMmQrHfk7j0QSIiFThSkkcl0/t7X+A9Yz928PW+poi1QVfW8HuwOkSTn7qXu YDRRGXMKJwSheJe1CXzLbPL9PLV5gSLP474QXBy2VdtdlPTEjIslAmdMjAsi6ekro7XZA7 zjHR+MWPEaHz/q8Xn2jAPRp7brYM87DGLS35T/HDDISDtS+beKKz9UpbG2Zq9troZRMcOM LpKhTtCCIq/kIgriuj5zLrRgwmxqonmYPvycSzB6+B3fFfJ+fnlV2Otw83aU7meE/jaHVS sJmpNHCMqCjn3hwvCoQCuGzj7bA4TV+mQlEMXe58YhFkc1nA3bWrcTj+0Q9iMA== 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=8c1400b0a1083c9e2bf8f3418eb3e3cfba1a8444 commit 8c1400b0a1083c9e2bf8f3418eb3e3cfba1a8444 Author: Kristof Provost AuthorDate: 2022-03-04 16:12:01 +0000 Commit: Kristof Provost CommitDate: 2022-03-08 12:57:45 +0000 libpfct: factor out pfctl_get_rules_info() Introduce pfctl_get_rules_info(), similar to pfctl_get_eth_rules_info() to retrieve rules information (ticket and total number of rules). Use the new function in pfctl. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D34443 --- lib/libpfctl/libpfctl.c | 22 ++++++++++++ lib/libpfctl/libpfctl.h | 7 ++++ sbin/pfctl/pfctl.c | 93 +++++++++++++++++++++++-------------------------- 3 files changed, 72 insertions(+), 50 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 3010ca76d075..896ae1829e1a 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -884,6 +884,28 @@ pfctl_add_rule(int dev, const struct pfctl_rule *r, const char *anchor, return (ret); } +int +pfctl_get_rules_info(int dev, struct pfctl_rules_info *rules, uint32_t ruleset, + const char *path) +{ + struct pfioc_rule pr; + int ret; + + bzero(&pr, sizeof(pr)); + if (strlcpy(pr.anchor, path, sizeof(pr.anchor)) >= sizeof(pr.anchor)) + return (E2BIG); + + pr.rule.action = ruleset; + ret = ioctl(dev, DIOCGETRULES, &pr); + if (ret != 0) + return (ret); + + rules->nr = pr.nr; + rules->ticket = pr.ticket; + + return (0); +} + int pfctl_get_rule(int dev, uint32_t nr, uint32_t ticket, const char *anchor, uint32_t ruleset, struct pfctl_rule *rule, char *anchor_call) diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index 0692a71bd488..02781403a3a2 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -135,6 +135,11 @@ struct pfctl_pool { uint8_t opts; }; +struct pfctl_rules_info { + uint32_t nr; + uint32_t ticket; +}; + struct pfctl_rule { struct pf_rule_addr src; struct pf_rule_addr dst; @@ -357,6 +362,8 @@ int pfctl_get_eth_rule(int dev, uint32_t nr, uint32_t ticket, char *anchor_call); int pfctl_add_eth_rule(int dev, const struct pfctl_eth_rule *r, const char *anchor, const char *anchor_call, uint32_t ticket); +int pfctl_get_rules_info(int dev, struct pfctl_rules_info *rules, + uint32_t ruleset, const char *path); int pfctl_get_rule(int dev, uint32_t nr, uint32_t ticket, const char *anchor, uint32_t ruleset, struct pfctl_rule *rule, char *anchor_call); diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index e0d839c6b8ba..ffd978b304cb 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1133,13 +1133,15 @@ int pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format, char *anchorname, int depth) { - struct pfioc_rule pr; + struct pfctl_rules_info ri; struct pfctl_rule rule; - u_int32_t nr, mnr, header = 0; + char anchor_call[MAXPATHLEN]; + u_int32_t nr, header = 0; int rule_numbers = opts & (PF_OPT_VERBOSE2 | PF_OPT_DEBUG); int numeric = opts & PF_OPT_NUMERIC; int len = strlen(path); int brace; + int ret; char *p; if (path[0]) @@ -1147,39 +1149,35 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format, else snprintf(&path[len], MAXPATHLEN - len, "%s", anchorname); - memset(&pr, 0, sizeof(pr)); - memcpy(pr.anchor, path, sizeof(pr.anchor)); if (opts & PF_OPT_SHOWALL) { - pr.rule.action = PF_PASS; - if (ioctl(dev, DIOCGETRULES, &pr)) { + ret = pfctl_get_rules_info(dev, &ri, PF_PASS, anchorname); + if (ret != 0) { warn("DIOCGETRULES"); goto error; } header++; } - pr.rule.action = PF_SCRUB; - if (ioctl(dev, DIOCGETRULES, &pr)) { + ret = pfctl_get_rules_info(dev, &ri, PF_SCRUB, anchorname); + if (ret != 0) { warn("DIOCGETRULES"); goto error; } if (opts & PF_OPT_SHOWALL) { - if (format == PFCTL_SHOW_RULES && (pr.nr > 0 || header)) + if (format == PFCTL_SHOW_RULES && (ri.nr > 0 || header)) pfctl_print_title("FILTER RULES:"); else if (format == PFCTL_SHOW_LABELS && labels) pfctl_print_title("LABEL COUNTERS:"); } - mnr = pr.nr; - for (nr = 0; nr < mnr; ++nr) { - pr.nr = nr; - if (pfctl_get_clear_rule(dev, nr, pr.ticket, path, PF_SCRUB, - &rule, pr.anchor_call, opts & PF_OPT_CLRRULECTRS)) { + for (nr = 0; nr < ri.nr; ++nr) { + if (pfctl_get_clear_rule(dev, nr, ri.ticket, path, PF_SCRUB, + &rule, anchor_call, opts & PF_OPT_CLRRULECTRS)) { warn("DIOCGETRULENV"); goto error; } if (pfctl_get_pool(dev, &rule.rpool, - nr, pr.ticket, PF_SCRUB, path) != 0) + nr, ri.ticket, PF_SCRUB, path) != 0) goto error; switch (format) { @@ -1188,7 +1186,7 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format, case PFCTL_SHOW_RULES: if (rule.label[0] && (opts & PF_OPT_SHOWALL)) labels = 1; - print_rule(&rule, pr.anchor_call, rule_numbers, numeric); + print_rule(&rule, anchor_call, rule_numbers, numeric); printf("\n"); pfctl_print_rule_counters(&rule, opts); break; @@ -1197,22 +1195,20 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format, } pfctl_clear_pool(&rule.rpool); } - pr.rule.action = PF_PASS; - if (ioctl(dev, DIOCGETRULES, &pr)) { + ret = pfctl_get_rules_info(dev, &ri, PF_PASS, anchorname); + if (ret != 0) { warn("DIOCGETRULES"); goto error; } - mnr = pr.nr; - for (nr = 0; nr < mnr; ++nr) { - pr.nr = nr; - if (pfctl_get_clear_rule(dev, nr, pr.ticket, path, PF_PASS, - &rule, pr.anchor_call, opts & PF_OPT_CLRRULECTRS)) { + for (nr = 0; nr < ri.nr; ++nr) { + if (pfctl_get_clear_rule(dev, nr, ri.ticket, path, PF_PASS, + &rule, anchor_call, opts & PF_OPT_CLRRULECTRS)) { warn("DIOCGETRULE"); goto error; } if (pfctl_get_pool(dev, &rule.rpool, - nr, pr.ticket, PF_PASS, path) != 0) + nr, ri.ticket, PF_PASS, path) != 0) goto error; switch (format) { @@ -1246,18 +1242,18 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format, if (rule.label[0] && (opts & PF_OPT_SHOWALL)) labels = 1; INDENT(depth, !(opts & PF_OPT_VERBOSE)); - if (pr.anchor_call[0] && - ((((p = strrchr(pr.anchor_call, '_')) != NULL) && - ((void *)p == (void *)pr.anchor_call || + if (anchor_call[0] && + ((((p = strrchr(anchor_call, '_')) != NULL) && + ((void *)p == (void *)anchor_call || *(--p) == '/')) || (opts & PF_OPT_RECURSE))) { brace++; - if ((p = strrchr(pr.anchor_call, '/')) != + if ((p = strrchr(anchor_call, '/')) != NULL) p++; else - p = &pr.anchor_call[0]; + p = &anchor_call[0]; } else - p = &pr.anchor_call[0]; + p = &anchor_call[0]; print_rule(&rule, p, rule_numbers, numeric); if (brace) @@ -1288,55 +1284,52 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format, int pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth) { - struct pfioc_rule pr; + struct pfctl_rules_info ri; struct pfctl_rule rule; - u_int32_t mnr, nr; + char anchor_call[MAXPATHLEN]; + u_int32_t nr; static int nattype[3] = { PF_NAT, PF_RDR, PF_BINAT }; int i, dotitle = opts & PF_OPT_SHOWALL; - int brace; + int brace, ret; char *p; for (i = 0; i < 3; i++) { - memset(&pr, 0, sizeof(pr)); - memcpy(pr.anchor, anchorname, sizeof(pr.anchor)); - pr.rule.action = nattype[i]; - if (ioctl(dev, DIOCGETRULES, &pr)) { + ret = pfctl_get_rules_info(dev, &ri, nattype[i], anchorname); + if (ret != 0) { warn("DIOCGETRULES"); return (-1); } - mnr = pr.nr; - for (nr = 0; nr < mnr; ++nr) { + for (nr = 0; nr < ri.nr; ++nr) { brace = 0; INDENT(depth, !(opts & PF_OPT_VERBOSE)); - pr.nr = nr; - if (pfctl_get_rule(dev, nr, pr.ticket, anchorname, - nattype[i], &rule, pr.anchor_call)) { + if (pfctl_get_rule(dev, nr, ri.ticket, anchorname, + nattype[i], &rule, anchor_call)) { warn("DIOCGETRULE"); return (-1); } if (pfctl_get_pool(dev, &rule.rpool, nr, - pr.ticket, nattype[i], anchorname) != 0) + ri.ticket, nattype[i], anchorname) != 0) return (-1); - if (pr.anchor_call[0] && - ((((p = strrchr(pr.anchor_call, '_')) != NULL) && - (p == pr.anchor_call || + if (anchor_call[0] && + ((((p = strrchr(anchor_call, '_')) != NULL) && + (p == anchor_call || *(--p) == '/')) || (opts & PF_OPT_RECURSE))) { brace++; - if ((p = strrchr(pr.anchor_call, '/')) != + if ((p = strrchr(anchor_call, '/')) != NULL) p++; else - p = &pr.anchor_call[0]; + p = &anchor_call[0]; } else - p = &pr.anchor_call[0]; + p = &anchor_call[0]; if (dotitle) { pfctl_print_title("TRANSLATION RULES:"); dotitle = 0; } - print_rule(&rule, pr.anchor_call, + print_rule(&rule, anchor_call, opts & PF_OPT_VERBOSE2, opts & PF_OPT_NUMERIC); if (brace) printf(" {\n");