From owner-svn-src-user@FreeBSD.ORG Sat Oct 27 10:33:52 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 33964294; Sat, 27 Oct 2012 10:33:52 +0000 (UTC) (envelope-from andre@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F40E98FC0A; Sat, 27 Oct 2012 10:33:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9RAXpYp048881; Sat, 27 Oct 2012 10:33:51 GMT (envelope-from andre@svn.freebsd.org) Received: (from andre@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9RAXpL1048878; Sat, 27 Oct 2012 10:33:51 GMT (envelope-from andre@svn.freebsd.org) Message-Id: <201210271033.q9RAXpL1048878@svn.freebsd.org> From: Andre Oppermann Date: Sat, 27 Oct 2012 10:33:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r242176 - user/andre/tcp_workqueue/sys/net X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Oct 2012 10:33:52 -0000 Author: andre Date: Sat Oct 27 10:33:51 2012 New Revision: 242176 URL: http://svn.freebsd.org/changeset/base/242176 Log: Add hook naming to pfil_add_hook_order() to be able to display a human readable description of a particular hook. Submitted by: eri Modified: user/andre/tcp_workqueue/sys/net/pfil.c user/andre/tcp_workqueue/sys/net/pfil.h Modified: user/andre/tcp_workqueue/sys/net/pfil.c ============================================================================== --- user/andre/tcp_workqueue/sys/net/pfil.c Sat Oct 27 10:14:12 2012 (r242175) +++ user/andre/tcp_workqueue/sys/net/pfil.c Sat Oct 27 10:33:51 2012 (r242176) @@ -246,12 +246,14 @@ pfil_add_hook(int (*func)(void *, struct struct inpcb *), void *arg, int flags, struct pfil_head *ph) { - return (pfil_add_hook_order(func, arg, flags, PFIL_ORDER_DEFAULT, ph)); + return (pfil_add_hook_order(func, arg, "unknown", flags, + PFIL_ORDER_DEFAULT, ph)); } int pfil_add_hook_order(int (*func)(void *, struct mbuf **, struct ifnet *, int, - struct inpcb *), void *arg, int flags, uint8_t order, struct pfil_head *ph) + struct inpcb *), void *arg, char *name, int flags, uint8_t order, + struct pfil_head *ph) { struct packet_filter_hook *pfh1 = NULL; struct packet_filter_hook *pfh2 = NULL; @@ -268,6 +270,7 @@ pfil_add_hook_order(int (*func)(void *, pfh1->pfil_arg = arg; pfh1->pfil_cookie = (int)random(); pfh1->pfil_order = order; + pfh1->pfil_name = name; } if (flags & PFIL_OUT) { pfh2 = (struct packet_filter_hook *)malloc(sizeof(*pfh1), @@ -280,6 +283,7 @@ pfil_add_hook_order(int (*func)(void *, pfh2->pfil_arg = arg; pfh2->pfil_cookie = (int)random(); pfh2->pfil_order = order; + pfh2->pfil_name = name; } PFIL_WLOCK(ph); if (flags & PFIL_IN) { Modified: user/andre/tcp_workqueue/sys/net/pfil.h ============================================================================== --- user/andre/tcp_workqueue/sys/net/pfil.h Sat Oct 27 10:14:12 2012 (r242175) +++ user/andre/tcp_workqueue/sys/net/pfil.h Sat Oct 27 10:33:51 2012 (r242176) @@ -57,6 +57,7 @@ struct packet_filter_hook { void *pfil_arg; int pfil_cookie; uint8_t pfil_order; + char *pfil_name; }; #define PFIL_ORDER_FIRST 0 @@ -99,7 +100,8 @@ struct pfil_head { int pfil_add_hook(int (*func)(void *, struct mbuf **, struct ifnet *, int, struct inpcb *), void *, int, struct pfil_head *); int pfil_add_hook_order(int (*func)(void *, struct mbuf **, struct ifnet *, - int, struct inpcb *), void *, int, uint8_t, struct pfil_head *); + int, struct inpcb *), void *, char *, int, uint8_t, + struct pfil_head *); int pfil_get_cookie(int (*func)(void *, struct mbuf **, struct ifnet *, int, struct inpcb *), void *, int, struct pfil_head *); int pfil_remove_hook(int (*func)(void *, struct mbuf **, struct ifnet *,