From owner-svn-src-head@FreeBSD.ORG  Mon May 18 17:18:40 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EAFB1106566B;
	Mon, 18 May 2009 17:18:40 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D98228FC18;
	Mon, 18 May 2009 17:18:40 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4IHIe2q068632;
	Mon, 18 May 2009 17:18:40 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4IHIeFN068630;
	Mon, 18 May 2009 17:18:40 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200905181718.n4IHIeFN068630@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Mon, 18 May 2009 17:18:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192313 - in head/sys: net sys
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 May 2009 17:18:41 -0000

Author: sam
Date: Mon May 18 17:18:40 2009
New Revision: 192313
URL: http://svn.freebsd.org/changeset/base/192313

Log:
  add bpf_track eventhandler for monitoring bpf taps attached/detached
  
  Reviewed by:	csjp

Modified:
  head/sys/net/bpf.c
  head/sys/sys/eventhandler.h

Modified: head/sys/net/bpf.c
==============================================================================
--- head/sys/net/bpf.c	Mon May 18 17:14:48 2009	(r192312)
+++ head/sys/net/bpf.c	Mon May 18 17:18:40 2009	(r192313)
@@ -534,6 +534,8 @@ bpf_attachd(struct bpf_d *d, struct bpf_
 
 	bpf_bpfd_cnt++;
 	BPFIF_UNLOCK(bp);
+
+	EVENTHANDLER_INVOKE(bpf_track, bp->bif_ifp, 1);
 }
 
 /*
@@ -561,6 +563,8 @@ bpf_detachd(struct bpf_d *d)
 	BPFD_UNLOCK(d);
 	BPFIF_UNLOCK(bp);
 
+	EVENTHANDLER_INVOKE(bpf_track, ifp, 0);
+
 	/*
 	 * Check if this descriptor had requested promiscuous mode.
 	 * If so, turn it off.

Modified: head/sys/sys/eventhandler.h
==============================================================================
--- head/sys/sys/eventhandler.h	Mon May 18 17:14:48 2009	(r192312)
+++ head/sys/sys/eventhandler.h	Mon May 18 17:18:40 2009	(r192313)
@@ -182,6 +182,11 @@ typedef void (*vlan_unconfig_fn)(void *,
 EVENTHANDLER_DECLARE(vlan_config, vlan_config_fn);
 EVENTHANDLER_DECLARE(vlan_unconfig, vlan_unconfig_fn);
 
+/* BPF attach/detach events */
+struct ifnet;
+typedef void (*bpf_track_fn)(void *, struct ifnet *, int /* 1 =>'s attach */);
+EVENTHANDLER_DECLARE(bpf_track, bpf_track_fn);
+
 /*
  * Process events
  * process_fork and exit handlers are called without Giant.