From owner-svn-src-user@FreeBSD.ORG  Fri Jan 22 23:40:48 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 29B58106566B;
	Fri, 22 Jan 2010 23:40:48 +0000 (UTC)
	(envelope-from luigi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 002BD8FC15;
	Fri, 22 Jan 2010 23:40:47 +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 o0MNelP5026414;
	Fri, 22 Jan 2010 23:40:47 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0MNelHV026409;
	Fri, 22 Jan 2010 23:40:47 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201001222340.o0MNelHV026409@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Fri, 22 Jan 2010 23:40:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202846 - user/luigi/ipfw3-head/sys/netinet/ipfw
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Jan 2010 23:40:48 -0000

Author: luigi
Date: Fri Jan 22 23:40:47 2010
New Revision: 202846
URL: http://svn.freebsd.org/changeset/base/202846

Log:
  some tweaks to ease testing in user space

Modified:
  user/luigi/ipfw3-head/sys/netinet/ipfw/dn_test.h
  user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dn_private.h
  user/luigi/ipfw3-head/sys/netinet/ipfw/test_dn_heap.c
  user/luigi/ipfw3-head/sys/netinet/ipfw/test_dn_sched.c

Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_test.h
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/dn_test.h	Fri Jan 22 23:35:06 2010	(r202845)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/dn_test.h	Fri Jan 22 23:40:47 2010	(r202846)
@@ -6,6 +6,7 @@
 #define _DN_TEST_H
 #include <stdio.h>
 #include <stdlib.h>
+#include <strings.h>	/* bzero */
 #include <inttypes.h>
 #include <sys/queue.h>
 #include <sys/time.h>

Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dn_private.h
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dn_private.h	Fri Jan 22 23:35:06 2010	(r202845)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dn_private.h	Fri Jan 22 23:40:47 2010	(r202846)
@@ -125,6 +125,7 @@ struct dn_parms {
 	int	busy;
 	struct	mq	pending;
 
+#ifdef _KERNEL
 	/* uh_mtx arbitrates between system calls and also
 	 * protects fshash, schedhash and fsunlinked.
 	 * These structures are readonly for the lower half.
@@ -134,6 +135,7 @@ struct dn_parms {
 	 * modified upon packet arrivals
 	 */
 	struct mtx bh_mtx;
+#endif /* _KERNEL */
 };
 
 /*

Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/test_dn_heap.c
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/test_dn_heap.c	Fri Jan 22 23:35:06 2010	(r202845)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/test_dn_heap.c	Fri Jan 22 23:40:47 2010	(r202846)
@@ -46,7 +46,7 @@ struct x {
 	char buf[0];
 };
 
-int hf(uintptr_t key, int flags, void *arg)
+uint32_t hf(uintptr_t key, int flags, void *arg)
 {
 	return (flags & DNHT_KEY_IS_OBJ) ?
 		((struct x *)key)->buf[0] : *(char *)key;

Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/test_dn_sched.c
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/test_dn_sched.c	Fri Jan 22 23:35:06 2010	(r202845)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/test_dn_sched.c	Fri Jan 22 23:40:47 2010	(r202846)
@@ -98,10 +98,11 @@ drop:
         FREE_PKT(m);
         return 1;
 }
-
+#ifndef NO_MAIN
 int
 main(int argc, char *argv[])
 {
 	printf("test code for the schedulers\n");
 	return 0;
 }
+#endif