From nobody Wed Jul 19 07:27:41 2023 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 4R5S8G1l6Sz4dPm7; Wed, 19 Jul 2023 07:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R5S8G0KfVz3JFk; Wed, 19 Jul 2023 07:27:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689751662; 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=rYbKQiDCW964VtqCIUjPBk+WNUuQ2ski8S+ZCVbU6fU=; b=g9WtfFauLhHJZEPOT59yrKF1L0tws0CcLGqiRO4HI4cxPwYyr5GoOJ9+o4vDFARar6CV/b s83CKkn9LNfbc7UcEYAtd5uceEv3RdfeCPdY0A2CEBbwLwDBJ9LPT9u//Kmv6KA3hijlAT ueApcnQVxtAUSRv9gE1xL+bhYxpoUXLQT6Hpqz0JFe61J3LItmMbCDMAcyfUKxxoQKAbIl uuSZPEI6JZgXOvl8gb1CDHpDhDQtMIQgv+aMFYwOM3YzLyf/dUpXIPROhay/g5S7j0uH/P r7AwVil+/H1vm+1H01cRnSkQJYkvfKkIqEjsWOm9cJ27Hl81tA66swmFyZdcFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689751662; 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=rYbKQiDCW964VtqCIUjPBk+WNUuQ2ski8S+ZCVbU6fU=; b=koikn/42mFEMQghj4Ld1yKuNdBHuFCwwUiN73eOEddttRuQT4gODfgtod+2FV8KQ5pJo9i +vqhzQ795II1h/YwL0yE7CPHbzHl0O4rdTEa68hKgCX7w/MPIbaVhgjK0KLvqUm6mmIWeg fgyUhlj9RmtlY/h97CBdQQCgaJsKl85Db+xpoWZmD/flQ4TbNxYlj2DTrZbvu5dEYVqMJ8 r2Al7LclXVvEX8ULdviU+U//G+I0l0zkU3lb7FScpQFUl5Sq3FdGAh3dVESNDdcWGbIndH ixWNWUq0gHgtHLYeKRUMcMTcrpHEZt2tT83xhDEfC02W5ZUShi+XbVeK78NI2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689751662; a=rsa-sha256; cv=none; b=wSzbvE4ebpWLnpti9geSZlhtdjHM8BEcjUxvJyNobB/ul0VJCcvscfZPaahwRM8K5LR8hS qFL6jJTdJZMfdO146G3R6vagYESOd1Vx34lFw3pFAcjRr+i9JPZ3ZxLitvsKADrmTi1SfR mdRUmJgsR29yV8p3FaxlEgekw29eMN/6MyIKhUw1lM8mqReCHXi+wZkbvXhRH/NQwtfSr5 SLuE57k8CoZjKfYdSAHsEFHC27B8XWKWNhNOc+q/Zn5Y5rGnrggCbBy52SJ0oGeIuMAq/k h+DTbTDcjgAJ0qc8WGy+ko/yd/tNcy4AX5V2Wom7YNHBaYL8hqyvI4jAbiIt5A== 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 4R5S8F6VRgzdxq; Wed, 19 Jul 2023 07:27:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36J7RfjG020834; Wed, 19 Jul 2023 07:27:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36J7RfLR020833; Wed, 19 Jul 2023 07:27:41 GMT (envelope-from git) Date: Wed, 19 Jul 2023 07:27:41 GMT Message-Id: <202307190727.36J7RfLR020833@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: e14a1e002991 - stable/12 - pf: fix pfi_kif definition in the man page 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/12 X-Git-Reftype: branch X-Git-Commit: e14a1e0029916cc99787ad93fe22dfe304c9d56a Auto-Submitted: auto-generated The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e14a1e0029916cc99787ad93fe22dfe304c9d56a commit e14a1e0029916cc99787ad93fe22dfe304c9d56a Author: Kristof Provost AuthorDate: 2023-07-12 09:43:43 +0000 Commit: Kristof Provost CommitDate: 2023-07-19 07:26:55 +0000 pf: fix pfi_kif definition in the man page PR: 272455 Submitted by: alex@inferiorhumanorgans.com MFC after: 1 week (cherry picked from commit 64b30b7aeb6d0dc48d038b3df033328c8d8c3141) --- share/man/man4/pf.4 | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/share/man/man4/pf.4 b/share/man/man4/pf.4 index 133e4d300043..8f25b7c7aebd 100644 --- a/share/man/man4/pf.4 +++ b/share/man/man4/pf.4 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 7, 2021 +.Dd July 12, 2023 .Dt PF 4 .Os .Sh NAME @@ -1094,20 +1094,18 @@ The data is returned in the structure described below: .Bd -literal struct pfi_kif { - RB_ENTRY(pfi_kif) pfik_tree; char pfik_name[IFNAMSIZ]; + union { + RB_ENTRY(pfi_kif) pfik_tree; + LIST_ENTRY(pfi_kif) pfik_list; + }; u_int64_t pfik_packets[2][2][2]; u_int64_t pfik_bytes[2][2][2]; u_int32_t pfik_tzero; - int pfik_flags; - struct pf_state_tree_lan_ext pfik_lan_ext; - struct pf_state_tree_ext_gwy pfik_ext_gwy; - TAILQ_ENTRY(pfi_kif) pfik_w_states; - void *pfik_ah_cookie; + u_int pfik_flags; struct ifnet *pfik_ifp; struct ifg_group *pfik_group; - int pfik_states; - int pfik_rules; + u_int pfik_rulerefs; TAILQ_HEAD(, pfi_dynaddr) pfik_dynaddrs; }; .Ed