From owner-svn-src-projects@FreeBSD.ORG  Fri Oct  8 15:59:02 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6A2D6106566B;
	Fri,  8 Oct 2010 15:59:02 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5B9258FC15;
	Fri,  8 Oct 2010 15:59:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o98Fx2Yo098894;
	Fri, 8 Oct 2010 15:59:02 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o98Fx22F098892;
	Fri, 8 Oct 2010 15:59:02 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201010081559.o98Fx22F098892@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Fri, 8 Oct 2010 15:59:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213583 - projects/sv/sys/netinet
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Oct 2010 15:59:02 -0000

Author: attilio
Date: Fri Oct  8 15:59:02 2010
New Revision: 213583
URL: http://svn.freebsd.org/changeset/base/213583

Log:
  - Lock properly ifnet list for scanning
  - virtualize the ifnet list

Modified:
  projects/sv/sys/netinet/netdump_client.c

Modified: projects/sv/sys/netinet/netdump_client.c
==============================================================================
--- projects/sv/sys/netinet/netdump_client.c	Fri Oct  8 15:20:20 2010	(r213582)
+++ projects/sv/sys/netinet/netdump_client.c	Fri Oct  8 15:59:02 2010	(r213583)
@@ -254,9 +254,11 @@ sysctl_nic(SYSCTL_HANDLER_ARGS)
 		if (!strcmp(buf, "none")) {
 			ifn = NULL;
 		} else {
-			if ((ifn = TAILQ_FIRST(&ifnet)) != NULL) do {
+			IFNET_RLOCK_NOSLEEP();
+			if ((ifn = TAILQ_FIRST(&V_ifnet)) != NULL) do {
 				if (!strcmp(ifn->if_xname, buf)) break;
 			} while ((ifn = TAILQ_NEXT(ifn, if_link)) != NULL);
+			IFNET_RUNLOCK_NOSLEEP();
 
 			if (!ifn) return ENODEV;
 			if (!netdump_supported_nic(ifn)) return EINVAL;
@@ -1289,12 +1291,14 @@ netdump_config_defaults()
 		inet_aton(nd_gw_tun, &nd_gw);
 	if (nd_nic_tun[0] != '\0') {
 		found = 0;
-		TAILQ_FOREACH(ifn, &ifnet, if_link) {
+		IFNET_RLOCK_NOSLEEP();
+		TAILQ_FOREACH(ifn, &V_ifnet, if_link) {
 			if (!strcmp(ifn->if_xname, nd_nic_tun)) {
 				found = 1;
 				break;
 			}
 		}
+		IFNET_RUNLOCK_NOSLEEP();
 		if (found != 0 && netdump_supported_nic(ifn))
 			nd_nic = ifn;
 	}