From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Tue, 16 Sep 2008 12:30:57 +0000 (+0000)
Subject: Add DUMMYNET_DEBUG option
X-Git-Tag: v2.1.1~379
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/a951f6d4edd856d83d02d2d74261ef01d1ee6f29

Add DUMMYNET_DEBUG option
---

diff --git a/sys/conf/options b/sys/conf/options
index 3d98dcdead..d17be1106f 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,5 +1,5 @@
 # $FreeBSD: src/sys/conf/options,v 1.191.2.53 2003/06/04 17:56:58 sam Exp $
-# $DragonFly: src/sys/conf/options,v 1.93 2008/09/16 12:16:08 sephe Exp $
+# $DragonFly: src/sys/conf/options,v 1.94 2008/09/16 12:30:57 sephe Exp $
 #
 #        On the handling of kernel options
 #
@@ -286,6 +286,7 @@ IPSEC_FILTERGIF		opt_ipsec.h
 FAST_IPSEC		opt_ipsec.h
 IPDIVERT
 DUMMYNET		opt_ipdn.h
+DUMMYNET_DEBUG		opt_ipdn.h
 IPFILTER		opt_ipfilter.h
 IPFILTER_LOG		opt_ipfilter.h
 IPFILTER_DEFAULT_BLOCK	opt_ipfilter.h
diff --git a/sys/config/LINT b/sys/config/LINT
index 157d0945c0..9c5920245b 100644
--- a/sys/config/LINT
+++ b/sys/config/LINT
@@ -3,7 +3,7 @@
 #	as much of the source tree as it can.
 #
 # $FreeBSD: src/sys/i386/conf/LINT,v 1.749.2.144 2003/06/04 17:56:59 sam Exp $
-# $DragonFly: src/sys/config/LINT,v 1.172 2008/09/16 12:16:08 sephe Exp $
+# $DragonFly: src/sys/config/LINT,v 1.173 2008/09/16 12:30:57 sephe Exp $
 #
 # See the kernconf(5) manual page for more information on the format of
 # this file.
@@ -668,6 +668,7 @@ options 	ICMP_BANDLIM
 # IPFIREWALL as well. See the dummynet(4) and ipfw(8) manpages for more info.
 #
 options 	DUMMYNET
+options		DUMMYNET_DEBUG
 
 #
 # ATM (HARP version) options
diff --git a/sys/net/dummynet/Makefile b/sys/net/dummynet/Makefile
index 11c5b34c4f..c418e36089 100644
--- a/sys/net/dummynet/Makefile
+++ b/sys/net/dummynet/Makefile
@@ -1,7 +1,15 @@
 # $FreeBSD: src/sys/modules/dummynet/Makefile,v 1.1.2.2 2003/04/08 10:18:00 maxim Exp $
-# $DragonFly: src/sys/net/dummynet/Makefile,v 1.6 2007/11/16 02:45:45 sephe Exp $
+# $DragonFly: src/sys/net/dummynet/Makefile,v 1.7 2008/09/16 12:30:57 sephe Exp $
 
 KMOD=   dummynet
 SRCS=   ip_dummynet.c
+SRCS+=	opt_ipdn.h
+
+.ifndef BUILDING_WITH_KERNEL
+opt_ipdn.h:
+	echo '#define DUMMYNET 1' > ${.OBJDIR}/${.TARGET}
+	# Debug prints
+	#echo '#define DUMMYNET_DEBUG 1' >> ${.OBJDIR}/${.TARGET}
+.endif
 
 .include <bsd.kmod.mk>
diff --git a/sys/net/dummynet/ip_dummynet.c b/sys/net/dummynet/ip_dummynet.c
index 35648b3cd5..93d91946e4 100644
--- a/sys/net/dummynet/ip_dummynet.c
+++ b/sys/net/dummynet/ip_dummynet.c
@@ -25,14 +25,10 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.24.2.22 2003/05/13 09:31:06 maxim Exp $
- * $DragonFly: src/sys/net/dummynet/ip_dummynet.c,v 1.54 2008/09/16 11:48:01 sephe Exp $
+ * $DragonFly: src/sys/net/dummynet/ip_dummynet.c,v 1.55 2008/09/16 12:30:57 sephe Exp $
  */
 
-#ifdef DUMMYNET_DEBUG
-#define DPRINTF(fmt, ...)	kprintf(fmt, __VA_ARGS__)
-#else
-#define DPRINTF(fmt, ...)	((void)0)
-#endif
+#include "opt_ipdn.h"
 
 /*
  * This module implements IP dummynet, a bandwidth limiter/delay emulator.
@@ -71,6 +67,12 @@
 
 #include <net/dummynet/ip_dummynet.h>
 
+#ifdef DUMMYNET_DEBUG
+#define DPRINTF(fmt, ...)	kprintf(fmt, __VA_ARGS__)
+#else
+#define DPRINTF(fmt, ...)	((void)0)
+#endif
+
 #ifndef DN_CALLOUT_FREQ_MAX
 #define DN_CALLOUT_FREQ_MAX	10000
 #endif