From nobody Tue Mar 15 15:20:13 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 D128A1A19541; 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 4KHxt60NPrz4Zlt; Tue, 15 Mar 2022 15:20:14 +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=T8zBYTWFLPOmeUXrppVRgePlSrD3B+vbUyV9llC4Czs=; b=Rv8BrjkiRzN3BKj4xopDfzzu2AK0pNJM1Ore8p7GEydPfVhnoD2ILgU3incJgF4jmRVSJn 1X/nJd38AMlJIzvTmMUwKL+M4mKjOMTczEmFKSMBwpRSibIVLiYUA4kEm5cQ0h349TgqlH 7IoI+4qgMGqTkRZee11vvlEY2kptnmvejBimjU0ZLtkzD7aglS1GLgr24fNSiB3krcNy6T gHzj3FYQRxfdClO/YqXf1hzusflmayCrdnS0NUyKTPEWl+l1sDIZvfFjqTek7FYP/11yKx SLSSlz0Acfn6/yw/WXjXNHpj21mUpOTqklZ/TT3vaTjChvHe1EvAqNq7+u3g/g== 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 BF309240A6; Tue, 15 Mar 2022 15:20: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 22FFKDVQ035008; Tue, 15 Mar 2022 15:20:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22FFKDqE035001; Tue, 15 Mar 2022 15:20:13 GMT (envelope-from git) Date: Tue, 15 Mar 2022 15:20:13 GMT Message-Id: <202203151520.22FFKDqE035001@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: d271eca03f03 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: d271eca03f03121a4abdc171ac80ae282af66722 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=T8zBYTWFLPOmeUXrppVRgePlSrD3B+vbUyV9llC4Czs=; b=uCAl/GhVeUgE/M1HhKyK/gHtoRernKTVKoSmGBCsp2Bs1rJDjXJp8o3EJoOYRZCBSW5dtU X4hPjltbuZExSC+Ek79rtEzvr+xAYxMd0y7M/LwIGy01EtXSPcnZ42N5d0sL7EoonJP56T d4d/ZJwanT5r5BcqEI19YQZ7GHObco03Pw5TSbES0EIAOmSwoH0DWAlGq/8gZeWbnP0KEy 2nOrV3t8yipQCkm22lxXSKPf1c12lw+xG4cSyq6SRQiWp6NmBYqpH/Q5wmBUPueuPE3zA0 9Nz+wGDuhrekTS1uyLuWfNZ9GuicfnsdtlcWIruBVtFkpNV58x/mhWi8MLtPvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647357614; a=rsa-sha256; cv=none; b=FvhwIMTLDjokuWRUPGUhBQXAXN50qfYLUJW6nP7Md1xrVABxe6SDaxubnG/HS316W+eQO4 wKSXRZ2/8g197azdPtnwIeEwwjC25NzQ9bMReF9bul/iEa8uBuSD5UQW8yZr6uev6z0s8d 3cbEMvg1riwie6+B59YEX0sEdvRgTmrG38lKlQyZMQ77o9Vx4hQ1rVP8n5amur2hWtmbfI oghyujjU5E/kyI46N09CgFyOyy519dwov/s0tcHJM1G/ax+rrsF6Vg9RFIVr5OO1Xe7Mfm QRcJ1WOVUUYuoTCTZYb+p1zU1mnOEQIMRtlVT7GP+PgCfD9+7VwrSHRBOueVjw== 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=d271eca03f03121a4abdc171ac80ae282af66722 commit d271eca03f03121a4abdc171ac80ae282af66722 Author: Kristof Provost AuthorDate: 2022-03-04 16:12:01 +0000 Commit: Kristof Provost CommitDate: 2022-03-15 03:24:25 +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 (cherry picked from commit 8c1400b0a1083c9e2bf8f3418eb3e3cfba1a8444) --- 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 4c110131dcbe..3a06600f396c 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -661,6 +661,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 3b4e61be0165..726ec89cd3d6 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -76,6 +76,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; @@ -288,6 +293,8 @@ struct pfctl_syncookies { struct pfctl_status* pfctl_get_status(int dev); void pfctl_free_status(struct pfctl_status *status); +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 7dfcd7cc494a..676d3eb1ce8d 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1029,13 +1029,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]) @@ -1043,39 +1045,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) { @@ -1084,7 +1082,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; @@ -1093,22 +1091,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) { @@ -1142,18 +1138,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) @@ -1184,55 +1180,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");