From nobody Sun Oct 04 12:07:11 2026 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 4hyLqT2lb4z4n2kk for ; Sun, 04 Oct 2026 12:07:17 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hyLqT17t3z4QW7 for ; Sun, 04 Oct 2026 12:07:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791115637; 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=K75dtkdZieNdOrLgYjsZ3Rr/ZOgzYuHCbUXyCSpHW48=; b=nnmeYNvA0Q5gj5DlzO9Sw8lE7DlPx0k3WVpJfyHF9SWQgF4oUkpqFbQN7vIqHQw9Xoe7aJ XfeoPHTYq9tBTskV82DIj2xxC93CGug3UE1qDY1DRgJbohwK8nPyDESaQmofhz8oVrImNE ASjsxeixUMapMqoJVvC7yqZ1ggorOKbv7cV3DNN1fPXQaaaMIqnF9VuYa9y1IxkQtPpSJy xq5a/jMkSkbB+LK+1m+w6KEXCvtoS+PYFySM3TEsemDhww4wEFhA8p41cyWySVMQYBfiTK fPoGLkWuza4R5FAco1RNObeY5Ffy5NXS6ha7EK45A2mtcl1a1BXWf0tdomQCGA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791115637; b=Z81xOZYcTUqKc14FcT+CCO7ni6vkZAek7uTzmoc6YXdOMpB+i31Agg522TZFG/h98m7BIj o5VZh5FIqIwYtsbsdb5Zu56AYvmXxQtp4oD4QAeNt96gE+N5yOhQCfWCYjyluyMoghM1tz LKvmjcqkkNBInxQ2ax8o5CEg+PWndjHIU24iMPzbM0aCMDKLWmqv3W7VnEYPKhMSGu6QgA 57jYfBDbPHBQJKboNKI4I3/qZEdLNJHum0Yqd4/Tn047JNhQg1ildYeWU2XKMz3FAyMtE6 Kul3jjKDUKKGsQjoVoRfVONE6WeVmVdNKXrREb2AWoaE9Z1iYqiPt35n+nWetQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791115637; 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=K75dtkdZieNdOrLgYjsZ3Rr/ZOgzYuHCbUXyCSpHW48=; b=OCpmDOd8C648UzeKguMX8+wakANM6YuSmmmJhTxSanDzN1VbOg5OQL3ueJlCBQCZhqzWYA bsn4waR1+q4rvKfUTZz0kCWJ+Co3pqbutHo+0pG6VI4PDgD+jJX/mC2mJGfT8iTtHCJ7YO TH2Kf2FG6Jfcn2JVH8KSRMKIjuM58N/4r5OovNxiMx/AWt5klQpTLMICAouOIP4oW+A3X8 hYCYJNctXS+n/ws6PsEHD9sYRPOUE5bXcrlf/m5RI0juliNH9DKEou9tLKy12t+q5UTfIv MfdXbdCR09p3yc+nsS4A2L+A1zF8fbSJPcgB9xGJsbtzw17Jb+JecqoDRAhF7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hyLqS6p18zYm2 for ; Sun, 04 Oct 2026 12:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2648e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Oct 2026 12:07:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: R. Christian McDonald Subject: git: a5b1b2d2c5e5 - main - libpfctl: remove the state getters that do not take a handle 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rcm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a5b1b2d2c5e585364809fdf8f165d6dc742faadb Auto-Submitted: auto-generated Date: Sun, 04 Oct 2026 12:07:11 +0000 Message-Id: <6ac2416f.2648e.4e6adb61@gitrepo.freebsd.org> The branch main has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=a5b1b2d2c5e585364809fdf8f165d6dc742faadb commit a5b1b2d2c5e585364809fdf8f165d6dc742faadb Author: R. Christian McDonald AuthorDate: 2026-10-04 12:06:10 +0000 Commit: R. Christian McDonald CommitDate: 2026-10-04 12:06:10 +0000 libpfctl: remove the state getters that do not take a handle Nothing in the tree calls any of the three. Remove them rather than fix them: pfctl_get_states_h() does the same with the handle that the caller has. pfctl_free_states(), struct pfctl_states and the list entry in struct pfctl_state were there for pfctl_get_states() alone, and go with it. Reviewed by: kp Approved by: kp (mentor) Fixes: 2a478dfc7f9c ("libpfctl: retrieve family id only once") Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D60248 --- lib/libpfctl/libpfctl.c | 66 ------------------------------------------------- lib/libpfctl/libpfctl.h | 11 --------- 2 files changed, 77 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 65c1a77b4d87..097c4743da2c 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -2027,72 +2027,6 @@ out: return (ret); } -int -pfctl_get_states_iter(pfctl_get_state_fn f, void *arg) -{ - struct pfctl_state_filter filter = {}; - return (pfctl_get_filtered_states_iter(&filter, f, arg)); -} - -int -pfctl_get_filtered_states_iter(struct pfctl_state_filter *filter, pfctl_get_state_fn f, void *arg) -{ - struct pfctl_handle h = {}; - int error; - - snl_init(&h.ss, NETLINK_GENERIC); - error = pfctl_get_states_h(&h, filter, f, arg); - snl_free(&h.ss); - - return (error); -} - -static int -pfctl_append_states(struct pfctl_state *s, void *arg) -{ - struct pfctl_state *new; - struct pfctl_states *states = (struct pfctl_states *)arg; - - new = malloc(sizeof(*s)); - if (new == NULL) - return (ENOMEM); - - memcpy(new, s, sizeof(*s)); - - TAILQ_INSERT_TAIL(&states->states, new, entry); - - return (0); -} - -int -pfctl_get_states(int dev __unused, struct pfctl_states *states) -{ - int ret; - - bzero(states, sizeof(*states)); - TAILQ_INIT(&states->states); - - ret = pfctl_get_states_iter(pfctl_append_states, states); - if (ret != 0) { - pfctl_free_states(states); - return (ret); - } - - return (0); -} - -void -pfctl_free_states(struct pfctl_states *states) -{ - struct pfctl_state *s, *tmp; - - TAILQ_FOREACH_SAFE(s, &states->states, entry, tmp) { - free(s); - } - - bzero(states, sizeof(*states)); -} - struct pfctl_nl_clear_states { uint32_t killed; }; diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index ef73d0469236..850afd5eac47 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -369,8 +369,6 @@ struct pfctl_state_key { }; struct pfctl_state { - TAILQ_ENTRY(pfctl_state) entry; - uint64_t id; uint32_t creatorid; uint8_t direction; @@ -409,11 +407,6 @@ struct pfctl_state { struct pfctl_rule created_by_rule; }; -TAILQ_HEAD(pfctl_statelist, pfctl_state); -struct pfctl_states { - struct pfctl_statelist states; -}; - enum pfctl_syncookies_mode { PFCTL_SYNCOOKIES_NEVER, PFCTL_SYNCOOKIES_ALWAYS, @@ -508,11 +501,7 @@ struct pfctl_state_filter { bool include_rule; }; typedef int (*pfctl_get_state_fn)(struct pfctl_state *, void *); -int pfctl_get_states_iter(pfctl_get_state_fn f, void *arg); int pfctl_get_states_h(struct pfctl_handle *h, struct pfctl_state_filter *filter, pfctl_get_state_fn f, void *arg); -int pfctl_get_filtered_states_iter(struct pfctl_state_filter *filter, pfctl_get_state_fn f, void *arg); -int pfctl_get_states(int dev, struct pfctl_states *states); -void pfctl_free_states(struct pfctl_states *states); int pfctl_clear_states(int dev, const struct pfctl_kill *kill, unsigned int *killed); int pfctl_kill_states(int dev, const struct pfctl_kill *kill,