From nobody Thu Sep 7 19:24:58 2023 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 4RhThq15ftz4sFwZ; Thu, 7 Sep 2023 19:24:59 +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 4RhThq0XDdz3dPg; Thu, 7 Sep 2023 19:24:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694114699; 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=pO2AtfSNABUBCZD7u2D43L4gv4U6OxdInLgDKKidQiI=; b=rcJv63JGKjZhRadpNwkixHbGGIkbvc7jUUKAHKKZaaUZ7GOvsBMx1k7paSVtUmoNZagScW 54xmltP7nW8nqB5tXBrQ0lfd+8vKQer704c76fbFAHAVxvCDhYrvRoKPuD3+FJlb3ZMcvB yGnPLvR25Ymocz7xAQBfdoImCwhYqvjHWZHJ1ycHDbLmIRUZCT1sMT/Ag/SLgqZ70kR2kz t5PDoktOfv/zss3kEpjWifvP+K9ZvRWobcmg7Va3WV0Z364FKXharg/dVBbFLRJercdtjh yK7gD2WSSocJ6Yw7BvG8OesWA7cTvphP4Q7gsrFEpppS4rZLcWPeAugx8heZyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694114699; a=rsa-sha256; cv=none; b=OM7G8PrbEekx0c00FGM7XcaQKZKdlYR278jOnpDvpsUbrCbahsQDHKrqFjuuQCCYDpDj1b p2Nv8hYNvjWAAmg2pXvwZmwTTmQXEMd+vvM1C2s6GElyJZdV+DIEASJBKoZ2BZxJyoq31K ZOpdyEwptFosI3jdht+uRA6F1tFQOHe2GDoD28jhsGTINiK7PLzEJ0CceCNdRy+GdabUm7 6LU9xyxkgAP/5q3COa1GiSj84ObUahpgo6Kun0aZgGSDvwhX0GSi2qck2rkVxba9lTsxLZ 7a2o+4yno1IxKS/65RzcIO8I2FYDm8/XUTmOHooqYCiQpwkn1AppqpSfJ8xsDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694114699; 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=pO2AtfSNABUBCZD7u2D43L4gv4U6OxdInLgDKKidQiI=; b=V+/M7aFujTDS7GVVAr3Vo92HdV+cAmTy9w1jlxo/0T2/MLaYLDI8mN8Xvp6tNhqxDqtlO/ 6gkrT6av8g2ekqx7jyz2pCYM7quIfy9aSjnqIaRuMFB1xsflMh0JHPE5UfO9gZDkoAOudU jNCJamsR/BjHaSqWiQjefKNjV7OUsX0nvHA8jw69cD2X4ujmuj4L8RY5l6TmEQQuyaCxSP s/hI7adz54zxwVmojLCbO/SJ1wdU/hmHHjN4PPqoOGuoc9FXIcf/HoHVGWWQ69qUmb2IUZ nI6P0Bih6MQ8w3kNCZ9x0T+K2+3PstR0jTEcQad8nkzney8L2TK+6rRaXxsQ8Q== 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 4RhThp6Vc1z1B5q; Thu, 7 Sep 2023 19:24:58 +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 387JOwkR064579; Thu, 7 Sep 2023 19:24:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387JOwDn064576; Thu, 7 Sep 2023 19:24:58 GMT (envelope-from git) Date: Thu, 7 Sep 2023 19:24:58 GMT Message-Id: <202309071924.387JOwDn064576@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: c34ca43649db - stable/13 - pf (t)ftp-proxy: use libpfctl instead of DIOCGETSTATUS 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: c34ca43649db9f6d73a55a4e6c7fad832f7b4383 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c34ca43649db9f6d73a55a4e6c7fad832f7b4383 commit c34ca43649db9f6d73a55a4e6c7fad832f7b4383 Author: Kristof Provost AuthorDate: 2023-08-29 15:00:44 +0000 Commit: Kristof Provost CommitDate: 2023-09-07 19:23:06 +0000 pf (t)ftp-proxy: use libpfctl instead of DIOCGETSTATUS Prefer libpfctl functions over direct access to the ioctl whenever possible. This will allow subsequent removal of DIOCGETSTATUS (in 15) as there already is an nvlist-based alternative. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41647 (cherry picked from commit ddd08375c85576b49fb9a34968ba2c2f4f8d56cf) --- contrib/pf/ftp-proxy/filter.c | 9 ++++++--- contrib/pf/tftp-proxy/filter.c | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/contrib/pf/ftp-proxy/filter.c b/contrib/pf/ftp-proxy/filter.c index e4787985e99f..4277e079f3be 100644 --- a/contrib/pf/ftp-proxy/filter.c +++ b/contrib/pf/ftp-proxy/filter.c @@ -169,7 +169,7 @@ do_rollback(void) void init_filter(const char *opt_qname, const char *opt_tagname, int opt_verbose) { - struct pf_status status; + struct pfctl_status *status; qname = opt_qname; tagname = opt_tagname; @@ -182,10 +182,13 @@ init_filter(const char *opt_qname, const char *opt_tagname, int opt_verbose) dev = open("/dev/pf", O_RDWR); if (dev == -1) err(1, "open /dev/pf"); - if (ioctl(dev, DIOCGETSTATUS, &status) == -1) + status = pfctl_get_status(dev); + if (status == NULL) err(1, "DIOCGETSTATUS"); - if (!status.running) + if (!status->running) errx(1, "pf is disabled"); + + pfctl_free_status(status); } int diff --git a/contrib/pf/tftp-proxy/filter.c b/contrib/pf/tftp-proxy/filter.c index 1689d3465fd3..966628464d28 100644 --- a/contrib/pf/tftp-proxy/filter.c +++ b/contrib/pf/tftp-proxy/filter.c @@ -173,7 +173,7 @@ do_rollback(void) void init_filter(char *opt_qname, int opt_verbose) { - struct pf_status status; + struct pfctl_status *status; qname = opt_qname; @@ -187,14 +187,17 @@ init_filter(char *opt_qname, int opt_verbose) syslog(LOG_ERR, "can't open /dev/pf"); exit(1); } - if (ioctl(dev, DIOCGETSTATUS, &status) == -1) { + status = pfctl_get_status(dev); + if (status == NULL) { syslog(LOG_ERR, "DIOCGETSTATUS"); exit(1); } - if (!status.running) { + if (!status->running) { syslog(LOG_ERR, "pf is disabled"); exit(1); } + + pfctl_free_status(status); } int