diff options
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/in6_proto.c | 4 | ||||
| -rw-r--r-- | sys/netinet6/ip6_input.c | 8 | ||||
| -rw-r--r-- | sys/netinet6/nd6.c | 8 | ||||
| -rw-r--r-- | sys/netinet6/vinet6.h | 8 |
4 files changed, 20 insertions, 8 deletions
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index 112cda2..380ee55 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/socket.h> #include <sys/socketvar.h> +#include <sys/proc.h> #include <sys/protosw.h> #include <sys/kernel.h> #include <sys/domain.h> @@ -518,9 +519,6 @@ SYSCTL_V_OID(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_TEMPVLTIME, tempvltime, sysctl_ip6_tempvltime, "I", ""); SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_V6ONLY, v6only, CTLFLAG_RW, ip6_v6only, 0, ""); -#ifndef VIMAGE -TUNABLE_INT("net.inet6.ip6.auto_linklocal", &ip6_auto_linklocal); -#endif SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_AUTO_LINKLOCAL, auto_linklocal, CTLFLAG_RW, ip6_auto_linklocal, 0, ""); SYSCTL_V_STRUCT(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_RIP6STATS, diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index fb42c5e..7edcaa3 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -120,6 +120,12 @@ extern struct domain inet6domain; u_char ip6_protox[IPPROTO_MAX]; static struct ifqueue ip6intrq; +#ifndef VIMAGE +#ifndef VIMAGE_GLOBALS +struct vnet_inet6 vnet_inet6_0; +#endif +#endif + #ifdef VIMAGE_GLOBALS static int ip6qmaxlen; struct in6_ifaddr *in6_ifaddr; @@ -172,6 +178,8 @@ ip6_init(void) #else V_ip6_auto_linklocal = 1; /* enable by default */ #endif + TUNABLE_INT_FETCH("net.inet6.ip6.auto_linklocal", + &V_ip6_auto_linklocal); #ifndef IPV6FORWARDING #ifdef GATEWAY6 diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index 8f517a5..18e81c3 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -166,10 +166,10 @@ nd6_init(void) V_llinfo_nd6.ln_prev = &V_llinfo_nd6; LIST_INIT(&V_nd_prefix); - ip6_use_tempaddr = 0; - ip6_temp_preferred_lifetime = DEF_TEMP_PREFERRED_LIFETIME; - ip6_temp_valid_lifetime = DEF_TEMP_VALID_LIFETIME; - ip6_temp_regen_advance = TEMPADDR_REGEN_ADVANCE; + V_ip6_use_tempaddr = 0; + V_ip6_temp_preferred_lifetime = DEF_TEMP_PREFERRED_LIFETIME; + V_ip6_temp_valid_lifetime = DEF_TEMP_VALID_LIFETIME; + V_ip6_temp_regen_advance = TEMPADDR_REGEN_ADVANCE; all1_sa.sin6_family = AF_INET6; all1_sa.sin6_len = sizeof(struct sockaddr_in6); diff --git a/sys/netinet6/vinet6.h b/sys/netinet6/vinet6.h index a84be4f..d509977 100644 --- a/sys/netinet6/vinet6.h +++ b/sys/netinet6/vinet6.h @@ -89,7 +89,7 @@ struct vnet_inet6 { int _dad_init; int _icmp6errpps_count; - int _icmp6errppslim_last; + struct timeval _icmp6errppslim_last; int _ip6_forwarding; int _ip6_sendredirects; @@ -156,6 +156,12 @@ struct vnet_inet6 { struct ip6_pktopts _ip6_opts; }; +#ifndef VIMAGE +#ifndef VIMAGE_GLOBALS +extern struct vnet_inet6 vnet_inet6_0; +#endif +#endif + #define INIT_VNET_INET6(vnet) \ INIT_FROM_VNET(vnet, VNET_MOD_INET6, struct vnet_inet6, vnet_inet6) |
