From nobody Tue Jul 15 10:08:00 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 4bhFHj4WtFz62DRf; Tue, 15 Jul 2025 10:08:01 +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 4bhFHj0v4Xz3fH7; Tue, 15 Jul 2025 10:08:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752574081; 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=1L5nJa6NY6GUjkAwziYnO237d1Le3259SiB8gc4oAZY=; b=Dlgsw3E74031HLTkSCAaeeDveArxAXROqwfDyUgniMHoASvWQquSsqb5q/fg3/inKFWFmH eZnfgFuPC/spdBpZMYr0jV8PpKhI6Ks8+IwpErlk9aqBFtM9GNG3I/fR6FARXEfzxLk2Gh 7dfdYHlxiumz+n8vRNhLgR6RtsyzIPpfs268mb/3r8au8NjWytq23nx5KI6ZoQtVHVhWxp SSb4PxeOXBF8sbk/F9KPrho2vmEBOgpvq2n8whE9oNMHkUZwlJ0hNk1x6fcp4ijlTKxBoy vpDHdixA5tXkrRLXGf/uJ/Ka1WYhNI7ReuIgnWDrRsHagqeN6rXU2PCQUrYN0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752574081; 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=1L5nJa6NY6GUjkAwziYnO237d1Le3259SiB8gc4oAZY=; b=rL9BmPgukGcuwuKsgtZ4KjJpZXjC9xsxUfTglhKfYhO2x32MvcviraC4emY1emEHkWaCC1 rl4eYtmXzrXn+KfB+ivu/wWtnYypDiSTAUrEo9SHBiT9qxgIbrppw4kLYen3GzWoVxSlkf ihhEw719aYIzM++8/m0ollnRNhsVEQ/7InzczDY9t8ncFOKZXs7XYTb2/zvhkEty1AIdFY 8H8JrSMRLKQ0hPwkGRa82sYRvluzmdbOe+AEgJFrUlVjSdXBSGsjQZPGP4fbVOACZluqk8 N6JVTiq5L18IrhBoq2YDzlvS0yOQWrTApyVqpPMMzkuFhe8+yi6MAL2jYO+kNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752574081; a=rsa-sha256; cv=none; b=gSmBiFvzZOBLGsqmPwrb1xsgucxFyNbpjaF+qg8eBZRBekPwLUIoUjddODuaKzedKDVCqq +7f09+8HYV6oDQCpHoAqDQ9fcOxhZ1q7SpuH2T5fn1dLKUUyGD+Ba9Yv9k840pDlQPi0y4 8GGqubV9Ywf7zaeTWvf5taqpgotjhGF0gqRkrouNsAd30epJfLKawNuGqcexx8ZlqKpYax wxB7FGaxBVYIhzoPgCI70aIVINTnkWm95k1mYarDJq6/gN6rjNK4nI3gDc9n560xvA2uvi du2wZZDf8SL5PQ0mWrH4BpPb7umes0ITuLh69nKluJ2CGBVcYrNekVqXlNartQ== 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 4bhFHj02KMzc2J; Tue, 15 Jul 2025 10:08:01 +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 56FA80rw028145; Tue, 15 Jul 2025 10:08:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56FA80jk028141; Tue, 15 Jul 2025 10:08:00 GMT (envelope-from git) Date: Tue, 15 Jul 2025 10:08:00 GMT Message-Id: <202507151008.56FA80jk028141@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: 29e8f3e29203 - main - pf: let pf_table.c to use standard way to work with lists 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: 29e8f3e2920334577fda8c5808c6313b844280af Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=29e8f3e2920334577fda8c5808c6313b844280af commit 29e8f3e2920334577fda8c5808c6313b844280af Author: Kristof Provost AuthorDate: 2025-07-09 12:21:15 +0000 Commit: Kristof Provost CommitDate: 2025-07-15 07:55:31 +0000 pf: let pf_table.c to use standard way to work with lists OK todd@, mvs@, kn@ Obtained from: OpenBSD, sashan , 7f9adf34a4 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_table.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/sys/netpfil/pf/pf_table.c b/sys/netpfil/pf/pf_table.c index e3f3ab9025f7..9c0151b7da2b 100644 --- a/sys/netpfil/pf/pf_table.c +++ b/sys/netpfil/pf/pf_table.c @@ -819,10 +819,10 @@ pfr_create_kentry(struct pfr_addr *ad, bool counters) static void pfr_destroy_kentries(struct pfr_kentryworkq *workq) { - struct pfr_kentry *p, *q; + struct pfr_kentry *p; - for (p = SLIST_FIRST(workq); p != NULL; p = q) { - q = SLIST_NEXT(p, pfrke_workq); + while ((p = SLIST_FIRST(workq)) != NULL) { + SLIST_REMOVE_HEAD(workq, pfrke_workq); pfr_destroy_kentry(p); } } @@ -1680,8 +1680,7 @@ pfr_ina_commit(struct pfr_table *trs, u_int32_t ticket, int *nadd, } if (!(flags & PFR_FLAG_DUMMY)) { - for (p = SLIST_FIRST(&workq); p != NULL; p = q) { - q = SLIST_NEXT(p, pfrkt_workq); + SLIST_FOREACH_SAFE(p, &workq, pfrkt_workq, q) { pfr_commit_ktable(p, tzero); } rs->topen = 0; @@ -1710,7 +1709,7 @@ pfr_commit_ktable(struct pfr_ktable *kt, time_t tzero) } else if (kt->pfrkt_flags & PFR_TFLAG_ACTIVE) { /* kt might contain addresses */ struct pfr_kentryworkq addrq, addq, changeq, delq, garbageq; - struct pfr_kentry *p, *q, *next; + struct pfr_kentry *p, *q; struct pfr_addr ad; pfr_enqueue_addrs(shadow, &addrq, NULL, 0); @@ -1720,7 +1719,8 @@ pfr_commit_ktable(struct pfr_ktable *kt, time_t tzero) SLIST_INIT(&delq); SLIST_INIT(&garbageq); pfr_clean_node_mask(shadow, &addrq); - SLIST_FOREACH_SAFE(p, &addrq, pfrke_workq, next) { + while ((p = SLIST_FIRST(&addrq)) != NULL) { + SLIST_REMOVE_HEAD(&addrq, pfrke_workq); pfr_copyout_addr(&ad, p); q = pfr_lookup_addr(kt, &ad, 1); if (q != NULL) { @@ -1864,8 +1864,7 @@ pfr_setflags_ktables(struct pfr_ktableworkq *workq) { struct pfr_ktable *p, *q; - for (p = SLIST_FIRST(workq); p; p = q) { - q = SLIST_NEXT(p, pfrkt_workq); + SLIST_FOREACH_SAFE(p, workq, pfrkt_workq, q) { pfr_setflags_ktable(p, p->pfrkt_nflags); } } @@ -2015,10 +2014,10 @@ pfr_create_ktable(struct pfr_table *tbl, time_t tzero, int attachruleset) static void pfr_destroy_ktables(struct pfr_ktableworkq *workq, int flushaddr) { - struct pfr_ktable *p, *q; + struct pfr_ktable *p; - for (p = SLIST_FIRST(workq); p; p = q) { - q = SLIST_NEXT(p, pfrkt_workq); + while ((p = SLIST_FIRST(workq)) != NULL) { + SLIST_REMOVE_HEAD(workq, pfrkt_workq); pfr_destroy_ktable(p, flushaddr); } }