git: 9f21a946d016 - main - pf: rename PF_OPT_TABLE_PREFIX to PF_OPTIMIZER_TABLE_PFX

[Kristof Provost]

The branch main has been updated by kp:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=9f21a946d01690cdfba43beba60ab04fc884741a

commit 9f21a946d01690cdfba43beba60ab04fc884741a
Author:     Kristof Provost <k...@freebsd.org>
AuthorDate: 2025-07-07 09:39:07 +0000
Commit:     Kristof Provost <k...@freebsd.org>
CommitDate: 2025-07-12 09:57:52 +0000

    pf: rename PF_OPT_TABLE_PREFIX to PF_OPTIMIZER_TABLE_PFX
    
    Move it to pf.h.
    OPT is misleading and usually refers to command line arguments to pfctl
    
    ok sashan kn
    
    Obtained from:  OpenBSD, henning <henn...@openbsd.org>, 9c6ad19ba4
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 sbin/pfctl/pfctl_optimize.c | 6 +++---
 sbin/pfctl/pfctl_parser.h   | 1 -
 sys/netpfil/pf/pf.h         | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sbin/pfctl/pfctl_optimize.c b/sbin/pfctl/pfctl_optimize.c
index b82e88652f86..1d2a60555f19 100644
--- a/sbin/pfctl/pfctl_optimize.c
+++ b/sbin/pfctl/pfctl_optimize.c
@@ -1248,7 +1248,7 @@ add_opt_table(struct pfctl *pf, struct pf_opt_tbl **tbl, 
sa_family_t af,
 
                /* This is just a temporary table name */
                snprintf((*tbl)->pt_name, sizeof((*tbl)->pt_name), "%s%d",
-                   PF_OPT_TABLE_PREFIX, tablenum++);
+                   PF_OPTIMIZER_TABLE_PFX, tablenum++);
                DEBUG("creating table <%s>", (*tbl)->pt_name);
        }
 
@@ -1315,9 +1315,9 @@ pf_opt_create_table(struct pfctl *pf, struct pf_opt_tbl 
*tbl)
        /* Now we have to pick a table name that isn't used */
 again:
        DEBUG("translating temporary table <%s> to <%s%x_%d>", tbl->pt_name,
-           PF_OPT_TABLE_PREFIX, table_identifier, tablenum);
+           PF_OPTIMIZER_TABLE_PFX, table_identifier, tablenum);
        snprintf(tbl->pt_name, sizeof(tbl->pt_name), "%s%x_%d",
-           PF_OPT_TABLE_PREFIX, table_identifier, tablenum);
+           PF_OPTIMIZER_TABLE_PFX, table_identifier, tablenum);
        PFRB_FOREACH(t, &table_buffer) {
                if (strcasecmp(t->pfrt_name, tbl->pt_name) == 0) {
                        /* Collision.  Try again */
diff --git a/sbin/pfctl/pfctl_parser.h b/sbin/pfctl/pfctl_parser.h
index 778105c2b96d..7a3c0c2a523f 100644
--- a/sbin/pfctl/pfctl_parser.h
+++ b/sbin/pfctl/pfctl_parser.h
@@ -263,7 +263,6 @@ struct pf_opt_tbl {
        struct node_tinithead    pt_nodes;
        struct pfr_buffer       *pt_buf;
 };
-#define PF_OPT_TABLE_PREFIX    "__automatic_"
 
 /* optimizer pf_rule container */
 struct pf_opt_rule {
diff --git a/sys/netpfil/pf/pf.h b/sys/netpfil/pf/pf.h
index 2009d2907985..db353d185368 100644
--- a/sys/netpfil/pf/pf.h
+++ b/sys/netpfil/pf/pf.h
@@ -490,6 +490,7 @@ struct pf_osfp_ioctl {
 
 #define        PF_ANCHOR_NAME_SIZE      64
 #define        PF_ANCHOR_MAXPATH       (MAXPATHLEN - PF_ANCHOR_NAME_SIZE - 1)
+#define        PF_OPTIMIZER_TABLE_PFX  "__automatic_"
 
 struct pf_rule {
        struct pf_rule_addr      src;