From nobody Thu Sep 25 12:41:39 2025 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 4cXYHm4HBQz68SYX; Thu, 25 Sep 2025 12:41:40 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cXYHm0MbLz42kV; Thu, 25 Sep 2025 12:41:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758804100; 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=gk3gPVQOHRqxaKjckJkY18tvF3/fgIEcLOHH2rNbwHc=; b=Wb/gfgDTxXMgcp5hhiRRqgTvErusZrRcEcK7gHf0S1mQmJ7NNPqm+RLx8qQUEXV2GJ99Uo wjr+sAKNq6KIOsQ0B4NY5oqvjtgSFutpESQjM3fMsQt3ZEF80itslhZfBTwgMVfrBb2nID Khja8LVNKs7CM9JgclPZtrwC+r6xBBfmHwrW4Nmm6EgIEEzU4m1mjKEjvZAI8edELX+GPW FCaX4glreW/WOfONYfy6J9NpSBhigq6MLePxK5sgTb/fkpXw8DNpCGnyGGuVUQLkgWdIIa v29PIvrregA83XztOt1FgvaP5IDYteTWiaaitoXjpYBuS3mWgj5a/+iYrMOGyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758804100; 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=gk3gPVQOHRqxaKjckJkY18tvF3/fgIEcLOHH2rNbwHc=; b=IkxbkHkV8f/Zgj5A7Z4xvVjj6Te8WRj5Tdruv53skd3nTB9O4zCzPGbsGmc3KuZNAPE+KB 59yVlb/SaBS6sLX0DcQp1fN6vc78Hjyakdbqta4fQ1U/aPsQnl+fURvzy9ZBDEKKyedjAx PJRk1bCue8JFtxEPmGJllpS9veaRTF2oWe3vyPWWUq1RvXyDI8+8wKwKnn7vme72gKql7l rlAeLXTZXp6tGMxNkZq3O5EyVC0Xfj8JHaHAiXQ21Hxi4a8e0lFH5XIHLAS15wLRbCjMmm 5gcoDf1p3/K9/u3WKjpPIVLvGnL16ZfyeNkfWBHG8myzgMZGsaEzP7lQKhKsfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758804100; a=rsa-sha256; cv=none; b=cU0/gpJKVis2J/b6mfZhM8ry2knzfJu/xhPhTWcmr991cQH1N5a1DpQovmUkZkW6Ov9rsx yI9ZNy8FTIvTRS/okBICWEptokmydABq/ZcH0VzFNxdZl7eFmWWzxsYIcMBU+uKr+Ki8O3 eCSvSwNk6qJ6ZQI0s/1n3qeT8y+ac76ljqyZJHq26/zz8xn4LSN6GigNHAA663XtMo0ZL/ k5D2Sl7cBguV1lYDu/Aj17ryC/4Rz2DzOI66QnUo07Ok5JHzlm7b0Q0EhrSG3ldbJQM3Pk UR3JSlF1ZQ++CGHG07zEzlM6ZhN814hTURs720IUvuDKh3RUh4fcUwXwfGNwpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cXYHl6zgSz1Gvf; Thu, 25 Sep 2025 12:41:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58PCfdfJ004606; Thu, 25 Sep 2025 12:41:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58PCfdEu004601; Thu, 25 Sep 2025 12:41:39 GMT (envelope-from git) Date: Thu, 25 Sep 2025 12:41:39 GMT Message-Id: <202509251241.58PCfdEu004601@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: 59f3838b0a94 - main - pfctl: reduce duplicate code 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 59f3838b0a942b44397063ffb63a4e4d569129f1 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=59f3838b0a942b44397063ffb63a4e4d569129f1 commit 59f3838b0a942b44397063ffb63a4e4d569129f1 Author: Kristof Provost AuthorDate: 2025-08-27 16:13:50 +0000 Commit: Kristof Provost CommitDate: 2025-09-25 12:41:09 +0000 pfctl: reduce duplicate code * Merge `once' handling from `anchorrule' and `pfrule' * Remove/shorten duplicate code block OK sashan Obtained from: OpenBSD, kn , d114b77333 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/parse.y | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index c8c6f6047fa5..c75632c740b3 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -1061,12 +1061,6 @@ anchorrule : ANCHOR anchorname dir quick interface af proto fromto } } - if ($9.marker & FOM_ONCE) { - yyerror("cannot specify 'once' " - "on anchors"); - YYERROR; - } - if (filteropts_to_rule(&r, &$9)) YYERROR; @@ -2396,15 +2390,6 @@ pfrule : action dir logquick interface route af proto fromto r.quick = $3.quick; r.af = $6; - if ($9.marker & FOM_ONCE) { - if (r.action == PF_MATCH) { - yyerror("can't specify once for " - "match rules"); - YYERROR; - } - r.rule_flag |= PFRULE_ONCE; - } - if (filteropts_to_rule(&r, &$9)) YYERROR; @@ -7757,6 +7742,14 @@ node_mac_from_string_mask(const char *str, const char *mask) int filteropts_to_rule(struct pfctl_rule *r, struct filter_opts *opts) { + if (opts->marker & FOM_ONCE) { + if (r->action != PF_PASS && r->action != PF_MATCH) { + yyerror("'once' only applies to pass/block rules"); + return (1); + } + r->rule_flag |= PFRULE_ONCE; + } + r->keep_state = opts->keep.action; r->pktrate.limit = opts->pktrate.limit; r->pktrate.seconds = opts->pktrate.seconds;