From nobody Fri Sep 18 18:51:17 2026 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 4hmhY15K0nz6sr65 for ; Fri, 18 Sep 2026 18:51: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 4hmhY14njLz4XXH for ; Fri, 18 Sep 2026 18:51:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789757477; 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=ncYYry6bfuNUCmcGk2RWdLyursVxHjlRmG0MbDfb9Ac=; b=R4lYkcY5wEFFxZe1VgWxu0QAryt4u6YrYjoFDnRHUEnlbvItyo/I626+4R7oTYPNaZeAK+ aNV837gurSYoYGSdgp8GmnadanMoeetkid7d7ppSN5HRwGFit/qmXivUioNDqgP7YJi4IX Wu7bGi+moSbiMDhcFqmGcaemTq0Az2fjaSgbFvz5l6D8KBhMUGM41VyFT56gqtrwoAEFbT VjXsPjx0RC3iXr2+2Q9tRoeLw9rGwpC4ePSG71TmKW0GhztbVoKifA9vKYL+dmxTxLD8pT G2aQpDd/KnjgKnK55THrDDad9MSUXFYvkgIHHlW9iZ4Q5UPa29w5krSXqYHY3w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789757477; b=VYbvSxqQd6BbRhVOHLXYFppvGO5THNoxLst56cva71fC2k+QRGMc5jqLKqkfUjntLzQJNK jmMS4PQsdJMk0cXhAW9RqqvVWWxA0DCsgX0k8mwTvh2nDvzVDgeE7jRvJNDqIo0eG/oIlS evS02Eo4egrkki3wOYgl4IeZaHEkPtCU2PxBlsa/YOLnabCh0ZCnCwHlK5KT9i74RofGap 0/vjV/EfmVfhy7Jtl7goStF9gjuqX8SvseagxRP7BvL4UPyfK61r1AdiBbuM7c1FU7Cetx PpA/pl5LzQ7F/ZhbmjuiZk6TNQ9Dn9xeD7xmXSl/pZrTQnLCiye93KR4jQaq1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789757477; 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=ncYYry6bfuNUCmcGk2RWdLyursVxHjlRmG0MbDfb9Ac=; b=mHyf5Sc8f5HGQn5YMrsEf0wLV2/ec6+bjHRESEucHxbTfkWgi0Juf0WlY2Fa7WyqpjUQO9 sI/rfYA1En/6DMptAv+VSLDchX79f/QPHwX2e0TtbAL3U5p++LkMXERh0NNOd/adFGxk2J YE9boKVcnlhdQybgqXx0LujMlcc81+qY0C1IbD4V/dMdDwY4Q6lEEMPQVfqUvCwWHgRPwk z4qQioOS1cSsoxnAtXplLBL8po20llNz4/OOopAv2JTE8sdr77q1T1lhApBRIZ54wB2yE5 La78Ow9X7yn1zwKFSZ1yuxZFWLng7jOiyq+5DSy6opvVvPYBT5bLcP9wjaxlZA== 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 4hmhY13rCFzX2m for ; Fri, 18 Sep 2026 18:51:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39830 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 18 Sep 2026 18:51:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 73ce582a20e0 - main - pf: table_addr_parser parses to struct nl_parsed_table_addrs 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 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73ce582a20e0f41414839ebf02cd347f899856a7 Auto-Submitted: auto-generated Date: Fri, 18 Sep 2026 18:51:17 +0000 Message-Id: <6aad8825.39830.6861eeb4@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=73ce582a20e0f41414839ebf02cd347f899856a7 commit 73ce582a20e0f41414839ebf02cd347f899856a7 Author: Kristof Provost AuthorDate: 2026-09-18 18:49:57 +0000 Commit: Kristof Provost CommitDate: 2026-09-18 18:51:04 +0000 pf: table_addr_parser parses to struct nl_parsed_table_addrs Not to struct pfioc_table. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_nl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index 200f1dfca81a..ef047da9965b 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -2324,7 +2324,7 @@ nlattr_add_pfr_addr(struct nl_writer *nw, int attr, const struct pfr_addr *a) static int pf_handle_table_get_addrs(struct nlmsghdr *hdr, struct nl_pstate *npt) { - struct pfioc_table attrs = { 0 }; + struct nl_parsed_table_addrs attrs = { 0 }; struct pfr_addr *pfras; struct nl_writer *nw = npt->nw; struct genlmsghdr *ghdr_new; @@ -2339,8 +2339,8 @@ pf_handle_table_get_addrs(struct nlmsghdr *hdr, struct nl_pstate *npt) PF_RULES_RLOCK(); /* Get required size. */ - error = pfr_get_addrs(&attrs.pfrio_table, NULL, - &size, attrs.pfrio_flags | PFR_FLAG_USERIOCTL); + error = pfr_get_addrs(&attrs.table, NULL, + &size, attrs.flags | PFR_FLAG_USERIOCTL); if (error != 0) { PF_RULES_RUNLOCK(); return (error); @@ -2352,8 +2352,8 @@ pf_handle_table_get_addrs(struct nlmsghdr *hdr, struct nl_pstate *npt) return (ENOMEM); } /* Now get the addresses. */ - error = pfr_get_addrs(&attrs.pfrio_table, pfras, - &size, attrs.pfrio_flags | PFR_FLAG_USERIOCTL); + error = pfr_get_addrs(&attrs.table, pfras, + &size, attrs.flags | PFR_FLAG_USERIOCTL); PF_RULES_RUNLOCK(); if (error != 0) goto out;