From nobody Fri Jul 4 09:22:33 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 4bYSpK5WPnz61GNv; Fri, 04 Jul 2025 09:22:33 +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 4bYSpK4ZNTz3pL2; Fri, 04 Jul 2025 09:22:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751620953; 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=sZwiF+PiQZP6SSkOGibvc9LyHpbyyon2OmxPkPOxdx4=; b=p0sQcD0/4py8Of5xprgShq5m7qn6/CAxONX/aWCySwajkGcxAQ9X9ffMtYc5pOsigZ5LkV 6oW/Ou97lF6lROV+1+fd3Er1jsbY+EogfQb1/jd8jZ/9sR+7i+m9GlAl7YL815tu5i2B7F NwSP0MGzYaIWutiujNTwqQJRV05oeN/NpkFdReU/DAdCAmSjG+vgXj0uC491F+SxgfZuLD GYSxnJCZUORPsHW/KX/XkKiX7tRT/zAZ8ZG88NbLheiL1MPqQn7afhT5e7mkQuNeDc7MTa diyntGPqC4fDa1yHG0VQggdLx/r7qce7WR/3Mlwdk2I3Jk0rhreePVk6ZHv0UA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751620953; 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=sZwiF+PiQZP6SSkOGibvc9LyHpbyyon2OmxPkPOxdx4=; b=C41H655I01J6DlFX5nDghQ1SOp8ZCCoahe4cZfuf/EpVnQqxEt1lpDUkgdpOFZi5x7LTGR Od+jzgjRwszVYfFFcDFBWfbOXJyuI4F6fuV+5wMdNnsR7YYZwhjtxPIXeBLKKPBEyjCVd8 Dxjkt0SsE35zC7qblaCN5Bf39njCwzAV10iwgFYKHCvPlENpOLqZPbge3fAlb6zcpNC5HF MY+JTxMZMus2ENwDluV7FHhXYdFdXVMQd6stWSxNgBmU7bUFNu/AXlRbHYYoZkRvb5/S0c HaU5ajvqUvFoxzb8hTzz1Dj9/1eh+N+CJFviC7w7tOqn8LLekEv2en0wzvVq8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751620953; a=rsa-sha256; cv=none; b=rE0/xMP1a1+JqN7pb0HI4h6C2ozHP8RuekopoIT1ebZ7dxVycPnLwzEe1e/YJjOEJFMGm9 geLWp/nHUzVoQJpej+ud85HPczcWGGhEqjBp7XpTVeGJ4hOZW8/MqEBdWZ4411FchPOiGA KNjMtodfWsbt4OojfMm+h1ob/flstClktXrcRO/lbXt5KHv8RPSW93nUsUHgNtn9ofsdQw OGdd1BU0IYDmnML56MexqxZaOMwE4Tw78JxQshSISAUbEv+CE5yKxoXp+uyPOw4/8IbNPt qjvjdRgkMxK05xvZQoM7bF5XEfzdSnob5Z6XrZPU3Lb95RVXRTTVaQK+B2z7sQ== 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 4bYSpK44hjzkwn; Fri, 04 Jul 2025 09:22:33 +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 5649MXqH055609; Fri, 4 Jul 2025 09:22:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5649MXtA055606; Fri, 4 Jul 2025 09:22:33 GMT (envelope-from git) Date: Fri, 4 Jul 2025 09:22:33 GMT Message-Id: <202507040922.5649MXtA055606@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: 90b015916386 - main - pf: use PFR_RB_NONE consistently 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: 90b0159163862254fe9a1a1d851444a37faf1f6b Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=90b0159163862254fe9a1a1d851444a37faf1f6b commit 90b0159163862254fe9a1a1d851444a37faf1f6b Author: Kristof Provost AuthorDate: 2025-06-30 12:24:53 +0000 Commit: Kristof Provost CommitDate: 2025-07-04 08:31:10 +0000 pf: use PFR_RB_NONE consistently Replace hardcoded 0 and implicit checks with enum as done in all other use cases of `pfra_fback'. No object change. OK sashan Obtained from: OpenBSD, kn , ab23e671fc Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl_table.c | 14 +++++++++----- sys/netpfil/pf/pf_table.c | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/sbin/pfctl/pfctl_table.c b/sbin/pfctl/pfctl_table.c index 3fe87b53b7f9..abe22a3258de 100644 --- a/sbin/pfctl/pfctl_table.c +++ b/sbin/pfctl/pfctl_table.c @@ -214,7 +214,8 @@ pfctl_table(int argc, char *argv[], char *tname, const char *command, xprintf(opts, "%d/%d addresses added", nadd, b.pfrb_size); if (opts & PF_OPT_VERBOSE) PFRB_FOREACH(a, &b) - if ((opts & PF_OPT_VERBOSE2) || a->pfra_fback) + if ((opts & PF_OPT_VERBOSE2) || + a->pfra_fback != PFR_FB_NONE) print_addrx(a, NULL, opts & PF_OPT_USEDNS); } else if (!strcmp(command, "delete")) { @@ -228,7 +229,8 @@ pfctl_table(int argc, char *argv[], char *tname, const char *command, xprintf(opts, "%d/%d addresses deleted", ndel, b.pfrb_size); if (opts & PF_OPT_VERBOSE) PFRB_FOREACH(a, &b) - if ((opts & PF_OPT_VERBOSE2) || a->pfra_fback) + if ((opts & PF_OPT_VERBOSE2) || + a->pfra_fback != PFR_FB_NONE) print_addrx(a, NULL, opts & PF_OPT_USEDNS); } else if (!strcmp(command, "replace")) { @@ -259,7 +261,8 @@ pfctl_table(int argc, char *argv[], char *tname, const char *command, xprintf(opts, "no changes"); if (opts & PF_OPT_VERBOSE) PFRB_FOREACH(a, &b) - if ((opts & PF_OPT_VERBOSE2) || a->pfra_fback) + if ((opts & PF_OPT_VERBOSE2) || + a->pfra_fback != PFR_FB_NONE) print_addrx(a, NULL, opts & PF_OPT_USEDNS); } else if (!strcmp(command, "expire")) { @@ -282,7 +285,7 @@ pfctl_table(int argc, char *argv[], char *tname, const char *command, break; } PFRB_FOREACH(p, &b) { - ((struct pfr_astats *)p)->pfras_a.pfra_fback = 0; + ((struct pfr_astats *)p)->pfras_a.pfra_fback = PFR_FB_NONE; if (time(NULL) - ((struct pfr_astats *)p)->pfras_tzero > lifetime) if (pfr_buf_add(&b2, @@ -297,7 +300,8 @@ pfctl_table(int argc, char *argv[], char *tname, const char *command, xprintf(opts, "%d/%d addresses expired", ndel, b2.pfrb_size); if (opts & PF_OPT_VERBOSE) PFRB_FOREACH(a, &b2) - if ((opts & PF_OPT_VERBOSE2) || a->pfra_fback) + if ((opts & PF_OPT_VERBOSE2) || + a->pfra_fback != PFR_FB_NONE) print_addrx(a, NULL, opts & PF_OPT_USEDNS); } else if (!strcmp(command, "reset")) { diff --git a/sys/netpfil/pf/pf_table.c b/sys/netpfil/pf/pf_table.c index d5874df3df66..6332e713c596 100644 --- a/sys/netpfil/pf/pf_table.c +++ b/sys/netpfil/pf/pf_table.c @@ -704,7 +704,7 @@ pfr_validate_addr(struct pfr_addr *ad) return (-1); if (ad->pfra_not && ad->pfra_not != 1) return (-1); - if (ad->pfra_fback) + if (ad->pfra_fback != PFR_FB_NONE) return (-1); return (0); }