From nobody Wed Jul 12 13:26:29 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 4R1JRV1zCdz2tnBs; Wed, 12 Jul 2023 13:26:30 +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 4R1JRV1Yjzz3CwY; Wed, 12 Jul 2023 13:26:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689168390; 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=1saFzAc1TrD+bchIkrUdo7jqc1nmNL4JFi5YT5tkKa8=; b=eyVX2/eYZjuD+M+9E5pxly9tEUvV6eMYy9w+DJrsPsChJcJyW9+xE3t0JcYaG3gGK0ROFu HztuW9KD4tXZ8Mff2L0gfri0JNQhGTdsHz1xO5NlOBKiWtcMWJCalwE8v+x62vpBU0UX6m Zfs0QE9G8PDtERowEH72T4MHPL9pQbyyAAhq5XD1CPKdZHK1ia8d7W1pCd95LB9jcjW3Ce RQXKK1HHfguT7VYUGV4faVrlIGrsgx5TgTZ2y2/8e783q3nYXUcb8mb75ot9mzeylM5X1s TQY+nmAN+PPCMiSTveDs3/YOP+zEzEq0HkKCv/F2ldI01jV4Oxn8jpNjxqHWyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689168390; 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=1saFzAc1TrD+bchIkrUdo7jqc1nmNL4JFi5YT5tkKa8=; b=ClcB8QZRxluqS6qPzlGjBTRaoqLl5Z75KKtNEPxECzCCXsvSx/BgX3FtnVgMCttzUk+E8u wdFIYbd2DA0BoYhMQO4pTJ0MRmNlLJ5ruM0e5LODpT5EzO4cEGoOZbFktsD6sgtlWRsSKW /srRLLLT9oaz6GFC84+xNx2zJUOpdoWDo0ZgXX4wydEn9j8ae0HVxIhhE8S4vJj9Timw/E Ci10aLTqNyOVUt0GCoJZAEYOnwVKj7NDnx3gxqQXSSutBMgrxH2SjY2wU9RA3rCzkCjmvQ UrVs/hxFuy/d8zH7zjRXRvkeyueUWWHIMi+jPFcVdqodXrg9Ui5vFQzQTGrv/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689168390; a=rsa-sha256; cv=none; b=RXBrqrDZi9XcwKnvelh2euYB+xvMR7YZvbwaXPe+rxRQbqLfFNgIJyZ9r/hp2h+RpYX98j QTKFRJFSs1tLf5flHIu9xGzfaTuzI048sEgsQubSXCpmHURxXC69kP+Exv22zPbLpPwGcB AlZ0FSCknDpHFEtf3C4AU1Mn3cdy78brdHuDjFohL1kXZj7D+V/QNWtUkGb6oOX5XIUIeS ysWS7J83V7nbLKYt7JuAUzJCnHH+8Q7ZKIPMS/QiRWCOcKeYzhcmgESW6M68wZoCC0VB1u bw4vH8/ulVXc+qbzyo3dFTFbp/dtXT5OUOaomXKaX4iwPxXJb/jvetYnzurvJQ== 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 4R1JRV0YmQz19QR; Wed, 12 Jul 2023 13:26:30 +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 36CDQTLZ027843; Wed, 12 Jul 2023 13:26:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36CDQTfT027842; Wed, 12 Jul 2023 13:26:29 GMT (envelope-from git) Date: Wed, 12 Jul 2023 13:26:29 GMT Message-Id: <202307121326.36CDQTfT027842@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: 64b30b7aeb6d - main - 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/main X-Git-Reftype: branch X-Git-Commit: 64b30b7aeb6d0dc48d038b3df033328c8d8c3141 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=64b30b7aeb6d0dc48d038b3df033328c8d8c3141 commit 64b30b7aeb6d0dc48d038b3df033328c8d8c3141 Author: Kristof Provost AuthorDate: 2023-07-12 09:43:43 +0000 Commit: Kristof Provost CommitDate: 2023-07-12 09:43:43 +0000 pf: fix pfi_kif definition in the man page PR: 272455 Submitted by: alex@inferiorhumanorgans.com MFC after: 1 week --- 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