The branch main has been updated by kp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=90b0159163862254fe9a1a1d851444a37faf1f6b
commit 90b0159163862254fe9a1a1d851444a37faf1f6b
Author: Kristof Provost <k...@freebsd.org>
AuthorDate: 2025-06-30 12:24:53 +0000
Commit: Kristof Provost <k...@freebsd.org>
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 <k...@openbsd.org>, 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);
}
