X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/5c9f46613a83ebfc29a5b1f099448259e96a98f0..c3c9b80d004dbbfdf763edeb97968c6997e3b45b:/bsd/netinet6/in6_proto.c

diff --git a/bsd/netinet6/in6_proto.c b/bsd/netinet6/in6_proto.c
index e71714e69..f64ee80af 100644
--- a/bsd/netinet6/in6_proto.c
+++ b/bsd/netinet6/in6_proto.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2015 Apple Inc. All rights reserved.
+ * Copyright (c) 2008-2020 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
@@ -104,6 +104,7 @@
 #include <net/if.h>
 #include <net/radix.h>
 #include <net/route.h>
+#include <net/nat464_utils.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
@@ -129,23 +130,13 @@
 
 #if IPSEC
 #include <netinet6/ipsec.h>
-#if INET6
 #include <netinet6/ipsec6.h>
-#endif
 #include <netinet6/ah.h>
-#if INET6
 #include <netinet6/ah6.h>
-#endif
 #if IPSEC_ESP
 #include <netinet6/esp.h>
-#if INET6
 #include <netinet6/esp6.h>
 #endif
-#endif
-#include <netinet6/ipcomp.h>
-#if INET6
-#include <netinet6/ipcomp6.h>
-#endif
 #endif /*IPSEC*/
 
 #include <netinet6/ip6protosw.h>
@@ -167,180 +158,189 @@ static int rip6_pr_output(struct mbuf *, struct socket *,
     struct sockaddr_in6 *, struct mbuf *);
 
 struct ip6protosw inet6sw[] = {
-{
-	.pr_type =		0,
-	.pr_protocol =		IPPROTO_IPV6,
-	.pr_init =		ip6_init,
-	.pr_drain =		ip6_drain,
-	.pr_usrreqs =		&nousrreqs,
-},
-{
-	.pr_type =		SOCK_DGRAM,
-	.pr_protocol =		IPPROTO_UDP,
-	.pr_flags =		PR_ATOMIC|PR_ADDR|PR_PROTOLOCK|PR_PCBLOCK|
-				PR_EVCONNINFO|PR_PRECONN_WRITE,
-	.pr_input =		udp6_input,
-	.pr_ctlinput =		udp6_ctlinput,
-	.pr_ctloutput =		ip6_ctloutput,
-#if !INET	/* don't call initialization twice */
-	.pr_init =		udp_init,
+	{
+		.pr_type =              0,
+		.pr_protocol =          IPPROTO_IPV6,
+		.pr_init =              ip6_init,
+		.pr_drain =             ip6_drain,
+		.pr_usrreqs =           &nousrreqs,
+	},
+	{
+		.pr_type =              SOCK_DGRAM,
+		.pr_protocol =          IPPROTO_UDP,
+		.pr_flags =             PR_ATOMIC | PR_ADDR | PR_PROTOLOCK | PR_PCBLOCK |
+    PR_EVCONNINFO | PR_PRECONN_WRITE,
+		.pr_input =             udp6_input,
+		.pr_ctlinput =          udp6_ctlinput,
+		.pr_ctloutput =         ip6_ctloutput,
+#if !INET       /* don't call initialization twice */
+		.pr_init =              udp_init,
 #endif /* !INET */
-	.pr_usrreqs =		&udp6_usrreqs,
-	.pr_lock =		udp_lock,
-	.pr_unlock =		udp_unlock,
-	.pr_getlock =		udp_getlock,
-},
-{
-	.pr_type =		SOCK_STREAM,
-	.pr_protocol =		IPPROTO_TCP,
-	.pr_flags =		PR_CONNREQUIRED|PR_WANTRCVD|PR_PCBLOCK|
-				PR_PROTOLOCK|PR_DISPOSE|PR_EVCONNINFO|
-				PR_PRECONN_WRITE|PR_DATA_IDEMPOTENT,
-	.pr_input =		tcp6_input,
-	.pr_ctlinput =		tcp6_ctlinput,
-	.pr_ctloutput =		tcp_ctloutput,
-#if !INET	/* don't call initialization and timeout routines twice */
-	.pr_init =		tcp_init,
+		.pr_usrreqs =           &udp6_usrreqs,
+		.pr_lock =              udp_lock,
+		.pr_unlock =            udp_unlock,
+		.pr_getlock =           udp_getlock,
+		.pr_update_last_owner = inp_update_last_owner,
+		.pr_copy_last_owner =   inp_copy_last_owner,
+	},
+	{
+		.pr_type =              SOCK_STREAM,
+		.pr_protocol =          IPPROTO_TCP,
+		.pr_flags =             PR_CONNREQUIRED | PR_WANTRCVD | PR_PCBLOCK |
+    PR_PROTOLOCK | PR_DISPOSE | PR_EVCONNINFO |
+    PR_PRECONN_WRITE | PR_DATA_IDEMPOTENT,
+		.pr_input =             tcp6_input,
+		.pr_ctlinput =          tcp6_ctlinput,
+		.pr_ctloutput =         tcp_ctloutput,
+#if !INET       /* don't call initialization and timeout routines twice */
+		.pr_init =              tcp_init,
 #endif /* !INET */
-	.pr_drain =		tcp_drain,
-	.pr_usrreqs =		&tcp6_usrreqs,
-	.pr_lock =		tcp_lock,
-	.pr_unlock =		tcp_unlock,
-	.pr_getlock =		tcp_getlock,
-},
-{
-	.pr_type =		SOCK_RAW,
-	.pr_protocol =		IPPROTO_RAW,
-	.pr_flags =		PR_ATOMIC|PR_ADDR,
-	.pr_input =		rip6_input,
-	.pr_output =		rip6_pr_output,
-	.pr_ctlinput =		rip6_ctlinput,
-	.pr_ctloutput =		rip6_ctloutput,
-#if !INET	/* don't call initialization and timeout routines twice */
-	.pr_init =		rip_init,
+		.pr_drain =             tcp_drain,
+		.pr_usrreqs =           &tcp6_usrreqs,
+		.pr_lock =              tcp_lock,
+		.pr_unlock =            tcp_unlock,
+		.pr_getlock =           tcp_getlock,
+		.pr_update_last_owner = inp_update_last_owner,
+		.pr_copy_last_owner =   inp_copy_last_owner,
+	},
+	{
+		.pr_type =              SOCK_RAW,
+		.pr_protocol =          IPPROTO_RAW,
+		.pr_flags =             PR_ATOMIC | PR_ADDR,
+		.pr_input =             rip6_input,
+		.pr_output =            rip6_pr_output,
+		.pr_ctlinput =          rip6_ctlinput,
+		.pr_ctloutput =         rip6_ctloutput,
+#if !INET       /* don't call initialization and timeout routines twice */
+		.pr_init =              rip_init,
 #endif /* !INET */
-	.pr_usrreqs =		&rip6_usrreqs,
-	.pr_unlock =		rip_unlock,
-},
-{
-	.pr_type =		SOCK_RAW,
-	.pr_protocol =		IPPROTO_ICMPV6,
-	.pr_flags =		PR_ATOMIC|PR_ADDR|PR_LASTHDR,
-	.pr_input =		icmp6_input,
-	.pr_output =		rip6_pr_output,
-	.pr_ctlinput =		rip6_ctlinput,
-	.pr_ctloutput =		rip6_ctloutput,
-	.pr_init =		icmp6_init,
-	.pr_usrreqs =		&rip6_usrreqs,
-	.pr_unlock =		rip_unlock,
-},
-{
-	.pr_type =		SOCK_DGRAM,
-	.pr_protocol =		IPPROTO_ICMPV6,
-	.pr_flags =		PR_ATOMIC|PR_ADDR|PR_LASTHDR,
-	.pr_input =		icmp6_input,
-	.pr_output =		rip6_pr_output,
-	.pr_ctlinput =		rip6_ctlinput,
-	.pr_ctloutput =		icmp6_dgram_ctloutput,
-	.pr_init =		icmp6_init,
-	.pr_usrreqs =		&icmp6_dgram_usrreqs,
-	.pr_unlock =		rip_unlock,
-},
-{
-	.pr_type =		SOCK_RAW,
-	.pr_protocol =		IPPROTO_DSTOPTS,
-	.pr_flags =		PR_ATOMIC|PR_ADDR,
-	.pr_input =		dest6_input,
-	.pr_usrreqs =		&nousrreqs,
-},
-{
-	.pr_type =		SOCK_RAW,
-	.pr_protocol =		IPPROTO_ROUTING,
-	.pr_flags =		PR_ATOMIC|PR_ADDR,
-	.pr_input =		route6_input,
-	.pr_usrreqs =		&nousrreqs,
-},
-{
-	.pr_type =		SOCK_RAW,
-	.pr_protocol =		IPPROTO_FRAGMENT,
-	.pr_flags =		PR_ATOMIC|PR_ADDR|PR_PROTOLOCK,
-	.pr_input =		frag6_input,
-	.pr_usrreqs =		&nousrreqs,
-},
+		.pr_usrreqs =           &rip6_usrreqs,
+		.pr_unlock =            rip_unlock,
+		.pr_update_last_owner = inp_update_last_owner,
+		.pr_copy_last_owner =   inp_copy_last_owner,
+	},
+	{
+		.pr_type =              SOCK_RAW,
+		.pr_protocol =          IPPROTO_ICMPV6,
+		.pr_flags =             PR_ATOMIC | PR_ADDR | PR_LASTHDR,
+		.pr_input =             icmp6_input,
+		.pr_output =            rip6_pr_output,
+		.pr_ctlinput =          rip6_ctlinput,
+		.pr_ctloutput =         rip6_ctloutput,
+		.pr_init =              icmp6_init,
+		.pr_usrreqs =           &rip6_usrreqs,
+		.pr_unlock =            rip_unlock,
+		.pr_update_last_owner = inp_update_last_owner,
+		.pr_copy_last_owner =   inp_copy_last_owner,
+	},
+	{
+		.pr_type =              SOCK_DGRAM,
+		.pr_protocol =          IPPROTO_ICMPV6,
+		.pr_flags =             PR_ATOMIC | PR_ADDR | PR_LASTHDR,
+		.pr_input =             icmp6_input,
+		.pr_output =            rip6_pr_output,
+		.pr_ctlinput =          rip6_ctlinput,
+		.pr_ctloutput =         icmp6_dgram_ctloutput,
+		.pr_init =              icmp6_init,
+		.pr_usrreqs =           &icmp6_dgram_usrreqs,
+		.pr_unlock =            rip_unlock,
+		.pr_update_last_owner = inp_update_last_owner,
+		.pr_copy_last_owner =   inp_copy_last_owner,
+	},
+	{
+		.pr_type =              SOCK_RAW,
+		.pr_protocol =          IPPROTO_DSTOPTS,
+		.pr_flags =             PR_ATOMIC | PR_ADDR,
+		.pr_input =             dest6_input,
+		.pr_usrreqs =           &nousrreqs,
+	},
+	{
+		.pr_type =              SOCK_RAW,
+		.pr_protocol =          IPPROTO_ROUTING,
+		.pr_flags =             PR_ATOMIC | PR_ADDR,
+		.pr_input =             route6_input,
+		.pr_usrreqs =           &nousrreqs,
+	},
+	{
+		.pr_type =              SOCK_RAW,
+		.pr_protocol =          IPPROTO_FRAGMENT,
+		.pr_flags =             PR_ATOMIC | PR_ADDR | PR_PROTOLOCK,
+		.pr_input =             frag6_input,
+		.pr_usrreqs =           &nousrreqs,
+	},
 #if IPSEC
-{
-	.pr_type =		SOCK_RAW,
-	.pr_protocol =		IPPROTO_AH,
-	.pr_flags =		PR_ATOMIC|PR_ADDR|PR_PROTOLOCK,
-	.pr_input =		ah6_input,
-	.pr_usrreqs =		&nousrreqs,
-},
+	{
+		.pr_type =              SOCK_RAW,
+		.pr_protocol =          IPPROTO_AH,
+		.pr_flags =             PR_ATOMIC | PR_ADDR | PR_PROTOLOCK,
+		.pr_input =             ah6_input,
+		.pr_usrreqs =           &nousrreqs,
+	},
 #if IPSEC_ESP
-{
-	.pr_type =		SOCK_RAW,
-	.pr_protocol =		IPPROTO_ESP,
-	.pr_flags =		PR_ATOMIC|PR_ADDR|PR_PROTOLOCK,
-	.pr_input =		esp6_input,
-	.pr_ctlinput =		esp6_ctlinput,
-	.pr_usrreqs =		&nousrreqs,
-},
+	{
+		.pr_type =              SOCK_RAW,
+		.pr_protocol =          IPPROTO_ESP,
+		.pr_flags =             PR_ATOMIC | PR_ADDR | PR_PROTOLOCK,
+		.pr_input =             esp6_input,
+		.pr_ctlinput =          esp6_ctlinput,
+		.pr_usrreqs =           &nousrreqs,
+	},
 #endif /* IPSEC_ESP */
-{
-	.pr_type =		SOCK_RAW,
-	.pr_protocol =		IPPROTO_IPCOMP,
-	.pr_flags =		PR_ATOMIC|PR_ADDR|PR_PROTOLOCK,
-	.pr_input =		ipcomp6_input,
-	.pr_usrreqs =		&nousrreqs,
-},
 #endif /* IPSEC */
 #if INET
-{
-	.pr_type =		SOCK_RAW,
-	.pr_protocol =		IPPROTO_IPV4,
-	.pr_flags =		PR_ATOMIC|PR_ADDR|PR_LASTHDR,
-	.pr_input =		encap6_input,
-	.pr_output =		rip6_pr_output,
-	.pr_ctloutput =		rip6_ctloutput,
-	.pr_init =		encap6_init,
-	.pr_usrreqs =		&rip6_usrreqs,
-	.pr_unlock =		rip_unlock,
-},
+	{
+		.pr_type =              SOCK_RAW,
+		.pr_protocol =          IPPROTO_IPV4,
+		.pr_flags =             PR_ATOMIC | PR_ADDR | PR_LASTHDR,
+		.pr_input =             encap6_input,
+		.pr_output =            rip6_pr_output,
+		.pr_ctloutput =         rip6_ctloutput,
+		.pr_init =              encap6_init,
+		.pr_usrreqs =           &rip6_usrreqs,
+		.pr_unlock =            rip_unlock,
+		.pr_update_last_owner = inp_update_last_owner,
+		.pr_copy_last_owner =   inp_copy_last_owner,
+	},
 #endif /*INET*/
-{
-	.pr_type =		SOCK_RAW,
-	.pr_protocol =		IPPROTO_IPV6,
-	.pr_flags =		PR_ATOMIC|PR_ADDR|PR_LASTHDR,
-	.pr_input =		encap6_input,
-	.pr_output =		rip6_pr_output,
-	.pr_ctloutput =		rip6_ctloutput,
-	.pr_init =		encap6_init,
-	.pr_usrreqs =		&rip6_usrreqs,
-	.pr_unlock =		rip_unlock,
-},
+	{
+		.pr_type =              SOCK_RAW,
+		.pr_protocol =          IPPROTO_IPV6,
+		.pr_flags =             PR_ATOMIC | PR_ADDR | PR_LASTHDR,
+		.pr_input =             encap6_input,
+		.pr_output =            rip6_pr_output,
+		.pr_ctloutput =         rip6_ctloutput,
+		.pr_init =              encap6_init,
+		.pr_usrreqs =           &rip6_usrreqs,
+		.pr_unlock =            rip_unlock,
+		.pr_update_last_owner = inp_update_last_owner,
+		.pr_copy_last_owner =   inp_copy_last_owner,
+	},
 /* raw wildcard */
-{
-	.pr_type =		SOCK_RAW,
-	.pr_protocol =		0,
-	.pr_flags =		PR_ATOMIC|PR_ADDR|PR_LASTHDR,
-	.pr_input =		rip6_input,
-	.pr_output =		rip6_pr_output,
-	.pr_ctloutput =		rip6_ctloutput,
-	.pr_usrreqs =		&rip6_usrreqs,
-	.pr_unlock =		rip_unlock,
-},
+	{
+		.pr_type =              SOCK_RAW,
+		.pr_protocol =          0,
+		.pr_flags =             PR_ATOMIC | PR_ADDR | PR_LASTHDR,
+		.pr_input =             rip6_input,
+		.pr_output =            rip6_pr_output,
+		.pr_ctloutput =         rip6_ctloutput,
+		.pr_usrreqs =           &rip6_usrreqs,
+		.pr_unlock =            rip_unlock,
+		.pr_update_last_owner = inp_update_last_owner,
+		.pr_copy_last_owner =   inp_copy_last_owner,
+	},
 };
 
-int in6_proto_count = (sizeof (inet6sw) / sizeof (struct ip6protosw));
+int in6_proto_count = (sizeof(inet6sw) / sizeof(struct ip6protosw));
 
 struct domain inet6domain_s = {
-	.dom_family =		PF_INET6,
-	.dom_flags =		DOM_REENTRANT,
-	.dom_name =		"internet6",
-	.dom_init =		in6_dinit,
-	.dom_rtattach =		in6_inithead,
-	.dom_rtoffset =		offsetof(struct sockaddr_in6, sin6_addr) << 3,
-	.dom_maxrtkey =		sizeof (struct sockaddr_in6),
-	.dom_protohdrlen =	sizeof (struct sockaddr_in6),
+	.dom_family =           PF_INET6,
+	.dom_flags =            DOM_REENTRANT,
+	.dom_name =             "internet6",
+	.dom_init =             in6_dinit,
+	.dom_rtattach =         in6_inithead,
+	.dom_rtoffset =         offsetof(struct sockaddr_in6, sin6_addr) << 3,
+	        .dom_maxrtkey =         sizeof(struct sockaddr_in6),
+	        .dom_protohdrlen =      sizeof(struct sockaddr_in6),
 };
 
 /* Initialize the PF_INET6 domain, and add in the pre-defined protos */
@@ -355,7 +355,7 @@ in6_dinit(struct domain *dp)
 
 	inet6domain = dp;
 
-	_CASSERT(sizeof (struct protosw) == sizeof (struct ip6protosw));
+	_CASSERT(sizeof(struct protosw) == sizeof(struct ip6protosw));
 	_CASSERT(offsetof(struct ip6protosw, pr_entry) ==
 	    offsetof(struct protosw, pr_entry));
 	_CASSERT(offsetof(struct ip6protosw, pr_domain) ==
@@ -394,14 +394,20 @@ in6_dinit(struct domain *dp)
 	    offsetof(struct protosw, pr_filter_head));
 	_CASSERT(offsetof(struct ip6protosw, pr_old) ==
 	    offsetof(struct protosw, pr_old));
+	_CASSERT(offsetof(struct ip6protosw, pr_update_last_owner) ==
+	    offsetof(struct protosw, pr_update_last_owner));
+	_CASSERT(offsetof(struct ip6protosw, pr_copy_last_owner) ==
+	    offsetof(struct protosw, pr_copy_last_owner));
 
 	/*
 	 * Attach first, then initialize.  ip6_init() needs raw IP6 handler.
 	 */
-	for (i = 0, pr = &inet6sw[0]; i < in6_proto_count; i++, pr++)
+	for (i = 0, pr = &inet6sw[0]; i < in6_proto_count; i++, pr++) {
 		net_add_proto((struct protosw *)pr, dp, 0);
-	for (i = 0, pr = &inet6sw[0]; i < in6_proto_count; i++, pr++)
+	}
+	for (i = 0, pr = &inet6sw[0]; i < in6_proto_count; i++, pr++) {
 		net_init_proto((struct protosw *)pr, dp);
+	}
 
 	inet6_domain_mutex = dp->dom_mtx;
 }
@@ -413,49 +419,49 @@ rip6_pr_output(struct mbuf *m, struct socket *so, struct sockaddr_in6 *sin6,
 #pragma unused(m, so, sin6, m1)
 	panic("%s\n", __func__);
 	/* NOTREACHED */
-	return (0);
+	return 0;
 }
 
 /*
  * Internet configuration info
  */
-#ifndef	IPV6FORWARDING
+#ifndef IPV6FORWARDING
 #if GATEWAY6
-#define	IPV6FORWARDING	1	/* forward IP6 packets not for us */
+#define IPV6FORWARDING  1       /* forward IP6 packets not for us */
 #else
-#define	IPV6FORWARDING	0	/* don't forward IP6 packets not for us */
+#define IPV6FORWARDING  0       /* don't forward IP6 packets not for us */
 #endif /* GATEWAY6 */
 #endif /* !IPV6FORWARDING */
 
-#ifndef	IPV6_SENDREDIRECTS
-#define	IPV6_SENDREDIRECTS	1
+#ifndef IPV6_SENDREDIRECTS
+#define IPV6_SENDREDIRECTS      1
 #endif
 
-int	ip6_forwarding = IPV6FORWARDING;	/* act as router? */
-int	ip6_sendredirects = IPV6_SENDREDIRECTS;
-int	ip6_defhlim = IPV6_DEFHLIM;
-int	ip6_defmcasthlim = IPV6_DEFAULT_MULTICAST_HOPS;
-int	ip6_accept_rtadv = 1;	/* deprecated */
-int	ip6_log_interval = 5;
-int	ip6_hdrnestlimit = 15;	/* How many header options will we process? */
-int	ip6_dad_count = 1;	/* DupAddrDetectionTransmits */
-int	ip6_auto_flowlabel = 1;
-int	ip6_gif_hlim = 0;
-int	ip6_use_deprecated = 1;	/* allow deprecated addr [RFC 4862, 5.5.4] */
-int	ip6_rr_prune = 5;	/* router renumbering prefix
-				 * walk list every 5 sec.    */
-int	ip6_mcast_pmtu = 0;	/* enable pMTU discovery for multicast? */
-int	ip6_v6only = 0;		/* Mapped addresses off by default -  Radar 3347718  -- REVISITING FOR 10.7 -- TESTING WITH MAPPED@ OFF */
-
-int	ip6_neighborgcthresh = 1024;	/* Threshold # of NDP entries for GC */
-int	ip6_maxifprefixes = 16;		/* Max acceptable prefixes via RA per IF */
-int	ip6_maxifdefrouters = 16;	/* Max acceptable def routers via RA */
-int	ip6_maxdynroutes = 1024;	/* Max # of routes created via redirect */
-int	ip6_only_allow_rfc4193_prefix = 0;	/* Only allow RFC4193 style Unique Local IPv6 Unicast prefixes */
+int     ip6_forwarding = IPV6FORWARDING;        /* act as router? */
+int     ip6_sendredirects = IPV6_SENDREDIRECTS;
+int     ip6_defhlim = IPV6_DEFHLIM;
+int     ip6_defmcasthlim = IPV6_DEFAULT_MULTICAST_HOPS;
+int     ip6_accept_rtadv = 1;   /* deprecated */
+int     ip6_log_interval = 5;
+int     ip6_hdrnestlimit = 15;  /* How many header options will we process? */
+int     ip6_dad_count = 1;      /* DupAddrDetectionTransmits */
+int     ip6_auto_flowlabel = 1;
+int     ip6_gif_hlim = 0;
+int     ip6_use_deprecated = 1; /* allow deprecated addr [RFC 4862, 5.5.4] */
+int     ip6_rr_prune = 5;       /* router renumbering prefix
+                                 * walk list every 5 sec.    */
+int     ip6_mcast_pmtu = 0;     /* enable pMTU discovery for multicast? */
+int     ip6_v6only = 0;         /* Mapped addresses off by default -  Radar 3347718  -- REVISITING FOR 10.7 -- TESTING WITH MAPPED@ OFF */
+
+int     ip6_neighborgcthresh = 1024;    /* Threshold # of NDP entries for GC */
+int     ip6_maxifprefixes = 16;         /* Max acceptable prefixes via RA per IF */
+int     ip6_maxifdefrouters = 64;       /* Max acceptable default or RTI routers via RA */
+int     ip6_maxdynroutes = 1024;        /* Max # of routes created via redirect */
+int     ip6_only_allow_rfc4193_prefix = 0;      /* Only allow RFC4193 style Unique Local IPv6 Unicast prefixes */
 
 static int ip6_keepfaith = 0;
 uint64_t ip6_log_time = 0;
-int	nd6_onlink_ns_rfc4861 = 0; /* allow 'on-link' nd6 NS (as in RFC 4861) */
+int     nd6_onlink_ns_rfc4861 = 0; /* allow 'on-link' nd6 NS (as in RFC 4861) */
 
 /* icmp6 */
 /*
@@ -463,49 +469,51 @@ int	nd6_onlink_ns_rfc4861 = 0; /* allow 'on-link' nd6 NS (as in RFC 4861) */
  * XXX: what if we don't define INET? Should we define pmtu6_expire
  * or so? (jinmei@kame.net 19990310)
  */
-int pmtu_expire = 60*10;
-int pmtu_probe = 60*2;
+int pmtu_expire = 60 * 10;
+int pmtu_probe = 60 * 2;
 
 /* raw IP6 parameters */
 /*
  * Nominal space allocated to a raw ip socket.
  */
-#define	RIPV6SNDQ	8192
-#define	RIPV6RCVQ	8192
+#define RIPV6SNDQ       8192
+#define RIPV6RCVQ       8192
 
-u_int32_t	rip6_sendspace = RIPV6SNDQ;
-u_int32_t	rip6_recvspace = RIPV6RCVQ;
+u_int32_t       rip6_sendspace = RIPV6SNDQ;
+u_int32_t       rip6_recvspace = RIPV6RCVQ;
 
 /* ICMPV6 parameters */
-int	icmp6_rediraccept = 1;		/* accept and process redirects */
-int	icmp6_redirtimeout = 10 * 60;	/* 10 minutes */
-int	icmp6errppslim = 500;		/* 500 packets per second */
-int	icmp6rappslim = 10;		/* 10 packets per second */
-int	icmp6_nodeinfo = 3;		/* enable/disable NI response */
+int     icmp6_rediraccept = 1;          /* accept and process redirects */
+int     icmp6_redirtimeout = 10 * 60;   /* 10 minutes */
+uint32_t     icmp6errppslim = 500;           /* 500 packets per second */
+uint32_t     icmp6errppslim_random_incr = 500; /* We further randomize icmp6errppslim
+                                                *  with this during icmpv6 initialization*/
+int     icmp6rappslim = 10;             /* 10 packets per second */
+int     icmp6_nodeinfo = 0;             /* enable/disable NI response */
 
 /* UDP on IP6 parameters */
-int	udp6_sendspace = 9216;		/* really max datagram size */
-int	udp6_recvspace = 40 * (1024 + sizeof(struct sockaddr_in6));
-					/* 40 1K datagrams */
+int     udp6_sendspace = 9216;          /* really max datagram size */
+int     udp6_recvspace = 40 * (1024 + sizeof(struct sockaddr_in6));
+/* 40 1K datagrams */
 
 /*
  * sysctl related items.
  */
 SYSCTL_NODE(_net, PF_INET6, inet6,
-	CTLFLAG_RW | CTLFLAG_LOCKED, 0, "Internet6 Family");
+    CTLFLAG_RW | CTLFLAG_LOCKED, 0, "Internet6 Family");
 
 /* net.inet6 */
-SYSCTL_NODE(_net_inet6,	IPPROTO_IPV6, ip6,
-	CTLFLAG_RW|CTLFLAG_LOCKED, 0, "IP6");
-SYSCTL_NODE(_net_inet6,	IPPROTO_ICMPV6, icmp6,
-	CTLFLAG_RW|CTLFLAG_LOCKED, 0, "ICMP6");
-SYSCTL_NODE(_net_inet6,	IPPROTO_UDP, udp6,
-	CTLFLAG_RW|CTLFLAG_LOCKED, 0, "UDP6");
-SYSCTL_NODE(_net_inet6,	IPPROTO_TCP, tcp6,
-	CTLFLAG_RW|CTLFLAG_LOCKED, 0, "TCP6");
+SYSCTL_NODE(_net_inet6, IPPROTO_IPV6, ip6,
+    CTLFLAG_RW | CTLFLAG_LOCKED, 0, "IP6");
+SYSCTL_NODE(_net_inet6, IPPROTO_ICMPV6, icmp6,
+    CTLFLAG_RW | CTLFLAG_LOCKED, 0, "ICMP6");
+SYSCTL_NODE(_net_inet6, IPPROTO_UDP, udp6,
+    CTLFLAG_RW | CTLFLAG_LOCKED, 0, "UDP6");
+SYSCTL_NODE(_net_inet6, IPPROTO_TCP, tcp6,
+    CTLFLAG_RW | CTLFLAG_LOCKED, 0, "TCP6");
 #if IPSEC
-SYSCTL_NODE(_net_inet6,	IPPROTO_ESP, ipsec6,
-	CTLFLAG_RW|CTLFLAG_LOCKED, 0, "IPSEC6");
+SYSCTL_NODE(_net_inet6, IPPROTO_ESP, ipsec6,
+    CTLFLAG_RW | CTLFLAG_LOCKED, 0, "IPSEC6");
 #endif /* IPSEC */
 
 /* net.inet6.ip6 */
@@ -514,20 +522,25 @@ sysctl_ip6_temppltime SYSCTL_HANDLER_ARGS
 {
 #pragma unused(oidp, arg2)
 	int error = 0;
-	int old;
+	int value = 0;
 
 	error = SYSCTL_OUT(req, arg1, sizeof(int));
-	if (error || !req->newptr)
-		return (error);
-	old = ip6_temp_preferred_lifetime;
-	error = SYSCTL_IN(req, arg1, sizeof(int));
-	if (ip6_temp_preferred_lifetime > ND6_MAX_LIFETIME ||
-	    ip6_temp_preferred_lifetime <
-	    ip6_desync_factor + ip6_temp_regen_advance) {
-		ip6_temp_preferred_lifetime = old;
-		return (EINVAL);
+	if (error || !req->newptr) {
+		return error;
+	}
+
+	error = SYSCTL_IN(req, &value, sizeof(value));
+	if (error) {
+		return error;
 	}
-	return (error);
+
+	if (value > ND6_MAX_LIFETIME ||
+	    value < ip6_desync_factor + ip6_temp_regen_advance) {
+		return EINVAL;
+	}
+
+	ip6_temp_preferred_lifetime = value;
+	return error;
 }
 
 static int
@@ -535,133 +548,217 @@ sysctl_ip6_tempvltime SYSCTL_HANDLER_ARGS
 {
 #pragma unused(oidp, arg2)
 	int error = 0;
-	int old;
+	int value = 0;
+
+	error = SYSCTL_OUT(req, arg1, sizeof(int));
+	if (error || !req->newptr) {
+		return error;
+	}
+
+	error = SYSCTL_IN(req, &value, sizeof(value));
+	if (error) {
+		return error;
+	}
+
+	if (value > ND6_MAX_LIFETIME ||
+	    value < ip6_temp_preferred_lifetime) {
+		return EINVAL;
+	}
+
+	ip6_temp_valid_lifetime = value;
+	return error;
+}
+
+static int
+sysctl_ip6_cga_conflict_retries SYSCTL_HANDLER_ARGS
+{
+#pragma unused(oidp, arg2)
+	int error = 0;
+	int value = 0;
 
 	error = SYSCTL_OUT(req, arg1, sizeof(int));
-	if (error || !req->newptr)
-		return (error);
-	old = ip6_temp_valid_lifetime;
-	error = SYSCTL_IN(req, arg1, sizeof(int));
-	if (ip6_temp_valid_lifetime > ND6_MAX_LIFETIME ||
-	    ip6_temp_valid_lifetime < ip6_temp_preferred_lifetime) {
-		ip6_temp_valid_lifetime = old;
-		return (EINVAL);
+	if (error || !req->newptr) {
+		return error;
+	}
+
+	error = SYSCTL_IN(req, &value, sizeof(value));
+	if (error) {
+		return error;
+	}
+	if (value > IPV6_CGA_CONFLICT_RETRIES_MAX || value < 0) {
+		return EINVAL;
 	}
-	return (error);
+
+	ip6_cga_conflict_retries = value;
+	return 0;
 }
 
 static int
 ip6_getstat SYSCTL_HANDLER_ARGS
 {
 #pragma unused(oidp, arg1, arg2)
-	if (req->oldptr == USER_ADDR_NULL)
-		req->oldlen = (size_t)sizeof (struct ip6stat);
+	if (req->oldptr == USER_ADDR_NULL) {
+		req->oldlen = (size_t)sizeof(struct ip6stat);
+	}
 
-	return (SYSCTL_OUT(req, &ip6stat, MIN(sizeof (ip6stat), req->oldlen)));
+	return SYSCTL_OUT(req, &ip6stat, MIN(sizeof(ip6stat), req->oldlen));
 }
 
 SYSCTL_INT(_net_inet6_ip6, IPV6CTL_FORWARDING,
-	forwarding, CTLFLAG_RW | CTLFLAG_LOCKED, 	&ip6_forwarding,	0, "");
+    forwarding, CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_forwarding, 0, "");
 SYSCTL_INT(_net_inet6_ip6, IPV6CTL_SENDREDIRECTS,
-	redirect, CTLFLAG_RW | CTLFLAG_LOCKED,	&ip6_sendredirects,	0, "");
+    redirect, CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_sendredirects, 0, "");
 SYSCTL_INT(_net_inet6_ip6, IPV6CTL_DEFHLIM,
-	hlim, CTLFLAG_RW | CTLFLAG_LOCKED,		&ip6_defhlim,	0, "");
+    hlim, CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_defhlim, 0, "");
 SYSCTL_PROC(_net_inet6_ip6, IPV6CTL_STATS, stats,
-	CTLTYPE_STRUCT | CTLFLAG_RD | CTLFLAG_LOCKED,
-	0, 0, ip6_getstat, "S,ip6stat", "");
+    CTLTYPE_STRUCT | CTLFLAG_RD | CTLFLAG_LOCKED,
+    0, 0, ip6_getstat, "S,ip6stat", "");
 
 #if (DEVELOPMENT || DEBUG)
 SYSCTL_INT(_net_inet6_ip6, IPV6CTL_ACCEPT_RTADV,
-	accept_rtadv, CTLFLAG_RW | CTLFLAG_LOCKED,
-        &ip6_accept_rtadv, 0, "");
+    accept_rtadv, CTLFLAG_RW | CTLFLAG_LOCKED,
+    &ip6_accept_rtadv, 0, "");
 #else
 SYSCTL_INT(_net_inet6_ip6, IPV6CTL_ACCEPT_RTADV,
-	accept_rtadv, CTLFLAG_RD | CTLFLAG_LOCKED,
-	&ip6_accept_rtadv, 0, "");
+    accept_rtadv, CTLFLAG_RD | CTLFLAG_LOCKED,
+    &ip6_accept_rtadv, 0, "");
 #endif /* (DEVELOPMENT || DEBUG) */
 SYSCTL_INT(_net_inet6_ip6, IPV6CTL_KEEPFAITH,
-	keepfaith, CTLFLAG_RD | CTLFLAG_LOCKED,		&ip6_keepfaith,	0, "");
+    keepfaith, CTLFLAG_RD | CTLFLAG_LOCKED, &ip6_keepfaith, 0, "");
 SYSCTL_INT(_net_inet6_ip6, IPV6CTL_LOG_INTERVAL,
-	log_interval, CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_log_interval,	0, "");
+    log_interval, CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_log_interval, 0, "");
 SYSCTL_INT(_net_inet6_ip6, IPV6CTL_HDRNESTLIMIT,
-	hdrnestlimit, CTLFLAG_RW | CTLFLAG_LOCKED,	&ip6_hdrnestlimit,	0, "");
+    hdrnestlimit, CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_hdrnestlimit, 0, "");
 SYSCTL_INT(_net_inet6_ip6, IPV6CTL_DAD_COUNT,
-	dad_count, CTLFLAG_RW | CTLFLAG_LOCKED,	&ip6_dad_count,	0, "");
+    dad_count, CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_dad_count, 0, "");
 SYSCTL_INT(_net_inet6_ip6, IPV6CTL_AUTO_FLOWLABEL,
-	auto_flowlabel, CTLFLAG_RW | CTLFLAG_LOCKED,	&ip6_auto_flowlabel,	0, "");
+    auto_flowlabel, CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_auto_flowlabel, 0, "");
 SYSCTL_INT(_net_inet6_ip6, IPV6CTL_DEFMCASTHLIM,
-	defmcasthlim, CTLFLAG_RW | CTLFLAG_LOCKED,	&ip6_defmcasthlim,	0, "");
+    defmcasthlim, CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_defmcasthlim, 0, "");
 SYSCTL_INT(_net_inet6_ip6, IPV6CTL_GIF_HLIM,
-	gifhlim, CTLFLAG_RW | CTLFLAG_LOCKED,	&ip6_gif_hlim,			0, "");
+    gifhlim, CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_gif_hlim, 0, "");
 SYSCTL_STRING(_net_inet6_ip6, IPV6CTL_KAME_VERSION,
-	kame_version, CTLFLAG_RD | CTLFLAG_LOCKED, (void *)((uintptr_t)(__KAME_VERSION)),		0, "");
+    kame_version, CTLFLAG_RD | CTLFLAG_LOCKED, (void *)((uintptr_t)(__KAME_VERSION)), 0, "");
 SYSCTL_INT(_net_inet6_ip6, IPV6CTL_USE_DEPRECATED,
-	use_deprecated, CTLFLAG_RW | CTLFLAG_LOCKED,	&ip6_use_deprecated,	0, "");
+    use_deprecated, CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_use_deprecated, 0, "");
 SYSCTL_INT(_net_inet6_ip6, IPV6CTL_RR_PRUNE,
-	rr_prune, CTLFLAG_RW | CTLFLAG_LOCKED,	&ip6_rr_prune,			0, "");
+    rr_prune, CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_rr_prune, 0, "");
 SYSCTL_INT(_net_inet6_ip6, IPV6CTL_USETEMPADDR,
-	use_tempaddr, CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_use_tempaddr,		0, "");
+    use_tempaddr, CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_use_tempaddr, 0, "");
 SYSCTL_OID(_net_inet6_ip6, IPV6CTL_TEMPPLTIME, temppltime,
-	   CTLTYPE_INT|CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_temp_preferred_lifetime, 0,
-	   sysctl_ip6_temppltime, "I", "");
+    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_temp_preferred_lifetime, 0,
+    sysctl_ip6_temppltime, "I", "");
 SYSCTL_OID(_net_inet6_ip6, IPV6CTL_TEMPVLTIME, tempvltime,
-	   CTLTYPE_INT|CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_temp_valid_lifetime, 0,
-	   sysctl_ip6_tempvltime, "I", "");
+    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_temp_valid_lifetime, 0,
+    sysctl_ip6_tempvltime, "I", "");
 SYSCTL_INT(_net_inet6_ip6, IPV6CTL_V6ONLY,
-	v6only,	CTLFLAG_RW | CTLFLAG_LOCKED,	&ip6_v6only,		0, "");
+    v6only, CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_v6only, 0, "");
 SYSCTL_INT(_net_inet6_ip6, IPV6CTL_AUTO_LINKLOCAL,
-	auto_linklocal, CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_auto_linklocal,	0, "");
+    auto_linklocal, CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_auto_linklocal, 0, "");
 SYSCTL_STRUCT(_net_inet6_ip6, IPV6CTL_RIP6STATS, rip6stats, CTLFLAG_RD | CTLFLAG_LOCKED,
-	&rip6stat, rip6stat, "");
+    &rip6stat, rip6stat, "");
 SYSCTL_INT(_net_inet6_ip6, IPV6CTL_PREFER_TEMPADDR,
-	prefer_tempaddr, CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_prefer_tempaddr,	0, "");
+    prefer_tempaddr, CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_prefer_tempaddr, 0, "");
 SYSCTL_INT(_net_inet6_ip6, IPV6CTL_USE_DEFAULTZONE,
-	use_defaultzone, CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_use_defzone,		0,"");
+    use_defaultzone, CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_use_defzone, 0, "");
 SYSCTL_INT(_net_inet6_ip6, IPV6CTL_MCAST_PMTU,
-	mcast_pmtu, CTLFLAG_RW | CTLFLAG_LOCKED,	&ip6_mcast_pmtu,	0, "");
+    mcast_pmtu, CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_mcast_pmtu, 0, "");
 SYSCTL_INT(_net_inet6_ip6, IPV6CTL_NEIGHBORGCTHRESH,
-	neighborgcthresh, CTLFLAG_RW | CTLFLAG_LOCKED,	&ip6_neighborgcthresh,	0, "");
+    neighborgcthresh, CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_neighborgcthresh, 0, "");
 SYSCTL_INT(_net_inet6_ip6, IPV6CTL_MAXIFPREFIXES,
-	maxifprefixes, CTLFLAG_RW | CTLFLAG_LOCKED,	&ip6_maxifprefixes,	0, "");
+    maxifprefixes, CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_maxifprefixes, 0, "");
 SYSCTL_INT(_net_inet6_ip6, IPV6CTL_MAXIFDEFROUTERS,
-	maxifdefrouters, CTLFLAG_RW | CTLFLAG_LOCKED,	&ip6_maxifdefrouters,	0, "");
+    maxifdefrouters, CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_maxifdefrouters, 0, "");
 SYSCTL_INT(_net_inet6_ip6, IPV6CTL_MAXDYNROUTES,
-	maxdynroutes, CTLFLAG_RW | CTLFLAG_LOCKED,	&ip6_maxdynroutes,	0, "");
+    maxdynroutes, CTLFLAG_RW | CTLFLAG_LOCKED, &ip6_maxdynroutes, 0, "");
 SYSCTL_INT(_net_inet6_ip6, OID_AUTO,
-	only_allow_rfc4193_prefixes, CTLFLAG_RW | CTLFLAG_LOCKED,
-	&ip6_only_allow_rfc4193_prefix,	0, "");
+    only_allow_rfc4193_prefixes, CTLFLAG_RW | CTLFLAG_LOCKED,
+    &ip6_only_allow_rfc4193_prefix, 0, "");
+SYSCTL_INT(_net_inet6_ip6, OID_AUTO,
+    clat_debug, CTLFLAG_RW | CTLFLAG_LOCKED, &clat_debug, 0, "");
+
+SYSCTL_PROC(_net_inet6_ip6, OID_AUTO,
+    cga_conflict_retries, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
+    &ip6_cga_conflict_retries, 0, sysctl_ip6_cga_conflict_retries, "IU", "");
+
+/*
+ * One single sysctl to set v6 stack profile for IPv6 compliance testing.
+ * A lot of compliance test suites are not aware of other enhancements in IPv6
+ * protocol and expect some arguably obsolete behavior.
+ */
+int v6_compliance_profile = 0;
+static int
+sysctl_set_v6_compliance_profile SYSCTL_HANDLER_ARGS
+{
+#pragma unused(oidp, arg2)
+	int changed, error;
+	int value = *(int *) arg1;
+
+	error = sysctl_io_number(req, value, sizeof(value), &value, &changed);
+	if (error || !changed) {
+		return error;
+	}
+
+	if (value != 0 && value != 1) {
+		return ERANGE;
+	}
+
+	if (value == 1) {
+		ip6_use_tempaddr = 0;
+		dad_enhanced = 0;
+		icmp6_rediraccept = 1;
+		nd6_optimistic_dad = 0;
+		nd6_process_rti = ND6_PROCESS_RTI_ENABLE;
+	} else {
+		ip6_use_tempaddr = IP6_USE_TMPADDR_DEFAULT;
+		dad_enhanced = ND6_DAD_ENHANCED_DEFAULT;
+		icmp6_rediraccept = ICMP6_REDIRACCEPT_DEFAULT;
+		nd6_optimistic_dad = ND6_OPTIMISTIC_DAD_DEFAULT;
+		nd6_process_rti = ND6_PROCESS_RTI_DEFAULT;
+	}
+
+	v6_compliance_profile = value;
+	return 0;
+}
+
+SYSCTL_PROC(_net_inet6_ip6, OID_AUTO, compliance_profile,
+    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
+    &v6_compliance_profile, 0, sysctl_set_v6_compliance_profile,
+    "I", "set IPv6 compliance profile");
 
 /* net.inet6.icmp6 */
 SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_REDIRACCEPT,
-	rediraccept, CTLFLAG_RW | CTLFLAG_LOCKED,	&icmp6_rediraccept,	0, "");
+    rediraccept, CTLFLAG_RW | CTLFLAG_LOCKED, &icmp6_rediraccept, 0, "");
 SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_REDIRTIMEOUT,
-	redirtimeout, CTLFLAG_RW | CTLFLAG_LOCKED,	&icmp6_redirtimeout,	0, "");
+    redirtimeout, CTLFLAG_RW | CTLFLAG_LOCKED, &icmp6_redirtimeout, 0, "");
 SYSCTL_STRUCT(_net_inet6_icmp6, ICMPV6CTL_STATS, stats, CTLFLAG_RD | CTLFLAG_LOCKED,
-	&icmp6stat, icmp6stat, "");
+    &icmp6stat, icmp6stat, "");
 SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_PRUNE,
-	nd6_prune, CTLFLAG_RW | CTLFLAG_LOCKED,		&nd6_prune,	0, "");
+    nd6_prune, CTLFLAG_RW | CTLFLAG_LOCKED, &nd6_prune, 0, "");
 SYSCTL_INT(_net_inet6_icmp6, OID_AUTO,
-	nd6_prune_lazy, CTLFLAG_RW | CTLFLAG_LOCKED,	&nd6_prune_lazy, 0, "");
+    nd6_prune_lazy, CTLFLAG_RW | CTLFLAG_LOCKED, &nd6_prune_lazy, 0, "");
 SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_DELAY,
-	nd6_delay, CTLFLAG_RW | CTLFLAG_LOCKED,		&nd6_delay,	0, "");
+    nd6_delay, CTLFLAG_RW | CTLFLAG_LOCKED, &nd6_delay, 0, "");
 SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_UMAXTRIES,
-	nd6_umaxtries, CTLFLAG_RW | CTLFLAG_LOCKED,	&nd6_umaxtries,	0, "");
+    nd6_umaxtries, CTLFLAG_RW | CTLFLAG_LOCKED, &nd6_umaxtries, 0, "");
 SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_MMAXTRIES,
-	nd6_mmaxtries, CTLFLAG_RW | CTLFLAG_LOCKED,	&nd6_mmaxtries,	0, "");
+    nd6_mmaxtries, CTLFLAG_RW | CTLFLAG_LOCKED, &nd6_mmaxtries, 0, "");
 SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_USELOOPBACK,
-	nd6_useloopback, CTLFLAG_RW | CTLFLAG_LOCKED,	&nd6_useloopback, 0, "");
+    nd6_useloopback, CTLFLAG_RW | CTLFLAG_LOCKED, &nd6_useloopback, 0, "");
 SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_ACCEPT_6TO4,
-	nd6_accept_6to4, CTLFLAG_RW | CTLFLAG_LOCKED,	&nd6_accept_6to4, 0, "");
+    nd6_accept_6to4, CTLFLAG_RW | CTLFLAG_LOCKED, &nd6_accept_6to4, 0, "");
 SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_NODEINFO,
-	nodeinfo, CTLFLAG_RW | CTLFLAG_LOCKED,	&icmp6_nodeinfo,	0, "");
+    nodeinfo, CTLFLAG_RW | CTLFLAG_LOCKED, &icmp6_nodeinfo, 0, "");
 SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ERRPPSLIMIT,
-	errppslimit, CTLFLAG_RW | CTLFLAG_LOCKED,	&icmp6errppslim,	0, "");
+    errppslimit, CTLFLAG_RW | CTLFLAG_LOCKED, &icmp6errppslim, 0, "");
+SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ERRPPSLIMIT_RANDOM_INCR,
+    errppslimit_random_incr, CTLFLAG_RW | CTLFLAG_LOCKED, &icmp6errppslim_random_incr, 0, "");
 SYSCTL_INT(_net_inet6_icmp6, OID_AUTO,
-	rappslimit, CTLFLAG_RW | CTLFLAG_LOCKED,	&icmp6rappslim,	0, "");
+    rappslimit, CTLFLAG_RW | CTLFLAG_LOCKED, &icmp6rappslim, 0, "");
 SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_DEBUG,
-	nd6_debug, CTLFLAG_RW | CTLFLAG_LOCKED,	&nd6_debug,		0, "");
+    nd6_debug, CTLFLAG_RW | CTLFLAG_LOCKED, &nd6_debug, 0, "");
 SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_ONLINKNSRFC4861,
-	nd6_onlink_ns_rfc4861, CTLFLAG_RW | CTLFLAG_LOCKED, &nd6_onlink_ns_rfc4861, 0,
-	"Accept 'on-link' nd6 NS in compliance with RFC 4861.");
+    nd6_onlink_ns_rfc4861, CTLFLAG_RW | CTLFLAG_LOCKED, &nd6_onlink_ns_rfc4861, 0,
+    "Accept 'on-link' nd6 NS in compliance with RFC 4861.");
 SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_OPTIMISTIC_DAD,
-	nd6_optimistic_dad, CTLFLAG_RW | CTLFLAG_LOCKED,	&nd6_optimistic_dad,		0, "");
+    nd6_optimistic_dad, CTLFLAG_RW | CTLFLAG_LOCKED, &nd6_optimistic_dad, 0, "");