sync with kame tree as of july00. tons of bug fixes/improvements.

API changes:
- additional IPv6 ioctls
- IPsec PF_KEY API was changed, it is mandatory to upgrade setkey(8).
  (also syntax change)

1 files changed, 229 insertions, 203 deletions

diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h
index 163c167..511c1b2 100644
--- a/sys/netinet6/in6_var.h
+++ b/sys/netinet6/in6_var.h
@@ -1,3 +1,6 @@
+/*	$FreeBSD$	*/
+/*	$KAME: in6_var.h,v 1.33 2000/05/17 05:07:26 jinmei Exp $	*/
+
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
@@ -60,11 +63,10 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_var.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
  */
 
-#ifndef	_NETINET6_IN6_VAR_H_
-#define	_NETINET6_IN6_VAR_H_
+#ifndef _NETINET6_IN6_VAR_H_
+#define _NETINET6_IN6_VAR_H_
 
 /*
  * Interface address, Internet version.  One of these structures
@@ -82,63 +84,63 @@
  *	in kernel: modify preferred/expire only
  */
 struct in6_addrlifetime {
-	time_t	ia6t_expire;	/* valid lifetime expiration time */
-	time_t	ia6t_preferred;	/* preferred lifetime expiration time */
-	u_int32_t	ia6t_vltime;	/* valid lifetime */
-	u_int32_t	ia6t_pltime;	/* prefix lifetime */
+	time_t ia6t_expire;	/* valid lifetime expiration time */
+	time_t ia6t_preferred;	/* preferred lifetime expiration time */
+	u_int32_t ia6t_vltime;	/* valid lifetime */
+	u_int32_t ia6t_pltime;	/* prefix lifetime */
 };
 
 struct	in6_ifaddr {
 	struct	ifaddr ia_ifa;		/* protocol-independent info */
 #define	ia_ifp		ia_ifa.ifa_ifp
-#define	ia_flags	ia_ifa.ifa_flags
+#define ia_flags	ia_ifa.ifa_flags
 	struct	sockaddr_in6 ia_addr;	/* interface address */
 	struct	sockaddr_in6 ia_net;	/* network number of interface */
 	struct	sockaddr_in6 ia_dstaddr; /* space for destination addr */
 	struct	sockaddr_in6 ia_prefixmask; /* prefix mask */
-	u_int32_t	ia_plen;		/* prefix length */
+	u_int32_t ia_plen;		/* prefix length */
 	struct	in6_ifaddr *ia_next;	/* next in6 list of IP6 addresses */
 	int	ia6_flags;
 
-	struct	in6_addrlifetime ia6_lifetime;	/* NULL = infty */
-	struct	ifprefix *ia6_ifpr; /* back pointer to ifprefix */
+	struct in6_addrlifetime ia6_lifetime;	/* NULL = infty */
+	struct ifprefix *ia6_ifpr; /* back pointer to ifprefix */
 };
 
 /*
  * IPv6 interface statistics, as defined in RFC2465 Ipv6IfStatsEntry (p12).
  */
 struct in6_ifstat {
-	u_int64_t	ifs6_in_receive;	/* # of total input datagram */
-	u_int64_t	ifs6_in_hdrerr;	/* # of datagrams with invalid hdr */
-	u_int64_t	ifs6_in_toobig;	/* # of datagrams exceeded MTU */
-	u_int64_t	ifs6_in_noroute;	/* # of datagrams with no route */
-	u_int64_t	ifs6_in_addrerr;	/* # of datagrams with invalid dst */
-	u_int64_t	ifs6_in_protounknown;	/* # of datagrams with unknown proto */
+	u_quad_t ifs6_in_receive;	/* # of total input datagram */
+	u_quad_t ifs6_in_hdrerr;	/* # of datagrams with invalid hdr */
+	u_quad_t ifs6_in_toobig;	/* # of datagrams exceeded MTU */
+	u_quad_t ifs6_in_noroute;	/* # of datagrams with no route */
+	u_quad_t ifs6_in_addrerr;	/* # of datagrams with invalid dst */
+	u_quad_t ifs6_in_protounknown;	/* # of datagrams with unknown proto */
 					/* NOTE: increment on final dst if */
-	u_int64_t	ifs6_in_truncated;	/* # of truncated datagrams */
-	u_int64_t	ifs6_in_discard;	/* # of discarded datagrams */
+	u_quad_t ifs6_in_truncated;	/* # of truncated datagrams */
+	u_quad_t ifs6_in_discard;	/* # of discarded datagrams */
 					/* NOTE: fragment timeout is not here */
-	u_int64_t	ifs6_in_deliver;	/* # of datagrams delivered to ULP */
+	u_quad_t ifs6_in_deliver;	/* # of datagrams delivered to ULP */
 					/* NOTE: increment on final dst if */
-	u_int64_t	ifs6_out_forward;	/* # of datagrams forwarded */
+	u_quad_t ifs6_out_forward;	/* # of datagrams forwarded */
 					/* NOTE: increment on outgoing if */
-	u_int64_t	ifs6_out_request;	/* # of outgoing datagrams from ULP */
+	u_quad_t ifs6_out_request;	/* # of outgoing datagrams from ULP */
 					/* NOTE: does not include forwrads */
-	u_int64_t	ifs6_out_discard;	/* # of discarded datagrams */
-	u_int64_t	ifs6_out_fragok;	/* # of datagrams fragmented */
-	u_int64_t	ifs6_out_fragfail;	/* # of datagrams failed on fragment */
-	u_int64_t	ifs6_out_fragcreat;	/* # of fragment datagrams */
+	u_quad_t ifs6_out_discard;	/* # of discarded datagrams */
+	u_quad_t ifs6_out_fragok;	/* # of datagrams fragmented */
+	u_quad_t ifs6_out_fragfail;	/* # of datagrams failed on fragment */
+	u_quad_t ifs6_out_fragcreat;	/* # of fragment datagrams */
 					/* NOTE: this is # after fragment */
-	u_int64_t	ifs6_reass_reqd;	/* # of incoming fragmented packets */
+	u_quad_t ifs6_reass_reqd;	/* # of incoming fragmented packets */
 					/* NOTE: increment on final dst if */
-	u_int64_t	ifs6_reass_ok;	/* # of reassembled packets */
+	u_quad_t ifs6_reass_ok;		/* # of reassembled packets */
 					/* NOTE: this is # after reass */
 					/* NOTE: increment on final dst if */
-	u_int64_t	ifs6_reass_fail;	/* # of reass failures */
+	u_quad_t ifs6_reass_fail;	/* # of reass failures */
 					/* NOTE: may not be packet count */
 					/* NOTE: increment on final dst if */
-	u_int64_t	ifs6_in_mcast;	/* # of inbound multicast datagrams */
-	u_int64_t	ifs6_out_mcast;	/* # of outbound multicast datagrams */
+	u_quad_t ifs6_in_mcast;		/* # of inbound multicast datagrams */
+	u_quad_t ifs6_out_mcast;	/* # of outbound multicast datagrams */
 };
 
 /*
@@ -150,77 +152,77 @@ struct icmp6_ifstat {
 	 * Input statistics
 	 */
 	/* ipv6IfIcmpInMsgs, total # of input messages */
-	u_int64_t	ifs6_in_msg;
+	u_quad_t ifs6_in_msg;
 	/* ipv6IfIcmpInErrors, # of input error messages */
-	u_int64_t	ifs6_in_error;
+	u_quad_t ifs6_in_error;
 	/* ipv6IfIcmpInDestUnreachs, # of input dest unreach errors */
-	u_int64_t	ifs6_in_dstunreach;
+	u_quad_t ifs6_in_dstunreach;
 	/* ipv6IfIcmpInAdminProhibs, # of input administratively prohibited errs */
-	u_int64_t	ifs6_in_adminprohib;
+	u_quad_t ifs6_in_adminprohib;
 	/* ipv6IfIcmpInTimeExcds, # of input time exceeded errors */
-	u_int64_t	ifs6_in_timeexceed;
+	u_quad_t ifs6_in_timeexceed;
 	/* ipv6IfIcmpInParmProblems, # of input parameter problem errors */
-	u_int64_t	ifs6_in_paramprob;
+	u_quad_t ifs6_in_paramprob;
 	/* ipv6IfIcmpInPktTooBigs, # of input packet too big errors */
-	u_int64_t	ifs6_in_pkttoobig;
+	u_quad_t ifs6_in_pkttoobig;
 	/* ipv6IfIcmpInEchos, # of input echo requests */
-	u_int64_t	ifs6_in_echo;
+	u_quad_t ifs6_in_echo;
 	/* ipv6IfIcmpInEchoReplies, # of input echo replies */
-	u_int64_t	ifs6_in_echoreply;
+	u_quad_t ifs6_in_echoreply;
 	/* ipv6IfIcmpInRouterSolicits, # of input router solicitations */
-	u_int64_t	ifs6_in_routersolicit;
+	u_quad_t ifs6_in_routersolicit;
 	/* ipv6IfIcmpInRouterAdvertisements, # of input router advertisements */
-	u_int64_t	ifs6_in_routeradvert;
+	u_quad_t ifs6_in_routeradvert;
 	/* ipv6IfIcmpInNeighborSolicits, # of input neighbor solicitations */
-	u_int64_t	ifs6_in_neighborsolicit;
+	u_quad_t ifs6_in_neighborsolicit;
 	/* ipv6IfIcmpInNeighborAdvertisements, # of input neighbor advertisements */
-	u_int64_t	ifs6_in_neighboradvert;
+	u_quad_t ifs6_in_neighboradvert;
 	/* ipv6IfIcmpInRedirects, # of input redirects */
-	u_int64_t	ifs6_in_redirect;
+	u_quad_t ifs6_in_redirect;
 	/* ipv6IfIcmpInGroupMembQueries, # of input MLD queries */
-	u_int64_t	ifs6_in_mldquery;
+	u_quad_t ifs6_in_mldquery;
 	/* ipv6IfIcmpInGroupMembResponses, # of input MLD reports */
-	u_int64_t	ifs6_in_mldreport;
+	u_quad_t ifs6_in_mldreport;
 	/* ipv6IfIcmpInGroupMembReductions, # of input MLD done */
-	u_int64_t	ifs6_in_mlddone;
+	u_quad_t ifs6_in_mlddone;
 
 	/*
 	 * Output statistics. We should solve unresolved routing problem...
 	 */
 	/* ipv6IfIcmpOutMsgs, total # of output messages */
-	u_int64_t	ifs6_out_msg;
+	u_quad_t ifs6_out_msg;
 	/* ipv6IfIcmpOutErrors, # of output error messages */
-	u_int64_t	ifs6_out_error;
+	u_quad_t ifs6_out_error;
 	/* ipv6IfIcmpOutDestUnreachs, # of output dest unreach errors */
-	u_int64_t	ifs6_out_dstunreach;
+	u_quad_t ifs6_out_dstunreach;
 	/* ipv6IfIcmpOutAdminProhibs, # of output administratively prohibited errs */
-	u_int64_t	ifs6_out_adminprohib;
+	u_quad_t ifs6_out_adminprohib;
 	/* ipv6IfIcmpOutTimeExcds, # of output time exceeded errors */
-	u_int64_t	ifs6_out_timeexceed;
+	u_quad_t ifs6_out_timeexceed;
 	/* ipv6IfIcmpOutParmProblems, # of output parameter problem errors */
-	u_int64_t	ifs6_out_paramprob;
+	u_quad_t ifs6_out_paramprob;
 	/* ipv6IfIcmpOutPktTooBigs, # of output packet too big errors */
-	u_int64_t	ifs6_out_pkttoobig;
+	u_quad_t ifs6_out_pkttoobig;
 	/* ipv6IfIcmpOutEchos, # of output echo requests */
-	u_int64_t	ifs6_out_echo;
+	u_quad_t ifs6_out_echo;
 	/* ipv6IfIcmpOutEchoReplies, # of output echo replies */
-	u_int64_t	ifs6_out_echoreply;
+	u_quad_t ifs6_out_echoreply;
 	/* ipv6IfIcmpOutRouterSolicits, # of output router solicitations */
-	u_int64_t	ifs6_out_routersolicit;
+	u_quad_t ifs6_out_routersolicit;
 	/* ipv6IfIcmpOutRouterAdvertisements, # of output router advertisements */
-	u_int64_t	ifs6_out_routeradvert;
+	u_quad_t ifs6_out_routeradvert;
 	/* ipv6IfIcmpOutNeighborSolicits, # of output neighbor solicitations */
-	u_int64_t	ifs6_out_neighborsolicit;
+	u_quad_t ifs6_out_neighborsolicit;
 	/* ipv6IfIcmpOutNeighborAdvertisements, # of output neighbor advertisements */
-	u_int64_t	ifs6_out_neighboradvert;
+	u_quad_t ifs6_out_neighboradvert;
 	/* ipv6IfIcmpOutRedirects, # of output redirects */
-	u_int64_t	ifs6_out_redirect;
+	u_quad_t ifs6_out_redirect;
 	/* ipv6IfIcmpOutGroupMembQueries, # of output MLD queries */
-	u_int64_t	ifs6_out_mldquery;
+	u_quad_t ifs6_out_mldquery;
 	/* ipv6IfIcmpOutGroupMembResponses, # of output MLD reports */
-	u_int64_t	ifs6_out_mldreport;
+	u_quad_t ifs6_out_mldreport;
 	/* ipv6IfIcmpOutGroupMembReductions, # of output MLD done */
-	u_int64_t	ifs6_out_mlddone;
+	u_quad_t ifs6_out_mlddone;
 };
 
 struct	in6_ifreq {
@@ -232,9 +234,10 @@ struct	in6_ifreq {
 		int	ifru_flags6;
 		int	ifru_metric;
 		caddr_t	ifru_data;
-		struct	in6_addrlifetime ifru_lifetime;
-		struct	in6_ifstat ifru_stat;
-		struct	icmp6_ifstat ifru_icmp6stat;
+		struct in6_addrlifetime ifru_lifetime;
+		struct in6_ifstat ifru_stat;
+		struct icmp6_ifstat ifru_icmp6stat;
+		u_int32_t ifru_scope_id[16];
 	} ifr_ifru;
 };
 
@@ -244,12 +247,12 @@ struct	in6_aliasreq {
 	struct	sockaddr_in6 ifra_dstaddr;
 	struct	sockaddr_in6 ifra_prefixmask;
 	int	ifra_flags;
-	struct	in6_addrlifetime ifra_lifetime;
+	struct in6_addrlifetime ifra_lifetime;
 };
 
 /* prefix type macro */
-#define	IN6_PREFIX_ND	1
-#define	IN6_PREFIX_RR	2
+#define IN6_PREFIX_ND	1
+#define IN6_PREFIX_RR	2
 
 /*
  * prefix related flags passed between kernel(NDP related part) and
@@ -257,44 +260,44 @@ struct	in6_aliasreq {
  */
 struct in6_prflags {
 	struct prf_ra {
-		u_char	onlink : 1;
-		u_char	autonomous : 1;
-		u_char	reserved : 6;
+		u_char onlink : 1;
+		u_char autonomous : 1;
+		u_char reserved : 6;
 	} prf_ra;
-	u_char	prf_reserved1;
-	u_short	prf_reserved2;
+	u_char prf_reserved1;
+	u_short prf_reserved2;
 	/* want to put this on 4byte offset */
 	struct prf_rr {
-		u_char	decrvalid : 1;
-		u_char	decrprefd : 1;
-		u_char	reserved : 6;
+		u_char decrvalid : 1;
+		u_char decrprefd : 1;
+		u_char reserved : 6;
 	} prf_rr;
-	u_char	prf_reserved3;
-	u_short	prf_reserved4;
+	u_char prf_reserved3;
+	u_short prf_reserved4;
 };
 
 struct  in6_prefixreq {
 	char	ipr_name[IFNAMSIZ];
 	u_char	ipr_origin;
 	u_char	ipr_plen;
-	u_int32_t	ipr_vltime;
-	u_int32_t	ipr_pltime;
-	struct	in6_prflags ipr_flags;
+	u_int32_t ipr_vltime;
+	u_int32_t ipr_pltime;
+	struct in6_prflags ipr_flags;
 	struct	sockaddr_in6 ipr_prefix;
 };
 
-#define	PR_ORIG_RA	0
-#define	PR_ORIG_RR	1
-#define	PR_ORIG_STATIC	2
-#define	PR_ORIG_KERNEL	3
+#define PR_ORIG_RA	0
+#define PR_ORIG_RR	1
+#define PR_ORIG_STATIC	2
+#define PR_ORIG_KERNEL	3
 
-#define	ipr_raf_onlink		ipr_flags.prf_ra.onlink
-#define	ipr_raf_auto		ipr_flags.prf_ra.autonomous
+#define ipr_raf_onlink		ipr_flags.prf_ra.onlink
+#define ipr_raf_auto		ipr_flags.prf_ra.autonomous
 
-#define	ipr_statef_onlink	ipr_flags.prf_state.onlink
+#define ipr_statef_onlink	ipr_flags.prf_state.onlink
 
-#define	ipr_rrf_decrvalid	ipr_flags.prf_rr.decrvalid
-#define	ipr_rrf_decrprefd	ipr_flags.prf_rr.decrprefd
+#define ipr_rrf_decrvalid	ipr_flags.prf_rr.decrvalid
+#define ipr_rrf_decrprefd	ipr_flags.prf_rr.decrprefd
 
 struct	in6_rrenumreq {
 	char	irr_name[IFNAMSIZ];
@@ -304,114 +307,136 @@ struct	in6_rrenumreq {
 	u_char	irr_m_maxlen;	/* maxlen for matching prefix */
 	u_char	irr_u_uselen;	/* uselen for adding prefix */
 	u_char	irr_u_keeplen;	/* keeplen from matching prefix */
-	struct	irr_raflagmask {
-		u_char	onlink : 1;
-		u_char	autonomous : 1;
-		u_char	reserved : 6;
+	struct irr_raflagmask {
+		u_char onlink : 1;
+		u_char autonomous : 1;
+		u_char reserved : 6;
 	} irr_raflagmask;
-	u_int32_t	irr_vltime;
-	u_int32_t	irr_pltime;
-	struct	in6_prflags irr_flags;
+	u_int32_t irr_vltime;
+	u_int32_t irr_pltime;
+	struct in6_prflags irr_flags;
 	struct	sockaddr_in6 irr_matchprefix;
 	struct	sockaddr_in6 irr_useprefix;
 };
 
-#define	irr_raf_mask_onlink	irr_raflagmask.onlink
-#define	irr_raf_mask_auto	irr_raflagmask.autonomous
-#define	irr_raf_mask_reserved	irr_raflagmask.reserved
+#define irr_raf_mask_onlink	irr_raflagmask.onlink
+#define irr_raf_mask_auto	irr_raflagmask.autonomous
+#define irr_raf_mask_reserved	irr_raflagmask.reserved
 
-#define	irr_raf_onlink		irr_flags.prf_ra.onlink
-#define	irr_raf_auto		irr_flags.prf_ra.autonomous
+#define irr_raf_onlink		irr_flags.prf_ra.onlink
+#define irr_raf_auto		irr_flags.prf_ra.autonomous
 
-#define	irr_statef_onlink	irr_flags.prf_state.onlink
+#define irr_statef_onlink	irr_flags.prf_state.onlink
 
-#define	irr_rrf			irr_flags.prf_rr
-#define	irr_rrf_decrvalid	irr_flags.prf_rr.decrvalid
-#define	irr_rrf_decrprefd	irr_flags.prf_rr.decrprefd
+#define irr_rrf			irr_flags.prf_rr
+#define irr_rrf_decrvalid	irr_flags.prf_rr.decrvalid
+#define irr_rrf_decrprefd	irr_flags.prf_rr.decrprefd
 
 /*
  * Given a pointer to an in6_ifaddr (ifaddr),
  * return a pointer to the addr as a sockaddr_in6
  */
-#define	IA6_IN6(ia)	(&((ia)->ia_addr.sin6_addr))
-#define	IA6_DSTIN6(ia)	(&((ia)->ia_dstaddr.sin6_addr))
-#define	IA6_MASKIN6(ia)	(&((ia)->ia_prefixmask.sin6_addr))
-#define	IA6_SIN6(ia)	(&((ia)->ia_addr))
-#define	IA6_DSTSIN6(ia)	(&((ia)->ia_dstaddr))
-#define	IFA_IN6(x)	(&((struct sockaddr_in6 *)((x)->ifa_addr))->sin6_addr)
-#define	IFA_DSTIN6(x)	(&((struct sockaddr_in6 *)((x)->ifa_dstaddr))->sin6_addr)
+#define IA6_IN6(ia)	(&((ia)->ia_addr.sin6_addr))
+#define IA6_DSTIN6(ia)	(&((ia)->ia_dstaddr.sin6_addr))
+#define IA6_MASKIN6(ia)	(&((ia)->ia_prefixmask.sin6_addr))
+#define IA6_SIN6(ia)	(&((ia)->ia_addr))
+#define IA6_DSTSIN6(ia)	(&((ia)->ia_dstaddr))
+#define IFA_IN6(x)	(&((struct sockaddr_in6 *)((x)->ifa_addr))->sin6_addr)
+#define IFA_DSTIN6(x)	(&((struct sockaddr_in6 *)((x)->ifa_dstaddr))->sin6_addr)
 
-#define	IFPR_IN6(x)	(&((struct sockaddr_in6 *)((x)->ifpr_prefix))->sin6_addr)
+#define IFPR_IN6(x)	(&((struct sockaddr_in6 *)((x)->ifpr_prefix))->sin6_addr)
 
 #ifdef _KERNEL
-#define	IN6_ARE_MASKED_ADDR_EQUAL(d, a, m)	(	\
+#define IN6_ARE_MASKED_ADDR_EQUAL(d, a, m)	(	\
 	(((d)->s6_addr32[0] ^ (a)->s6_addr32[0]) & (m)->s6_addr32[0]) == 0 && \
 	(((d)->s6_addr32[1] ^ (a)->s6_addr32[1]) & (m)->s6_addr32[1]) == 0 && \
 	(((d)->s6_addr32[2] ^ (a)->s6_addr32[2]) & (m)->s6_addr32[2]) == 0 && \
 	(((d)->s6_addr32[3] ^ (a)->s6_addr32[3]) & (m)->s6_addr32[3]) == 0 )
 #endif
 
-#define	SIOCSIFADDR_IN6		 _IOW('i', 12, struct in6_ifreq)
-#define	SIOCGIFADDR_IN6		_IOWR('i', 33, struct in6_ifreq)
-#define	SIOCSIFDSTADDR_IN6	 _IOW('i', 14, struct in6_ifreq)
-#define	SIOCGIFDSTADDR_IN6	_IOWR('i', 34, struct in6_ifreq)
-#define	SIOCSIFNETMASK_IN6	 _IOW('i', 22, struct in6_ifreq)
-#define	SIOCGIFNETMASK_IN6	_IOWR('i', 37, struct in6_ifreq)
+#define SIOCSIFADDR_IN6		 _IOW('i', 12, struct in6_ifreq)
+#define SIOCGIFADDR_IN6		_IOWR('i', 33, struct in6_ifreq)
+
+#ifdef _KERNEL
+/*
+ * SIOCSxxx ioctls should be unused (see comments in in6.c), but
+ * we do not shift numbers for binary compatibility.
+ */
+#define SIOCSIFDSTADDR_IN6	 _IOW('i', 14, struct in6_ifreq)
+#define SIOCSIFNETMASK_IN6	 _IOW('i', 22, struct in6_ifreq)
+#endif
 
-#define	SIOCDIFADDR_IN6		 _IOW('i', 25, struct in6_ifreq)
-#define	SIOCAIFADDR_IN6		 _IOW('i', 26, struct in6_aliasreq)
+#define SIOCGIFDSTADDR_IN6	_IOWR('i', 34, struct in6_ifreq)
+#define SIOCGIFNETMASK_IN6	_IOWR('i', 37, struct in6_ifreq)
 
-#define	SIOCSIFPHYADDR_IN6       _IOW('i', 70, struct in6_aliasreq)
+#define SIOCDIFADDR_IN6		 _IOW('i', 25, struct in6_ifreq)
+#define SIOCAIFADDR_IN6		 _IOW('i', 26, struct in6_aliasreq)
+
+#define SIOCSIFPHYADDR_IN6       _IOW('i', 70, struct in6_aliasreq)
 #define	SIOCGIFPSRCADDR_IN6	_IOWR('i', 71, struct in6_ifreq)
 #define	SIOCGIFPDSTADDR_IN6	_IOWR('i', 72, struct in6_ifreq)
 
-#define	SIOCGIFAFLAG_IN6	_IOWR('i', 73, struct in6_ifreq)
-
-#define	SIOCGDRLST_IN6		_IOWR('i', 74, struct in6_drlist)
-#define	SIOCGPRLST_IN6		_IOWR('i', 75, struct in6_prlist)
-#define	SIOCGIFINFO_IN6		_IOWR('i', 76, struct in6_ndireq)
-#define	SIOCSNDFLUSH_IN6	_IOWR('i', 77, struct in6_ifreq)
-#define	SIOCGNBRINFO_IN6	_IOWR('i', 78, struct in6_nbrinfo)
-#define	SIOCSPFXFLUSH_IN6	_IOWR('i', 79, struct in6_ifreq)
-#define	SIOCSRTRFLUSH_IN6	_IOWR('i', 80, struct in6_ifreq)
-
-#define	SIOCGIFALIFETIME_IN6	_IOWR('i', 81, struct in6_ifreq)
-#define	SIOCSIFALIFETIME_IN6	_IOWR('i', 82, struct in6_ifreq)
-#define	SIOCGIFSTAT_IN6		_IOWR('i', 83, struct in6_ifreq)
-#define	SIOCGIFSTAT_ICMP6	_IOWR('i', 84, struct in6_ifreq)
-
-#define	SIOCSIFPREFIX_IN6	_IOW('i', 100, struct in6_prefixreq) /* set */
-#define	SIOCGIFPREFIX_IN6	_IOWR('i', 101, struct in6_prefixreq) /* get */
-#define	SIOCDIFPREFIX_IN6	_IOW('i', 102, struct in6_prefixreq) /* del */
-#define	SIOCAIFPREFIX_IN6	_IOW('i', 103, struct in6_rrenumreq) /* add */
-#define	SIOCCIFPREFIX_IN6	_IOW('i', 104, \
+#define SIOCGIFAFLAG_IN6	_IOWR('i', 73, struct in6_ifreq)
+
+#define SIOCGDRLST_IN6		_IOWR('i', 74, struct in6_drlist)
+#define SIOCGPRLST_IN6		_IOWR('i', 75, struct in6_prlist)
+#define SIOCGIFINFO_IN6		_IOWR('i', 76, struct in6_ndireq)
+#define SIOCSNDFLUSH_IN6	_IOWR('i', 77, struct in6_ifreq)
+#define SIOCGNBRINFO_IN6	_IOWR('i', 78, struct in6_nbrinfo)
+#define SIOCSPFXFLUSH_IN6	_IOWR('i', 79, struct in6_ifreq)
+#define SIOCSRTRFLUSH_IN6	_IOWR('i', 80, struct in6_ifreq)
+
+#define SIOCGIFALIFETIME_IN6	_IOWR('i', 81, struct in6_ifreq)
+#define SIOCSIFALIFETIME_IN6	_IOWR('i', 82, struct in6_ifreq)
+#define SIOCGIFSTAT_IN6		_IOWR('i', 83, struct in6_ifreq)
+#define SIOCGIFSTAT_ICMP6	_IOWR('i', 84, struct in6_ifreq)
+
+#define SIOCSDEFIFACE_IN6	_IOWR('i', 85, struct in6_ndifreq)
+#define SIOCGDEFIFACE_IN6	_IOWR('i', 86, struct in6_ndifreq)
+
+#define SIOCSIFINFO_FLAGS	_IOWR('i', 87, struct in6_ndireq) /* XXX */
+
+#define SIOCSSCOPE6		_IOW('i', 88, struct in6_ifreq)
+#define SIOCGSCOPE6		_IOWR('i', 89, struct in6_ifreq)
+#define SIOCGSCOPE6DEF		_IOWR('i', 90, struct in6_ifreq)
+
+#define SIOCSIFPREFIX_IN6	_IOW('i', 100, struct in6_prefixreq) /* set */
+#define SIOCGIFPREFIX_IN6	_IOWR('i', 101, struct in6_prefixreq) /* get */
+#define SIOCDIFPREFIX_IN6	_IOW('i', 102, struct in6_prefixreq) /* del */
+#define SIOCAIFPREFIX_IN6	_IOW('i', 103, struct in6_rrenumreq) /* add */
+#define SIOCCIFPREFIX_IN6	_IOW('i', 104, \
 				     struct in6_rrenumreq) /* change */
-#define	SIOCSGIFPREFIX_IN6	_IOW('i', 105, \
+#define SIOCSGIFPREFIX_IN6	_IOW('i', 105, \
 				     struct in6_rrenumreq) /* set global */
 
-#define	SIOCGETSGCNT_IN6	_IOWR('u', 106, \
+#define SIOCGETSGCNT_IN6	_IOWR('u', 106, \
 				      struct sioc_sg_req6) /* get s,g pkt cnt */
-#define	SIOCGETMIFCNT_IN6	_IOWR('u', 107, \
+#define SIOCGETMIFCNT_IN6	_IOWR('u', 107, \
 				      struct sioc_mif_req6) /* get pkt cnt per if */
 
-#define	IN6_IFF_ANYCAST		0x01	/* anycast address */
-#define	IN6_IFF_TENTATIVE	0x02	/* tentative address */
-#define	IN6_IFF_DUPLICATED	0x04	/* DAD detected duplicate */
-#define	IN6_IFF_DETACHED	0x08	/* may be detached from the link */
-#define	IN6_IFF_DEPRECATED	0x10	/* deprecated address */
+#define IN6_IFF_ANYCAST		0x01	/* anycast address */
+#define IN6_IFF_TENTATIVE	0x02	/* tentative address */
+#define IN6_IFF_DUPLICATED	0x04	/* DAD detected duplicate */
+#define IN6_IFF_DETACHED	0x08	/* may be detached from the link */
+#define IN6_IFF_DEPRECATED	0x10	/* deprecated address */
 
 /* do not input/output */
-#define	IN6_IFF_NOTREADY (IN6_IFF_TENTATIVE|IN6_IFF_DUPLICATED)
+#define IN6_IFF_NOTREADY (IN6_IFF_TENTATIVE|IN6_IFF_DUPLICATED)
+
+#ifdef _KERNEL
+#define IN6_ARE_SCOPE_CMP(a,b) ((a)-(b))
+#define IN6_ARE_SCOPE_EQUAL(a,b) ((a)==(b))
+#endif
 
 #ifdef _KERNEL
-extern struct	in6_ifaddr *in6_ifaddr;
-
-extern struct	in6_ifstat **in6_ifstat;
-extern size_t	in6_ifstatmax;
-extern struct	icmp6stat icmp6stat;
-extern struct	icmp6_ifstat **icmp6_ifstat;
-extern size_t	icmp6_ifstatmax;
-#define	in6_ifstat_inc(ifp, tag) \
+extern struct in6_ifaddr *in6_ifaddr;
+
+extern struct in6_ifstat **in6_ifstat;
+extern size_t in6_ifstatmax;
+extern struct icmp6stat icmp6stat;
+extern struct icmp6_ifstat **icmp6_ifstat;
+extern size_t icmp6_ifstatmax;
+#define in6_ifstat_inc(ifp, tag) \
 do {								\
 	if ((ifp) && (ifp)->if_index <= if_index		\
 	 && (ifp)->if_index < in6_ifstatmax			\
@@ -420,24 +445,25 @@ do {								\
 	}							\
 } while (0)
 
-extern struct	ifqueue ip6intrq;		/* IP6 packet input queue */
-extern struct	in6_addr zeroin6_addr;
-extern u_char	inet6ctlerrmap[];
-extern u_long	in6_maxmtu;
+extern struct ifqueue ip6intrq;		/* IP6 packet input queue */
+extern struct in6_addr zeroin6_addr;
+extern u_char inet6ctlerrmap[];
+extern unsigned long in6_maxmtu;
 #ifdef MALLOC_DECLARE
 MALLOC_DECLARE(M_IPMADDR);
-#endif /* MALLOC_DECLARE */
+#endif
 
 /*
  * Macro for finding the internet address structure (in6_ifaddr) corresponding
  * to a given interface (ifnet structure).
  */
-#define	IFP_TO_IA6(ifp, ia)				\
+
+#define IFP_TO_IA6(ifp, ia)				\
 /* struct ifnet *ifp; */				\
 /* struct in6_ifaddr *ia; */				\
 do {									\
 	struct ifaddr *ifa;						\
-	TAILQ_FOREACH(ifa, &(ifp)->if_addrlist, ifa_list) {		\
+	for (ifa = (ifp)->if_addrlist.tqh_first; ifa; ifa = ifa->ifa_list.tqe_next) {	\
 		if (!ifa->ifa_addr)					\
 			continue;					\
 		if (ifa->ifa_addr->sa_family == AF_INET6)		\
@@ -445,6 +471,7 @@ do {									\
 	}								\
 	(ia) = (struct in6_ifaddr *)ifa;				\
 } while (0)
+
 #endif /* _KERNEL */
 
 /*
@@ -453,11 +480,11 @@ do {									\
  */
 struct in6_multi_mship {
 	struct	in6_multi *i6mm_maddr;	/* Multicast address pointer */
-	LIST_ENTRY(in6_multi_mship)	i6mm_chain;  /* multicast options chain */
+	LIST_ENTRY(in6_multi_mship) i6mm_chain;  /* multicast options chain */
 };
 
 struct	in6_multi {
-	LIST_ENTRY(in6_multi)	in6m_entry; /* list glue */
+	LIST_ENTRY(in6_multi) in6m_entry; /* list glue */
 	struct	in6_addr in6m_addr;	/* IP6 multicast address */
 	struct	ifnet *in6m_ifp;	/* back pointer to ifnet */
 	struct	ifmultiaddr *in6m_ifma;	/* back pointer to ifmultiaddr */
@@ -467,11 +494,6 @@ struct	in6_multi {
 };
 
 #ifdef _KERNEL
-
-#ifdef SYSCTL_DECL
-SYSCTL_DECL(_net_inet6_ip6);
-#endif
-
 extern LIST_HEAD(in6_multihead, in6_multi) in6_multihead;
 
 /*
@@ -489,7 +511,7 @@ struct	in6_multistep {
  * returns NLL.
  */
 
-#define	IN6_LOOKUP_MULTI(addr, ifp, in6m)			\
+#define IN6_LOOKUP_MULTI(addr, ifp, in6m)			\
 /* struct in6_addr addr; */					\
 /* struct ifnet *ifp; */					\
 /* struct in6_multi *in6m; */					\
@@ -512,48 +534,52 @@ do { \
  * and get the first record.  Both macros return a NULL "in6m" when there
  * are no remaining records.
  */
-#define	IN6_NEXT_MULTI(step, in6m)					\
+#define IN6_NEXT_MULTI(step, in6m)					\
 /* struct in6_multistep step; */					\
 /* struct in6_multi *in6m; */						\
 do { \
 	if (((in6m) = (step).i_in6m) != NULL) \
-		(step).i_in6m = LIST_NEXT((step).i_in6m, in6m_entry); \
+		(step).i_in6m = (step).i_in6m->in6m_entry.le_next; \
 } while(0)
 
-#define	IN6_FIRST_MULTI(step, in6m)		\
+#define IN6_FIRST_MULTI(step, in6m)		\
 /* struct in6_multistep step; */		\
 /* struct in6_multi *in6m */			\
 do { \
-	(step).i_in6m = LIST_FIRST(&in6_multihead); \
+	(step).i_in6m = in6_multihead.lh_first; \
 		IN6_NEXT_MULTI((step), (in6m)); \
 } while(0)
 
-int	 in6_ifinit __P((struct ifnet *,
+int	in6_ifinit __P((struct ifnet *,
 			struct in6_ifaddr *, struct sockaddr_in6 *, int));
-struct	 in6_multi *in6_addmulti __P((struct in6_addr *, struct ifnet *,
+struct	in6_multi *in6_addmulti __P((struct in6_addr *, struct ifnet *,
 				     int *));
-void	 in6_delmulti __P((struct in6_multi *));
-void	 in6_ifscrub __P((struct ifnet *, struct in6_ifaddr *));
-extern int	in6_ifindex2scopeid __P((int));
-extern int	in6_mask2len __P((struct in6_addr *));
-extern void	in6_len2mask __P((struct in6_addr *, int));
-int	 in6_control __P((struct socket *,
-			  u_long, caddr_t, struct ifnet *, struct proc *));
-void	 in6_savemkludge __P((struct in6_ifaddr *));
-void	 in6_setmaxmtu   __P((void));
-void	 in6_restoremkludge __P((struct in6_ifaddr *, struct ifnet *));
-struct	 in6_ifaddr *in6ifa_ifpforlinklocal __P((struct ifnet *));
-struct	 in6_ifaddr *in6ifa_ifpwithaddr __P((struct ifnet *,
+void	in6_delmulti __P((struct in6_multi *));
+void	in6_ifscrub __P((struct ifnet *, struct in6_ifaddr *));
+extern int in6_ifindex2scopeid __P((int));
+extern int in6_mask2len __P((struct in6_addr *));
+extern void in6_len2mask __P((struct in6_addr *, int));
+int	in6_control __P((struct socket *,
+			 u_long, caddr_t, struct ifnet *, struct proc *));
+void	in6_purgeaddr __P((struct ifaddr *, struct ifnet *));
+void	in6_savemkludge __P((struct in6_ifaddr *));
+void	in6_setmaxmtu   __P((void));
+void	in6_restoremkludge __P((struct in6_ifaddr *, struct ifnet *));
+void	in6_purgemkludge __P((struct ifnet *));
+struct in6_ifaddr *in6ifa_ifpforlinklocal __P((struct ifnet *, int));
+struct in6_ifaddr *in6ifa_ifpwithaddr __P((struct ifnet *,
 					     struct in6_addr *));
 char	*ip6_sprintf __P((struct in6_addr *));
-int	 in6_matchlen __P((struct in6_addr *, struct in6_addr *));
-int	 in6_are_prefix_equal __P((struct in6_addr *p1, struct in6_addr *p2,
+int	in6_addr2scopeid __P((struct ifnet *, struct in6_addr *));
+int	in6_matchlen __P((struct in6_addr *, struct in6_addr *));
+int	in6_are_prefix_equal __P((struct in6_addr *p1, struct in6_addr *p2,
 				  int len));
-void	 in6_prefixlen2mask __P((struct in6_addr *maskp, int len));
-int	 in6_prefix_ioctl __P((struct socket *so, u_long cmd, caddr_t data,
+void	in6_prefixlen2mask __P((struct in6_addr *maskp, int len));
+int	in6_prefix_ioctl __P((struct socket *so, u_long cmd, caddr_t data,
 			      struct ifnet *ifp));
-int	 in6_prefix_add_ifid __P((int iilen, struct in6_ifaddr *ia));
-void	 in6_prefix_remove_ifid __P((int iilen, struct in6_ifaddr *ia));
+int	in6_prefix_add_ifid __P((int iilen, struct in6_ifaddr *ia));
+void	in6_prefix_remove_ifid __P((int iilen, struct in6_ifaddr *ia));
+void	in6_purgeprefix __P((struct ifnet *));
 #endif /* _KERNEL */
 
 #endif /* _NETINET6_IN6_VAR_H_ */