svn commit: r202848 - user/luigi/ipfw3-head/sys/netinet/ipfw

[Luigi Rizzo]

Author: luigi
Date: Fri Jan 22 23:56:46 2010
New Revision: 202848
URL: http://svn.freebsd.org/changeset/base/202848

Log:
  more support for userland testing

Modified:
  user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_rr.c
  user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_wf2q.c
  user/luigi/ipfw3-head/sys/netinet/ipfw/dn_test.h

Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_rr.c
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_rr.c	Fri Jan 22 23:50:46 2010	(r202847)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_rr.c	Fri Jan 22 23:56:46 2010	(r202848)
@@ -24,6 +24,7 @@
  * SUCH DAMAGE.
  */
 
+#ifdef _KERNEL
 #include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
@@ -34,6 +35,9 @@
 #include <netinet/in.h>
 #include <netinet/ip_var.h>		/* ipfw_rule_ref */
 #include <netinet/ip_fw.h>	/* flow_id */
+#else
+#include <netinet/ipfw/dn_test.h>
+#endif
 #include <netinet/ip_dummynet.h>
 #include <netinet/ipfw/dn_heap.h>
 #include <netinet/ipfw/ip_dn_private.h>

Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_wf2q.c
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_wf2q.c	Fri Jan 22 23:50:46 2010	(r202847)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/dn_sched_wf2q.c	Fri Jan 22 23:56:46 2010	(r202848)
@@ -25,6 +25,7 @@
  * SUCH DAMAGE.
  */
 
+#ifdef _KERNEL
 #include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
@@ -35,6 +36,9 @@
 #include <netinet/in.h>
 #include <netinet/ip_var.h>		/* ipfw_rule_ref */
 #include <netinet/ip_fw.h>	/* flow_id */
+#else
+#include <netinet/ipfw/dn_test.h>
+#endif
 #include <netinet/ip_dummynet.h>
 #include <netinet/ipfw/dn_heap.h>
 #include <netinet/ipfw/ip_dn_private.h>

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:50:46 2010	(r202847)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/dn_test.h	Fri Jan 22 23:56:46 2010	(r202848)
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <strings.h>	/* bzero */
+#include <errno.h>
 #include <inttypes.h>
 #include <sys/queue.h>
 #include <sys/time.h>