From nobody Mon Nov 27 20:37:09 2023 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 4SfHSk2Sbwz52lm2; Mon, 27 Nov 2023 20:37:10 +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 4SfHSk14fbz4KCw; Mon, 27 Nov 2023 20:37:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701117430; 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=WOK+rKKIdCckX32FjKXuJeT3+soSPMpwsYEeob4sgyw=; b=WwIAdiZbGgpz/Sg0qwltKyiYDJ18a+68+zn4obMb4oGPif+lsGv3cEwlOdrqXHW7Ou5ByM 3faddy36xaJ2H9wXPyEbLAYpVCVtu7KfJuCbXE+eS5RgljAau4iIu9FGu9YtRnKdLJpHQ9 dBJTV5vOwrTtzZRe/5qg1H/+hwDpkoh9jOs9mcyx+Hr/8PiSBEGKYnQDNj9hczfjwsJTV8 Kv+jKro3bhd7jq5ygVCfdLWilRpUf7yQ9wLAUAWfPX9J5qg1IpVtrOAyHms63bzHiUwqaI 3CJRf1YzJ6SkdtC8Z8+aaxtNRAJtvdy2VVbZBg+3AXqgVRKIARlAVBn2GHu/Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701117430; 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=WOK+rKKIdCckX32FjKXuJeT3+soSPMpwsYEeob4sgyw=; b=Is1ryCuGlv7hUBLVyi2u4pWFvFizkUFQHuzrowjWNLV8wbBVH00n1JIJVMUZdgqva4g4UC hkLscFT0+5mevEDzxrHNQp4l5Lpqu/kLQoKKhgk36uj5Ypq9rWBlDzPEj1pcxO4RIWF0aB 938aLiBNG3FXT+RyAEjcb9z3q/Jh/lnCzGMm7AI4wovn41Ng1aX5I7yJOq9T+oT3tP2y1b eKPJ0rSRRfvzpXI8W44tDKLQ8gHXC7YL08coRGV/oRXxWhIXFYOrTvVlxrWsAGQPUJ7wGx GXEgFQUtvRDdPoRRj6Q9uoruR0+PwkxXF19SYVwUiEw8kZxQZD7l8mc3JIriEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701117430; a=rsa-sha256; cv=none; b=MserVYhIR/pm0GTymfLS0BFWPaU+wVpbQ0QZrwouN0xhO3MzDxkGznBvxEtacC+gVjP1b8 lHdlfJW6rT7cHLzqGxD2R2cxOeDOy2Mveb3aZc08yk2byx4OWbDDiGFc5lYr4vy1evrzV4 q+BWXQLqeRppFrA+hAOiyD83i3ZuubmlYD3zzKlAM+iQpppwpduWspA+HTFH+EtUIpowwm eNL1igzrRYY2eYi94GT0MDIJ1+ran2wde4w/YiQOqxQ9alMKehR8O2yag8H2OS4+bSdTxq RlX5FBuw/uZMm9hY5b/n2EwQX2lMF6r/Fmru6uOIxiUUssuNZA0vVRAJIMtjJQ== 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 4SfHSk09Lgzt3d; Mon, 27 Nov 2023 20:37:10 +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 3ARKb9Nr019737; Mon, 27 Nov 2023 20:37:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARKb9nS019734; Mon, 27 Nov 2023 20:37:09 GMT (envelope-from git) Date: Mon, 27 Nov 2023 20:37:09 GMT Message-Id: <202311272037.3ARKb9nS019734@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: 2905d10b3927 - main - snmp_pf: use libpfctl's pfctl_get_rules_info() rather than DIOCGETRULES 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: 2905d10b392766faf0e0ce8070864132d8ab66c3 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2905d10b392766faf0e0ce8070864132d8ab66c3 commit 2905d10b392766faf0e0ce8070864132d8ab66c3 Author: Kristof Provost AuthorDate: 2023-11-27 16:48:33 +0000 Commit: Kristof Provost CommitDate: 2023-11-27 20:36:48 +0000 snmp_pf: use libpfctl's pfctl_get_rules_info() rather than DIOCGETRULES Prefer libpfctl functions over direct access to the ioctl whenever possible. Sponsored by: Rubicon Communications, LLC ("Netgate") --- usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c index a5786007d3f4..bb064dd549d2 100644 --- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c +++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c @@ -1513,24 +1513,21 @@ err2: static int pfl_scan_ruleset(const char *path) { - struct pfioc_rule pr; + struct pfctl_rules_info rules; struct pfctl_rule rule; + char anchor_call[MAXPATHLEN] = ""; struct pfl_entry *e; u_int32_t nr, i; - bzero(&pr, sizeof(pr)); - strlcpy(pr.anchor, path, sizeof(pr.anchor)); - pr.rule.action = PF_PASS; - if (ioctl(dev, DIOCGETRULES, &pr)) { + if (pfctl_get_rules_info(dev, &rules, PF_PASS, path)) { syslog(LOG_ERR, "pfl_scan_ruleset: ioctl(DIOCGETRULES): %s", strerror(errno)); goto err; } - for (nr = pr.nr, i = 0; i < nr; i++) { - pr.nr = i; - if (pfctl_get_rule(dev, pr.nr, pr.ticket, pr.anchor, - PF_PASS, &rule, pr.anchor_call)) { + for (nr = rules.nr, i = 0; i < nr; i++) { + if (pfctl_get_rule(dev, i, rules.ticket, path, + PF_PASS, &rule, anchor_call)) { syslog(LOG_ERR, "pfl_scan_ruleset: ioctl(DIOCGETRULE):" " %s", strerror(errno)); goto err;