diff options
Diffstat (limited to 'sys/netinet6')
-rw-r--r-- | sys/netinet6/dest6.c | 1 | ||||
-rw-r--r-- | sys/netinet6/frag6.c | 1 | ||||
-rw-r--r-- | sys/netinet6/icmp6.c | 4 | ||||
-rw-r--r-- | sys/netinet6/in6.c | 2 | ||||
-rw-r--r-- | sys/netinet6/in6_gif.c | 1 | ||||
-rw-r--r-- | sys/netinet6/in6_ifattach.c | 3 | ||||
-rw-r--r-- | sys/netinet6/in6_pcb.c | 2 | ||||
-rw-r--r-- | sys/netinet6/in6_proto.c | 1 | ||||
-rw-r--r-- | sys/netinet6/in6_rmx.c | 3 | ||||
-rw-r--r-- | sys/netinet6/in6_src.c | 3 | ||||
-rw-r--r-- | sys/netinet6/ip6_forward.c | 1 | ||||
-rw-r--r-- | sys/netinet6/ip6_input.c | 3 | ||||
-rw-r--r-- | sys/netinet6/ip6_ipsec.c | 1 | ||||
-rw-r--r-- | sys/netinet6/ip6_mroute.c | 3 | ||||
-rw-r--r-- | sys/netinet6/ip6_output.c | 3 | ||||
-rw-r--r-- | sys/netinet6/mld6.c | 1 | ||||
-rw-r--r-- | sys/netinet6/nd6.c | 2 | ||||
-rw-r--r-- | sys/netinet6/nd6_nbr.c | 1 | ||||
-rw-r--r-- | sys/netinet6/nd6_rtr.c | 2 | ||||
-rw-r--r-- | sys/netinet6/raw_ip6.c | 6 | ||||
-rw-r--r-- | sys/netinet6/route6.c | 1 | ||||
-rw-r--r-- | sys/netinet6/scope6.c | 4 | ||||
-rw-r--r-- | sys/netinet6/udp6_usrreq.c | 3 | ||||
-rw-r--r-- | sys/netinet6/vinet6.h | 18 |
24 files changed, 60 insertions, 10 deletions
diff --git a/sys/netinet6/dest6.c b/sys/netinet6/dest6.c index 6ac30ed..f0045aa 100644 --- a/sys/netinet6/dest6.c +++ b/sys/netinet6/dest6.c @@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$"); #include <netinet/ip6.h> #include <netinet6/ip6_var.h> #include <netinet/icmp6.h> +#include <netinet6/vinet6.h> /* * Destination options header processing. diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index 391ce92..5c4df75 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$"); #include <netinet/icmp6.h> #include <netinet/in_systm.h> /* for ECN definitions */ #include <netinet/ip.h> /* for ECN definitions */ +#include <netinet6/vinet6.h> #include <security/mac/mac_framework.h> diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 4424481..59bc95a 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -87,6 +87,7 @@ __FBSDID("$FreeBSD$"); #include <net/if_dl.h> #include <net/if_types.h> #include <net/route.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_pcb.h> @@ -94,6 +95,8 @@ __FBSDID("$FreeBSD$"); #include <netinet/ip6.h> #include <netinet/icmp6.h> #include <netinet/tcp_var.h> +#include <netinet/vinet.h> + #include <netinet6/in6_ifattach.h> #include <netinet6/in6_pcb.h> #include <netinet6/ip6protosw.h> @@ -101,6 +104,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/scope6_var.h> #include <netinet6/mld6_var.h> #include <netinet6/nd6.h> +#include <netinet6/vinet6.h> #ifdef IPSEC #include <netipsec/ipsec.h> diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 4834096..c784845 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -84,6 +84,7 @@ __FBSDID("$FreeBSD$"); #include <net/if_types.h> #include <net/route.h> #include <net/if_dl.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_var.h> @@ -100,6 +101,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/in6_ifattach.h> #include <netinet6/scope6_var.h> #include <netinet6/in6_pcb.h> +#include <netinet6/vinet6.h> MALLOC_DEFINE(M_IP6MADDR, "in6_multi", "internet multicast address"); diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c index a0bdda8..ff0b8d1 100644 --- a/sys/netinet6/in6_gif.c +++ b/sys/netinet6/in6_gif.c @@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$"); #include <netinet/ip_ecn.h> #ifdef INET6 #include <netinet6/ip6_ecn.h> +#include <netinet6/vinet6.h> #endif #include <net/if_gif.h> diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index 48579bc..7b5c2f9 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -46,11 +46,13 @@ __FBSDID("$FreeBSD$"); #include <net/if_dl.h> #include <net/if_types.h> #include <net/route.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_var.h> #include <netinet/if_ether.h> #include <netinet/in_pcb.h> +#include <netinet/vinet.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> @@ -60,6 +62,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/ip6_var.h> #include <netinet6/nd6.h> #include <netinet6/scope6_var.h> +#include <netinet6/vinet6.h> #ifdef VIMAGE_GLOBALS unsigned long in6_maxmtu; diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 6cf40ce..ad19bee 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -96,12 +96,14 @@ __FBSDID("$FreeBSD$"); #include <netinet/tcp_var.h> #include <netinet/ip6.h> #include <netinet/ip_var.h> +#include <netinet/vinet.h> #include <netinet6/ip6_var.h> #include <netinet6/nd6.h> #include <netinet/in_pcb.h> #include <netinet6/in6_pcb.h> #include <netinet6/scope6_var.h> +#include <netinet6/vinet6.h> #include <security/mac/mac_framework.h> diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index f4fabf6..112cda2 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -128,6 +128,7 @@ __FBSDID("$FreeBSD$"); #endif /* IPSEC */ #include <netinet6/ip6protosw.h> +#include <netinet6/vinet6.h> /* * TCP/IP protocol family: IP6, ICMP6, UDP, TCP. diff --git a/sys/netinet6/in6_rmx.c b/sys/netinet6/in6_rmx.c index f628965..25e011a 100644 --- a/sys/netinet6/in6_rmx.c +++ b/sys/netinet6/in6_rmx.c @@ -89,6 +89,8 @@ __FBSDID("$FreeBSD$"); #include <net/if.h> #include <net/route.h> +#include <net/vnet.h> + #include <netinet/in.h> #include <netinet/ip_var.h> #include <netinet/in_var.h> @@ -98,6 +100,7 @@ __FBSDID("$FreeBSD$"); #include <netinet/icmp6.h> #include <netinet6/nd6.h> +#include <netinet6/vinet6.h> #include <netinet/tcp.h> #include <netinet/tcp_seq.h> diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c index 481ad12..4d7723a 100644 --- a/sys/netinet6/in6_src.c +++ b/sys/netinet6/in6_src.c @@ -99,12 +99,15 @@ __FBSDID("$FreeBSD$"); #include <netinet/ip_var.h> #include <netinet/udp.h> #include <netinet/udp_var.h> +#include <netinet/vinet.h> + #include <netinet6/in6_var.h> #include <netinet/ip6.h> #include <netinet6/in6_pcb.h> #include <netinet6/ip6_var.h> #include <netinet6/scope6_var.h> #include <netinet6/nd6.h> +#include <netinet6/vinet6.h> static struct mtx addrsel_lock; #define ADDRSEL_LOCK_INIT() mtx_init(&addrsel_lock, "addrsel_lock", NULL, MTX_DEF) diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c index 7571507..db0094c 100644 --- a/sys/netinet6/ip6_forward.c +++ b/sys/netinet6/ip6_forward.c @@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/scope6_var.h> #include <netinet/icmp6.h> #include <netinet6/nd6.h> +#include <netinet6/vinet6.h> #include <netinet/in_pcb.h> diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 320042f..fb42c5e 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -88,12 +88,14 @@ __FBSDID("$FreeBSD$"); #include <net/route.h> #include <net/netisr.h> #include <net/pfil.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_systm.h> #ifdef INET #include <netinet/ip.h> #include <netinet/ip_icmp.h> +#include <netinet/vinet.h> #endif /* INET */ #include <netinet/ip6.h> #include <netinet6/in6_var.h> @@ -103,6 +105,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/scope6_var.h> #include <netinet6/in6_ifattach.h> #include <netinet6/nd6.h> +#include <netinet6/vinet6.h> #ifdef IPSEC #include <netipsec/ipsec.h> diff --git a/sys/netinet6/ip6_ipsec.c b/sys/netinet6/ip6_ipsec.c index 23f4e26..a6ac5c9 100644 --- a/sys/netinet6/ip6_ipsec.c +++ b/sys/netinet6/ip6_ipsec.c @@ -72,6 +72,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/ip6_ipsec.h> #include <netinet6/ip6_var.h> +#include <netinet6/vinet6.h> extern struct protosw inet6sw[]; diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 2ae6ed8..9b85a16 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -107,10 +107,12 @@ __FBSDID("$FreeBSD$"); #include <net/if_types.h> #include <net/raw_cb.h> #include <net/route.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_var.h> #include <netinet/icmp6.h> +#include <netinet/vinet.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> @@ -120,6 +122,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/ip6protosw.h> #include <netinet6/pim6.h> #include <netinet6/pim6_var.h> +#include <netinet6/vinet6.h> static MALLOC_DEFINE(M_MRTABLE6, "mf6c", "multicast forwarding cache entry"); diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index fb7162f..6e5d0d0 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -84,6 +84,7 @@ __FBSDID("$FreeBSD$"); #include <net/netisr.h> #include <net/route.h> #include <net/pfil.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_var.h> @@ -94,6 +95,7 @@ __FBSDID("$FreeBSD$"); #include <netinet/in_pcb.h> #include <netinet/tcp_var.h> #include <netinet6/nd6.h> +#include <netinet/vinet.h> #ifdef IPSEC #include <netipsec/ipsec.h> @@ -104,6 +106,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/ip6protosw.h> #include <netinet6/scope6_var.h> +#include <netinet6/vinet6.h> static MALLOC_DEFINE(M_IP6MOPTS, "ip6_moptions", "internet multicast options"); diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c index 9c6bbdb..3e0f921 100644 --- a/sys/netinet6/mld6.c +++ b/sys/netinet6/mld6.c @@ -91,6 +91,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/scope6_var.h> #include <netinet/icmp6.h> #include <netinet6/mld6_var.h> +#include <netinet6/vinet6.h> /* * Protocol constants diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index dfe0016..8f517a5 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$"); #include <net/iso88025.h> #include <net/fddi.h> #include <net/route.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/if_ether.h> @@ -67,6 +68,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/scope6_var.h> #include <netinet6/nd6.h> #include <netinet/icmp6.h> +#include <netinet6/vinet6.h> #include <sys/limits.h> #include <sys/vimage.h> diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index ef898cd..ecfad0e 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -70,6 +70,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/scope6_var.h> #include <netinet6/nd6.h> #include <netinet/icmp6.h> +#include <netinet6/vinet6.h> #ifdef DEV_CARP #include <netinet/ip_carp.h> diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 200f1f4..5e52a85 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$"); #include <net/if_dl.h> #include <net/route.h> #include <net/radix.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet6/in6_var.h> @@ -62,6 +63,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/nd6.h> #include <netinet/icmp6.h> #include <netinet6/scope6_var.h> +#include <netinet6/vinet6.h> #define SDL(s) ((struct sockaddr_dl *)s) diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index 4537f7d..b132751 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -84,12 +84,15 @@ __FBSDID("$FreeBSD$"); #include <net/if.h> #include <net/if_types.h> #include <net/route.h> +#include <net/vnet.h> #include <netinet/in.h> #include <netinet/in_var.h> #include <netinet/in_systm.h> -#include <netinet/icmp6.h> #include <netinet/in_pcb.h> +#include <netinet/vinet.h> + +#include <netinet/icmp6.h> #include <netinet/ip6.h> #include <netinet6/ip6protosw.h> #include <netinet6/ip6_mroute.h> @@ -98,6 +101,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/nd6.h> #include <netinet6/raw_ip6.h> #include <netinet6/scope6_var.h> +#include <netinet6/vinet6.h> #ifdef IPSEC #include <netipsec/ipsec.h> diff --git a/sys/netinet6/route6.c b/sys/netinet6/route6.c index dd1ec68..2bff4af 100644 --- a/sys/netinet6/route6.c +++ b/sys/netinet6/route6.c @@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include <netinet6/scope6_var.h> #include <netinet/icmp6.h> +#include <netinet6/vinet6.h> #if 0 static int ip6_rthdr0 __P((struct mbuf *, struct ip6_hdr *, diff --git a/sys/netinet6/scope6.c b/sys/netinet6/scope6.c index 4bb84d9..3dde09a 100644 --- a/sys/netinet6/scope6.c +++ b/sys/netinet6/scope6.c @@ -43,12 +43,14 @@ __FBSDID("$FreeBSD$"); #include <net/route.h> #include <net/if.h> +#include <net/vnet.h> #include <netinet/in.h> -#include <netinet/ip6.h> +#include <netinet/ip6.h> #include <netinet6/in6_var.h> #include <netinet6/scope6_var.h> +#include <netinet6/vinet6.h> /* diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 6d233dd..cfb0ad6 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -103,11 +103,14 @@ __FBSDID("$FreeBSD$"); #include <netinet/ip_var.h> #include <netinet/udp.h> #include <netinet/udp_var.h> +#include <netinet/vinet.h> + #include <netinet6/ip6protosw.h> #include <netinet6/ip6_var.h> #include <netinet6/in6_pcb.h> #include <netinet6/udp6_var.h> #include <netinet6/scope6_var.h> +#include <netinet6/vinet6.h> #ifdef IPSEC #include <netipsec/ipsec.h> diff --git a/sys/netinet6/vinet6.h b/sys/netinet6/vinet6.h index cc8269c..a84be4f 100644 --- a/sys/netinet6/vinet6.h +++ b/sys/netinet6/vinet6.h @@ -33,17 +33,19 @@ #ifndef _NETINET6_VINET6_H_ #define _NETINET6_VINET6_H_ -#include <sys/socket.h> -#include <netinet/ip6.h> -#include <net/if.h> +#include <sys/callout.h> +#include <sys/queue.h> +#include <sys/types.h> + +#include <net/if_var.h> + +#include <netinet/icmp6.h> +#include <netinet/in.h> + #include <netinet6/ip6_var.h> +#include <netinet6/nd6.h> #include <netinet6/raw_ip6.h> -#include <netinet/icmp6.h> #include <netinet6/scope6_var.h> -#include <netinet6/in6_ifattach.h> -#include <netinet6/in6_var.h> -#include <netinet6/nd6.h> -#include <netinet/in_pcb.h> struct vnet_inet6 { struct in6_ifaddr * _in6_ifaddr; |