From nobody Sat Jul 12 13:38:57 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 4bfV6W0lwLz61stj; Sat, 12 Jul 2025 13:38:59 +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 4bfV6V1BF0z3Cg8; Sat, 12 Jul 2025 13:38:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752327538; 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=X2i6EHWhbwt99ssikSZwvUS8Yg8NMvWWowGViNbXpUA=; b=jNIwRZf6m5MnUwPpSsl+6OWHVV2J4irjm5e+ITmsTk9AVupimPrrHAhw+ip50eLLZvJxYN qaBFpITsufG3OXrv2AuAO+kTGDK2Ub9+HTzpop0XI8n84wXEaYXF8ZwS+vK8cGzAWFYyLh DfmS4ljWB8YNknV7DF797LhGzTNa6Xr5LbP1cy0hqIcH9irGdI+Kp7KPnPh6voZi7eqlhs jcSALRubr5NxO89xd0MRmH7vPUUenWlqnKTe/0RZjpWaO8eYsjcuukOhJrd13UmAcZB8Ev pbIOrHsXVLgqnjLWeFrcM+AAvLeBw+6TgzGt+z9uaIotKqYYkUMWcCL3fvDVpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752327538; 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=X2i6EHWhbwt99ssikSZwvUS8Yg8NMvWWowGViNbXpUA=; b=jbNgooquh3IgkpEy5JcwHoHIwX0qzb/XNMPC3eFooAUlAZxnLfLgmKL+v6WqEGXocmKrGU m//U1TCcA0D0e1RopIwYFlznybyXAav/h7nVP2/BdVYTIkRdJL0Pb+Y2V5FQ5QbbBgkFZz 2Occnzx+DY9q3geVMEBqM4fHf9UOZZrZJwS8ErCv55pYtzbWSWMdgzBY99BC1VGjXfLAc2 nslr3ESVCjOp5CskgBPh4tE6a6l63etHeRa1cp8DGSnB4RsGxZURYz2nsK6pj2YarFfLfa ObMi3t9Mv/3IytLIeW4eDUPe1eKQEfsN85w9vBSvdNBaXFudu2vfTvX0IDRm2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752327538; a=rsa-sha256; cv=none; b=i61qenSYKAzh0QOCDe6Ij6XNY8C5zqr3Y4EB7BXAOAVala333o0n7gWURxE5WOv7uGfmuX TQzDHeisOnFqjBNuypOA0oZjR3ZyQiJmYu84blKGmjPZQf6taFkSF2huR1dwMJdkBJ5VC6 en1kxQlTr5K74Yk+RgRdq5z8LTg2dwuaDSTjqctpQE20KnhbZSFJRjSfJQexZbD2njdY2H ZkNh5Zwvo6XGtjDVBYeb+VoFVzIvAC6VLvGub63563DOmoAN8+nEp2rTCMW6OQadnzM6PC s83PdB8b2AknlWXbJ0duW6ZgdOs1SjbcWVJlvHMQa6pwZioORxMA+s6+Hpdy8g== 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 4bfV6V0M74z8mZ; Sat, 12 Jul 2025 13:38:58 +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 56CDcvYr089145; Sat, 12 Jul 2025 13:38:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56CDcvIl089142; Sat, 12 Jul 2025 13:38:57 GMT (envelope-from git) Date: Sat, 12 Jul 2025 13:38:57 GMT Message-Id: <202507121338.56CDcvIl089142@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: 9f21a946d016 - main - pf: rename PF_OPT_TABLE_PREFIX to PF_OPTIMIZER_TABLE_PFX 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: 9f21a946d01690cdfba43beba60ab04fc884741a Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9f21a946d01690cdfba43beba60ab04fc884741a commit 9f21a946d01690cdfba43beba60ab04fc884741a Author: Kristof Provost AuthorDate: 2025-07-07 09:39:07 +0000 Commit: Kristof Provost 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 , 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;