From owner-freebsd-bugs@FreeBSD.ORG Sun Jul 17 15:40:09 2011 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7446D1065678 for ; Sun, 17 Jul 2011 15:40:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 33B158FC0C for ; Sun, 17 Jul 2011 15:40:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p6HFe9d7007083 for ; Sun, 17 Jul 2011 15:40:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p6HFe9kX007082; Sun, 17 Jul 2011 15:40:09 GMT (envelope-from gnats) Resent-Date: Sun, 17 Jul 2011 15:40:09 GMT Resent-Message-Id: <201107171540.p6HFe9kX007082@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Olli Hauer Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A492E106564A; Sun, 17 Jul 2011 15:31:51 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from p578be941.dip0.t-ipconnect.de (p578be941.dip0.t-ipconnect.de [87.139.233.65]) by mx1.freebsd.org (Postfix) with ESMTP id 674318FC08; Sun, 17 Jul 2011 15:31:51 +0000 (UTC) Received: by p578be941.dip0.t-ipconnect.de (Postfix, from userid 1100) id 31DC920547; Sun, 17 Jul 2011 17:31:48 +0200 (CEST) Message-Id: <20110717153148.31DC920547@p578be941.dip0.t-ipconnect.de> Date: Sun, 17 Jul 2011 17:31:48 +0200 (CEST) From: Olli Hauer To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: "Bjoern A. Zeeb" Subject: kern/158997: [patch] pf in head, pfioc_state_kill in pf(4) does not reflect pfioc_state_kill in sys/pf/net/pfvar.h X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Olli Hauer List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Jul 2011 15:40:09 -0000 >Number: 158997 >Category: kern >Synopsis: [patch] pf in head, pfioc_state_kill in pf(4) does not reflect pfioc_state_kill in sys/pf/net/pfvar.h >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Jul 17 15:40:08 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Olli Hauer >Release: >Organization: >Environment: >Description: The pfioc_state_kill in pf(4) does not reflect pfioc_state_kill in sys/pf/net/pfvar.h Documentation was also wrong in OpenBSD45. I send a correction request already to the freebsd-pf@ list a view weeks ago, but the following patch is more accurate. http://lists.freebsd.org/pipermail/freebsd-pf/2011-June/006193.html It will be nice if this trival fix can be included even code freeze is in place. >How-To-Repeat: compair pfioc_state_kill in contrib/man/pf.4 and sys/pf/net/pfvar.h >Fix: patch against head in svn. --- pf_head.diff begins here --- Index: head/contrib/pf/man/pf.4 =================================================================== --- head/contrib/pf/man/pf.4 (revision 224128) +++ head/contrib/pf/man/pf.4 (working copy) @@ -308,14 +308,17 @@ .It Dv DIOCKILLSTATES Fa "struct pfioc_state_kill *psk" Remove matching entries from the state table. This ioctl returns the number of killed states in -.Va psk_af . +.Va psk_killed . .Bd -literal struct pfioc_state_kill { + struct pf_state_cmp psk_pfcmp; sa_family_t psk_af; int psk_proto; struct pf_rule_addr psk_src; struct pf_rule_addr psk_dst; char psk_ifname[IFNAMSIZ]; + char psk_label[PF_RULE_LABEL_SIZE]; + u_int psk_killed; }; .Ed .It Dv DIOCCLRSTATES Fa "struct pfioc_state_kill *psk" --- pf_head.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: