From nobody Fri Jul 4 09:22:41 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 4bYSpV0pqjz61Gx5; Fri, 04 Jul 2025 09:22:42 +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 4bYSpT4T4Lz3pgf; Fri, 04 Jul 2025 09:22:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751620961; 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=R0FD9tpN9W9OAZagFdgsfAQ17WIMDY+vl/5ZbubyQbY=; b=ZgICuEml3kpVMTSiFrWgF55wESHczdnvd2kbb5sKAfP4/AsBWC/ZidJKPWiO0PXGHGujDR uZAzcfFEZ9fD+3fc5TIbKdD9PJ023p5B7/9BYgZOic1lfzbzvx2dqhH+g7MIr1lKo6ueqD USJvNFuMHu/e5bIaFSMwHVS/RuoDAfVYO2OiNalIAO1FwVj1gsh0IovEN2fmsNZMe5Vl8q 21SlEkx5gYkPHERivyfYjkTcT5WrrnV2CGJe8Homemg54v/x0HRJZcE4h2vtIYVlxrFHEB BmONfdSG97qbXmA5T8qvb4oZXTgoPY85cBumAJWieCdivUDzX8mW4sRQxwh8Dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751620961; 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=R0FD9tpN9W9OAZagFdgsfAQ17WIMDY+vl/5ZbubyQbY=; b=ZeITTyyMdihmSh4vJnQ2iPQQK4en3EOFrjxWA7xDHI0IKZPpyUm/rEZhBPODzgwwy/6juy 622e4/RSy/xRo+6Jv4J08MAKkUKjBNbWic4cQ1Z5IWBOYDsBL1Ppghf8+xmdeCK/wYK4db U6nQX/TkaX7Qzzbz1Cuy3jA6bj7LdvnNOjgwGciThy8ExLKy2doaIFolFuEI0wfaWqBgIC TYjV28fAzrXhwWLXk+UVdhOxYPouJYlzPvDhpNbwoYxhPbCXT/+EHU3KEDMai24BU4lhhx iEOF6Uv8FxKwOZon5Nw2S7xFUnbUwW7izCjNgJI5u+O3M3e1t5DL78cEZZSE1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751620961; a=rsa-sha256; cv=none; b=P74CeKx3oWnd3qiAgbsFeuMah2HMVC+pxkTzV3CwpbNYD5UEP0ICW1QOHjvrb2l6Rf4w6s NbF2u5p6BodEF8C/jY3XoxPVvziRXbOAhUFVICXb8YheufweuHyk7CXOasPZL62Z8FK2uM OCdQ0pj2Lxc3XAgtBhvQAW5lD+4rirfhOneGh6SU0U67YX2jOCr90mV4FhMXkON04hPeS+ fAQZTaEHZvI74fs07mrtWX5bXDpOUrcjvs5GCUsFqGOf9z4pyMTxxoON8GujBf5OLH2xUD jcn1+qvZ77r5sbn8Ub3uX+U4DOliFJIdq/RdIOMUvD9hIGVf07oxjzg54BZlbg== 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 4bYSpT36bFzlQ7; Fri, 04 Jul 2025 09:22:41 +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 5649MfLr055856; Fri, 4 Jul 2025 09:22:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5649MfkY055853; Fri, 4 Jul 2025 09:22:41 GMT (envelope-from git) Date: Fri, 4 Jul 2025 09:22:41 GMT Message-Id: <202507040922.5649MfkY055853@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: 651fbbc9a69b - main - pf: Rename pf_anchor_remove() to pf_remove_anchor() 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: 651fbbc9a69bddaa8abe1cd4434e70f1367396c9 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=651fbbc9a69bddaa8abe1cd4434e70f1367396c9 commit 651fbbc9a69bddaa8abe1cd4434e70f1367396c9 Author: Kristof Provost AuthorDate: 2025-06-30 17:06:06 +0000 Commit: Kristof Provost CommitDate: 2025-07-04 08:31:12 +0000 pf: Rename pf_anchor_remove() to pf_remove_anchor() For semantic consistency with pf_{create,find,remove}_{anchor,ruleset}(). Simplify logic by squashing the if/else block while here. No functional change. Feedback jca and mikeb, OK mikeb Obtained from: OpenBSD, kn , f6275afa61 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 2 +- sys/netpfil/pf/pf_ioctl.c | 2 +- sys/netpfil/pf/pf_ruleset.c | 9 +++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 028297310d7b..1416f0c2cdbe 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -2633,7 +2633,7 @@ int pf_kanchor_copyout(const struct pf_kruleset *, const struct pf_krule *, char *, size_t); int pf_kanchor_nvcopyout(const struct pf_kruleset *, const struct pf_krule *, nvlist_t *); -void pf_kanchor_remove(struct pf_krule *); +void pf_remove_kanchor(struct pf_krule *); void pf_remove_if_empty_kruleset(struct pf_kruleset *); struct pf_kruleset *pf_find_kruleset(const char *); struct pf_kruleset *pf_get_leaf_kruleset(char *, char **); diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 96e913635cd0..45201f2eaec9 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -615,7 +615,7 @@ pf_free_rule(struct pf_krule *rule) pfi_kkif_unref(rule->kif); if (rule->rcv_kif) pfi_kkif_unref(rule->rcv_kif); - pf_kanchor_remove(rule); + pf_remove_kanchor(rule); pf_empty_kpool(&rule->rdr.list); pf_empty_kpool(&rule->nat.list); pf_empty_kpool(&rule->route.list); diff --git a/sys/netpfil/pf/pf_ruleset.c b/sys/netpfil/pf/pf_ruleset.c index 0414e4f06f9c..94e8527f6555 100644 --- a/sys/netpfil/pf/pf_ruleset.c +++ b/sys/netpfil/pf/pf_ruleset.c @@ -525,16 +525,13 @@ done: } void -pf_kanchor_remove(struct pf_krule *r) +pf_remove_kanchor(struct pf_krule *r) { if (r->anchor == NULL) return; - if (r->anchor->refcnt <= 0) { + if (r->anchor->refcnt <= 0) printf("%s: broken refcount\n", __func__); - r->anchor = NULL; - return; - } - if (!--r->anchor->refcnt) + else if (!--r->anchor->refcnt) pf_remove_if_empty_kruleset(&r->anchor->ruleset); r->anchor = NULL; }