From nobody Mon Jun 30 09:54:39 2025 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 4bW1jF0X7Zz60GRw; Mon, 30 Jun 2025 09:54:41 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bW1jC4dmjz3fG9; Mon, 30 Jun 2025 09:54:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751277279; 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=Nf+e1HFFdjTLuelB4pBTvaGfqDKssf6klBHlIIr1iqg=; b=yG8YkXwTpZV9czwEiYPtd5k1BJM6BhyOV2YXg8MUIoML7CZGkVdgEas3Z5pByCWgqTJG2E V99qUdJ4J+9cuDuQnxTOTifr9ARNjmwCaIxBzFE1htPSH06FpmX53ZUUZa11q/JxrnVUsh gmcVkQFXsoVfRqk7lVyb0dG/H//tGF10EzqtV7txw1BpSra/5muUMzYOtFdoAWgAcOtdEo vNVve642ezv+QQTWBTih2YkPAfTA2/8lK7Qm8T0BtYAmyKviUrUYtdmMMYDICqbpDUM8jt zoJSWOM9hCHDPlfHDFp4b9SvdAaAjbvGStbBTDHoc9GawtWcQ5LFQNcbObRfQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751277279; 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=Nf+e1HFFdjTLuelB4pBTvaGfqDKssf6klBHlIIr1iqg=; b=Adg9/+2VwfzAJrkS4H/8WzHqh+qh5VE0A+uajot1Xw4gREz68J6+zEBTJBPPDcQ/IOZ9AT iRp4mbaoniryjW6/5jZr5Me3FDa/Swj0fY+1HtMJlDU0m4MA5eHgIxfJNJ5jR6QQcKooqB BpASO7G1fsth4LVUV0OOOt9kJY0eOmno2DEG+z0MarqtqhVijywQAQ5yyR+64BTCWSjpaE SUQU/JBzPWYME9o1+qHU7yxx4E+ymlf66jROOgnB75iQZW3EslDOc1K0yuiPsJlX6rb56e bfy199ef1xd10S3mHddF2whF5QQo15mkoVKo+iXEj6mmqQZRD33jXD4ZJ5I7xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751277279; a=rsa-sha256; cv=none; b=yM9b+d8rhL+JIsCOMhImZ/IQsW+niFHz5JL3j5g0Kw0mF1+V8zu5JstZ4HV1F9+xjp7jlY 4hwtUWQAiCdC2jHSMgcnmzWf/Ln6ZKFflgggCQZNOGeipSAc2zIX6ksv1At93P3fpIF+kB iT5S6vzJf7DiIhfJ76vpyNl5wlLJ1k3Kfkeh9NlnEGe7F/db38b+0Pck/sI2Nd2M9Db9Iw 7SzSyoDCWPjOESDTnEFKSF6LKHcweL+VcjTX9B24Dj/4WVuVRdBS+2c0cLsv06Bb/USkoU 6pgeierwx+ybNUHn9i9MCdfir1ID/XjJfWYr8j1MNQxq5XDAHTskFLrKSk6KAQ== 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 4bW1jC4FQZz10SQ; Mon, 30 Jun 2025 09:54: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 55U9sd8P064494; Mon, 30 Jun 2025 09:54:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55U9sdCo064491; Mon, 30 Jun 2025 09:54:39 GMT (envelope-from git) Date: Mon, 30 Jun 2025 09:54:39 GMT Message-Id: <202506300954.55U9sdCo064491@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: d8d7bd50cb88 - main - pfctl: simplify FOM_PRIO handling 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: d8d7bd50cb887000535b9e75e2f5688b8718127f Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d8d7bd50cb887000535b9e75e2f5688b8718127f commit d8d7bd50cb887000535b9e75e2f5688b8718127f Author: Kristof Provost AuthorDate: 2025-06-27 09:13:17 +0000 Commit: Kristof Provost CommitDate: 2025-06-30 07:53:56 +0000 pfctl: simplify FOM_PRIO handling Obtained from: OpenBSD, kn , d114b77333 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/parse.y | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index df40478b0403..9d2fd35ea4ee 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -7619,12 +7619,8 @@ filteropts_to_rule(struct pfctl_rule *r, struct filter_opts *opts) r->rule_flag |= PFRULE_AFTO; if (opts->marker & FOM_SCRUB_TCP) r->scrub_flags |= PFSTATE_SCRUB_TCP; - if (opts->marker & FOM_PRIO) { - if (opts->prio == 0) - r->prio = PF_PRIO_ZERO; - else - r->prio = opts->prio; - } + if (opts->marker & FOM_PRIO) + r->prio = opts->prio ? opts->prio : PF_PRIO_ZERO; if (opts->marker & FOM_SETPRIO) { r->set_prio[0] = opts->set_prio[0]; r->set_prio[1] = opts->set_prio[1];