From nobody Fri Sep 18 18:51:17 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 4hmhY66Y8Dz6sr1p for ; Fri, 18 Sep 2026 18:51:22 +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 4hmhY65rqtz4XY1 for ; Fri, 18 Sep 2026 18:51:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789757482; 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=if/fP9lu7CBtp9ffiGREimEUdh0F6ic5KDJqXgRhWiqV5Sm3Kq1MJKq+ybDBstq+RLyrpx Bm3bp+3BSQyz7GIXnGBQwz9Kq1JbpLYR46C7Y5C7cZIDCmOrGd09hZFjspVy6pnwKAJEoQ 0C/AErBPMgqlP+Qz/D1v1QmDUCrNXwjdBpp/RAzI2xCcX4bLD1BT3VrRuJGoBEcD7Ne6SD RPRktJ7shettCYfcn/fZNFFIrwmVCqTu58se26+RVxSwfIvLja/dWfaqUH68MgGUQRiRh5 AyqyPLtenzmBNVnghZrdJDwRB0dY9nQf1hDoNWAOMsH0x0VfxUiQHV9EdYQBOQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789757482; b=F/dN3KIzMSE24q4mLt3KRBMKdoWe4Gxk9V410ZEsJ2VwT0x27Tj4lVVnX353wtxeEEoPOU fvOaeIoTaCp8pvMzDRX4Foji+Rps+/khoivJS0FhmRgmyHDkb6MTzXZ7GOr30HjFKIzQ12 xGcmsiblmAzEYt9AiR7pg9ITsbxff5Oy7G/kjubr6ag/z6zYGMGMbg1FZ6iHK4aJzTssxb V6YD221cU+Q9YK+3Qd50GiWHIQ2rFmqOBgoxbn76Fv00j8XNnL+8FhHG6//y/OHqh0tZA8 2naarx9k3j6Oc1kEsYgPb1ttbesrLjiDy7eQ0kFalBIIRcNv+V/Mt/yv1/OPmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789757482; 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=JdsCxlZulI4ggLjQAfDtyMBjcMapnmf63jN0BknirgX3kiopw/THFY/cLAGh0ARkkithaY y/4obRmau5XkcechRkOjv+GqoORNIbbkTRadJUuYfI1Ftco+RzL1K03s6IZ9YKU9H9VWo8 SWguMmslH9F+aHpyTriVSWlQffevkGMBFuo7CHQ3s0gmxGFoVBDqngAhpxPdZClZLql5If tcU5XA75q0v8pO+rY7gsjDrxH1WtJTTfO1eUKhm3y4/yXf83ysJsZxSwGOINcqruQteXm1 LjIsP9hz7F99pbfjBkiEdv7I+DNgL0x9JLWe1LKalQWsw8hkXEko3d2ixOwoUQ== 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 4hmhY64v7fzWx1 for ; Fri, 18 Sep 2026 18:51:22 +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 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: 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;