From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Sun, 16 Nov 2014 07:56:01 +0000 (+0800)
Subject: build: Add ICMPPRINTFS as global option
X-Git-Tag: v4.2.0rc~1476
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/6bedbebcc21117c09820a060ca6426035a7f43c1?ds=sidebyside

build: Add ICMPPRINTFS as global option
---

diff --git a/sys/conf/options b/sys/conf/options
index 171e237313..859dd221fd 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -297,6 +297,7 @@ SLIP_IFF_OPTS		opt_slip.h
 TCPDEBUG
 TCP_SIGNATURE		opt_inet.h
 TCP_DROP_SYNFIN		opt_tcp_input.h
+ICMPPRINTFS
 
 XBONEHACK
 MBUF_STRESS_TEST	opt_mbuf_stress_test.h
diff --git a/sys/config/LINT64 b/sys/config/LINT64
index 7c466a3903..d4a05af3d5 100644
--- a/sys/config/LINT64
+++ b/sys/config/LINT64
@@ -410,6 +410,8 @@ pseudo-device	stf			#6to4 IPv6 over IPv4 encapsulation
 #
 # TCPDEBUG is undocumented.
 #
+# ICMPPRINTFS enables ICMP to do extra debug prints.
+#
 options 	MROUTING		# Multicast routing
 options 	PIM			# Protocol Independent Multicast
 options 	IPFIREWALL		#firewall
@@ -424,6 +426,7 @@ options 	IPV6FIREWALL_DEFAULT_TO_ACCEPT
 options 	IPDIVERT		#divert sockets
 options 	IPSTEALTH		#support for stealth forwarding
 options 	TCPDEBUG
+options		ICMPPRINTFS
 
 device		pf
 device		pflog
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index 3b3b878649..b2916e80b5 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -135,7 +135,9 @@ SYSCTL_INT(_net_inet_icmp, OID_AUTO, reply_from_interface, CTLFLAG_RW,
 	"non-local packets");
 
 #ifdef ICMPPRINTFS
-int	icmpprintfs = 0;
+static int	icmpprintfs = 0;
+SYSCTL_INT(_net_inet_icmp, OID_AUTO, debug_prints, CTLFLAG_RW,
+	&icmpprintfs, 0, "extra ICMP debug prints");
 #endif
 
 static void	icmp_reflect (struct mbuf *);