From nobody Mon Dec 04 15:21:30 2023 X-Original-To: dev-commits-src-branches@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 4SkS7H1W9Xz53StV; Mon, 4 Dec 2023 15:21:31 +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 4SkS7H13rHz4rnN; Mon, 4 Dec 2023 15:21:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701703291; 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=zoQJrjsgyVnsDLxY/gIqA78jiyfhTCRwRR8EG6RfpvQ=; b=hpgAqoeoZCwZrrduhHnewScCwp1NFmLWXkXUPDHM2MEpJEr8sSp0qH3yaw7trkk7Ow756P JeGaWauGBeEv9euqXOukebxCm0rvivjepnzgX4nBSXWdtTAPQoxEmYL4mDWAsKLQ2MGcxw EfmOx2NWplS033qog8Qt4vmj4EVklP7LQIn6sPk7D3rmFuZyu8eWccGPaX2pzGzTQvKEXC rZMvpHevr1XaBd6LN4k+iRcCFs0GCP3SiGO51nCPKLO5NpK4jh4ZdZTsFz+ZAP43CLYRZl vPF6NKBEamskgY/RfPMzAbjISVxIbh7FmjY98OqC2hBxhxwMe3IfclxIcXxfUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701703291; 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=zoQJrjsgyVnsDLxY/gIqA78jiyfhTCRwRR8EG6RfpvQ=; b=lQEs57vHd3XwEA3q3vZ4Lh5p4ua/w1Z8LeRRS8r5NSpEzYGdTOT3LinUchcPfZxhxWYwF6 +jwdisI6U2Q1ta0znMa30U1+0EfOoQ2PSC8KvxI3MMA5Rnqacw7qmtV5r8comZsyjrbs1H WgHKKZnJCdAWXpWkq+F1QLjO4/ZB8Uat8fNlkAP063QRweZ4jsNteJldPZe/OXztuzvMnW 92c7mxreyn7e/SnXWwWIYO2uitq9So4Pt9oBDE5GxlW6FjB7Jk3mZ484g3Y9rEJnUDGhnq VKgoI0XiObUxI1iHsNOX3lp5BYyGZQmuh1LpXKOx9TVQRP21XFiHs/PMI/vMSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701703291; a=rsa-sha256; cv=none; b=B/6J0Fq2q04lN5yKhAySn61Mepn9OikQc88n6JPGVCcA4LJpDLHzWC0plSnd3wCcekKdx/ lmcWCLvECSjGfDAdyS3hofPNu86WXo11ng6y+APX1lt459fintcIF0rPP0yhNFwfgjz49g H1InIoQT5u1BrXNyE3EozGkb94HMxe4PEHZHy8C3GPox0gXSdMny/k8+Dd0jEIGybMGK0I mvaFhwRwrWfAyEtkWTqhWt3zQmmaTPEGmY1Cd26otVt27uOEJ3EgnbITlGqnIphuZhnPdY IgWabGoxyYzcbcsp7tmAhlKx7BFJEQpInPMxD0xoEtcArH2v/H+anIaj43ayiA== 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 4SkS7H077YzXFB; Mon, 4 Dec 2023 15:21:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4FLUC3087772; Mon, 4 Dec 2023 15:21:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4FLUwY087769; Mon, 4 Dec 2023 15:21:30 GMT (envelope-from git) Date: Mon, 4 Dec 2023 15:21:30 GMT Message-Id: <202312041521.3B4FLUwY087769@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: ec990152c655 - stable/14 - pfctl: use libpfctl instead of DIOCGETRULES directly List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: ec990152c6553a658c40e78a94b0032af901397e Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ec990152c6553a658c40e78a94b0032af901397e commit ec990152c6553a658c40e78a94b0032af901397e Author: Kristof Provost AuthorDate: 2023-11-24 23:43:48 +0000 Commit: Kristof Provost CommitDate: 2023-12-04 15:20:57 +0000 pfctl: use libpfctl instead of DIOCGETRULES directly MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 47a0b59379c3bec547e7c829eb12de8276227dff) --- sbin/pfctl/pfctl_optimize.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/sbin/pfctl/pfctl_optimize.c b/sbin/pfctl/pfctl_optimize.c index a377f9eb04dc..98da986b0aeb 100644 --- a/sbin/pfctl/pfctl_optimize.c +++ b/sbin/pfctl/pfctl_optimize.c @@ -878,24 +878,23 @@ block_feedback(struct pfctl *pf, struct superblock *block) int load_feedback_profile(struct pfctl *pf, struct superblocks *superblocks) { + char anchor_call[MAXPATHLEN] = ""; struct superblock *block, *blockcur; struct superblocks prof_superblocks; struct pf_opt_rule *por; struct pf_opt_queue queue; - struct pfioc_rule pr; + struct pfctl_rules_info rules; struct pfctl_rule a, b, rule; int nr, mnr; TAILQ_INIT(&queue); TAILQ_INIT(&prof_superblocks); - memset(&pr, 0, sizeof(pr)); - pr.rule.action = PF_PASS; - if (ioctl(pf->dev, DIOCGETRULES, &pr)) { + if (pfctl_get_rules_info(pf->dev, &rules, PF_PASS, "")) { warn("DIOCGETRULES"); return (1); } - mnr = pr.nr; + mnr = rules.nr; DEBUG("Loading %d active rules for a feedback profile", mnr); for (nr = 0; nr < mnr; ++nr) { @@ -904,15 +903,14 @@ load_feedback_profile(struct pfctl *pf, struct superblocks *superblocks) warn("calloc"); return (1); } - pr.nr = nr; - if (pfctl_get_rule(pf->dev, nr, pr.ticket, "", PF_PASS, - &rule, pr.anchor_call)) { + if (pfctl_get_rule(pf->dev, nr, rules.ticket, "", PF_PASS, + &rule, anchor_call)) { warn("DIOCGETRULENV"); return (1); } memcpy(&por->por_rule, &rule, sizeof(por->por_rule)); - rs = pf_find_or_create_ruleset(pr.anchor_call); + rs = pf_find_or_create_ruleset(anchor_call); por->por_rule.anchor = rs->anchor; if (TAILQ_EMPTY(&por->por_rule.rpool.list)) memset(&por->por_rule.rpool, 0,