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, 117 insertions, 69 deletions

diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h
index 2e70bcb..f6f3824 100644
--- a/sys/netinet6/ip6_var.h
+++ b/sys/netinet6/ip6_var.h
@@ -1,3 +1,6 @@
+/*	$FreeBSD$	*/
+/*	$KAME: ip6_var.h,v 1.33 2000/06/11 14:59:20 jinmei Exp $	*/
+
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
@@ -25,8 +28,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 /*
@@ -72,35 +73,37 @@
  * being reassembled is attached to one of these structures.
  */
 struct	ip6q {
-	u_long	ip6q_head;
-	u_short	ip6q_len;
-	u_char	ip6q_nxt;
-	u_char	ip6q_hlim;
-	struct	ip6asfrag *ip6q_down;
-	struct	ip6asfrag *ip6q_up;
-	u_long	ip6q_ident;
-	u_char	ip6q_arrive;
-	u_char	ip6q_ttl;
-	struct  in6_addr ip6q_src, ip6q_dst;
-	struct	ip6q *ip6q_next;
-	struct	ip6q *ip6q_prev;
-	int	ip6q_unfrglen;
+	u_int32_t	ip6q_head;
+	u_int16_t	ip6q_len;
+	u_int8_t	ip6q_nxt;	/* ip6f_nxt in first fragment */
+	u_int8_t	ip6q_hlim;
+	struct ip6asfrag *ip6q_down;
+	struct ip6asfrag *ip6q_up;
+	u_int32_t	ip6q_ident;
+	u_int8_t	ip6q_arrive;
+	u_int8_t	ip6q_ttl;
+	struct in6_addr	ip6q_src, ip6q_dst;
+	struct ip6q	*ip6q_next;
+	struct ip6q	*ip6q_prev;
+	int		ip6q_unfrglen;	/* len of unfragmentable part */
+#ifdef notyet
+	u_char		*ip6q_nxtp;
+#endif
 };
 
 struct	ip6asfrag {
-	u_long	ip6af_head;
-	u_short	ip6af_len;
-	u_char	ip6af_nxt;
-	u_char	ip6af_hlim;
+	u_int32_t	ip6af_head;
+	u_int16_t	ip6af_len;
+	u_int8_t	ip6af_nxt;
+	u_int8_t	ip6af_hlim;
 	/* must not override the above members during reassembling */
-	struct	ip6asfrag *ip6af_down;
-	struct	ip6asfrag *ip6af_up;
-	u_short	ip6af_mff;
-	u_short	ip6af_off;
-	struct	mbuf *ip6af_m;
-	u_long	ip6af_offset;		/* offset where next header starts */
-	u_short ip6af_frglen;	/* fragmentable part length */
-	u_char	ip6af_x1[10];
+	struct ip6asfrag *ip6af_down;
+	struct ip6asfrag *ip6af_up;
+	struct mbuf	*ip6af_m;
+	int		ip6af_offset;	/* offset in ip6af_m to next header */
+	int		ip6af_frglen;	/* fragmentable part length */
+	int		ip6af_off;	/* fragment offset */
+	u_int16_t	ip6af_mff;	/* more fragment bit in frag off */
 };
 
 #define IP6_REASS_MBUF(ip6af) (*(struct mbuf **)&((ip6af)->ip6af_m))
@@ -121,8 +124,8 @@ struct	ip6po_rhinfo {
 	struct	ip6_rthdr *ip6po_rhi_rthdr; /* Routing header */
 	struct	route_in6 ip6po_rhi_route; /* Route to the 1st hop */
 };
-#define	ip6po_rthdr	ip6po_rhinfo.ip6po_rhi_rthdr
-#define	ip6po_route	ip6po_rhinfo.ip6po_rhi_route
+#define ip6po_rthdr	ip6po_rhinfo.ip6po_rhi_rthdr
+#define ip6po_route	ip6po_rhinfo.ip6po_rhi_route
 
 struct	ip6_pktopts {
 	struct	mbuf *ip6po_m;	/* Pointer to mbuf storing the data */
@@ -136,49 +139,88 @@ struct	ip6_pktopts {
 };
 
 struct	ip6stat {
-	u_long	ip6s_total;		/* total packets received */
-	u_long 	ip6s_tooshort;		/* packet too short */
-	u_long 	ip6s_toosmall;		/* not enough data */
-	u_long 	ip6s_fragments;		/* fragments received */
-	u_long 	ip6s_fragdropped;       /* frags dropped(dups, out of space) */
-	u_long 	ip6s_fragtimeout;	/* fragments timed out */
-	u_long	ip6s_fragoverflow;	/* fragments that exceeded limit */
-	u_long  ip6s_forward;		/* packets forwarded */
-	u_long 	ip6s_cantforward;	/* packets rcvd for unreachable dest */
-	u_long 	ip6s_redirectsent;	/* packets forwarded on same net */
-	u_long 	ip6s_delivered;	        /* datagrams delivered to upper level*/
-	u_long 	ip6s_localout;		/* total ip packets generated here */
-	u_long 	ip6s_odropped;		/* lost packets due to nobufs, etc. */
-	u_long 	ip6s_reassembled;	/* total packets reassembled ok */
-	u_long 	ip6s_fragmented;	/* datagrams sucessfully fragmented */
-	u_long 	ip6s_ofragments;	/* output fragments created */
-	u_long 	ip6s_cantfrag;		/* don't fragment flag was set, etc. */
-	u_long 	ip6s_badoptions;	/* error in option processing */
-	u_long 	ip6s_noroute;		/* packets discarded due to no route */
-	u_long 	ip6s_badvers;		/* ip6 version != 6 */
-	u_long 	ip6s_rawout;		/* total raw ip packets generated */
-	u_long	ip6s_badscope;		/* scope error */
-	u_long	ip6s_notmember;		/* don't join this multicast group */
-	u_long	ip6s_nxthist[256];	/* next header history */
-	u_long	ip6s_m1;		/* one mbuf */
-	u_long	ip6s_m2m[32];		/* two or more mbuf */
-	u_long	ip6s_mext1;		/* one ext mbuf */
-	u_long	ip6s_mext2m;		/* two or more ext mbuf */
-	u_long	ip6s_exthdrtoolong;	/* ext hdr are not continuous */
-	u_long	ip6s_nogif;		/* no match gif found */
-	u_long	ip6s_toomanyhdr;	/* discarded due to too many headers */
+	u_quad_t ip6s_total;		/* total packets received */
+	u_quad_t ip6s_tooshort;		/* packet too short */
+	u_quad_t ip6s_toosmall;		/* not enough data */
+	u_quad_t ip6s_fragments;	/* fragments received */
+	u_quad_t ip6s_fragdropped;	/* frags dropped(dups, out of space) */
+	u_quad_t ip6s_fragtimeout;	/* fragments timed out */
+	u_quad_t ip6s_fragoverflow;	/* fragments that exceeded limit */
+	u_quad_t ip6s_forward;		/* packets forwarded */
+	u_quad_t ip6s_cantforward;	/* packets rcvd for unreachable dest */
+	u_quad_t ip6s_redirectsent;	/* packets forwarded on same net */
+	u_quad_t ip6s_delivered;	/* datagrams delivered to upper level*/
+	u_quad_t ip6s_localout;		/* total ip packets generated here */
+	u_quad_t ip6s_odropped;		/* lost packets due to nobufs, etc. */
+	u_quad_t ip6s_reassembled;	/* total packets reassembled ok */
+	u_quad_t ip6s_fragmented;	/* datagrams sucessfully fragmented */
+	u_quad_t ip6s_ofragments;	/* output fragments created */
+	u_quad_t ip6s_cantfrag;		/* don't fragment flag was set, etc. */
+	u_quad_t ip6s_badoptions;	/* error in option processing */
+	u_quad_t ip6s_noroute;		/* packets discarded due to no route */
+	u_quad_t ip6s_badvers;		/* ip6 version != 6 */
+	u_quad_t ip6s_rawout;		/* total raw ip packets generated */
+	u_quad_t ip6s_badscope;		/* scope error */
+	u_quad_t ip6s_notmember;	/* don't join this multicast group */
+	u_quad_t ip6s_nxthist[256];	/* next header history */
+	u_quad_t ip6s_m1;		/* one mbuf */
+	u_quad_t ip6s_m2m[32];		/* two or more mbuf */
+	u_quad_t ip6s_mext1;		/* one ext mbuf */
+	u_quad_t ip6s_mext2m;		/* two or more ext mbuf */
+	u_quad_t ip6s_exthdrtoolong;	/* ext hdr are not continuous */
+	u_quad_t ip6s_nogif;		/* no match gif found */
+	u_quad_t ip6s_toomanyhdr;	/* discarded due to too many headers */
+	/* XXX the following two items are not really AF_INET6 thing */
+	u_quad_t ip6s_exthdrget;	/* # of calls to IP6_EXTHDR_GET */
+	u_quad_t ip6s_exthdrget0;	/* # of calls to IP6_EXTHDR_GET0 */
+	u_quad_t ip6s_pulldown;		/* # of calls to m_pulldown */
+	u_quad_t ip6s_pulldown_copy;	/* # of mbuf copies in m_pulldown */
+	u_quad_t ip6s_pulldown_alloc;	/* # of mbuf allocs in m_pulldown */
+	u_quad_t ip6s_pullup;		/* # of calls to m_pullup */
+	u_quad_t ip6s_pullup_copy;	/* # of possible m_pullup copies */
+	u_quad_t ip6s_pullup_alloc;	/* # of possible m_pullup mallocs */
+	u_quad_t ip6s_pullup_fail;	/* # of possible m_pullup failures */
+	u_quad_t ip6s_pullup2;		/* # of calls to m_pullup2 */
+	u_quad_t ip6s_pullup2_copy;	/* # of possible m_pullup2 copies */
+	u_quad_t ip6s_pullup2_alloc;	/* # of possible m_pullup2 mallocs */
+	u_quad_t ip6s_pullup2_fail;	/* # of possible m_pullup2 failures */
+
+	/*
+	 * statistics for improvement of the source address selection
+	 * algorithm:
+	 * XXX: hardcoded 16 = # of ip6 multicast scope types + 1
+	 */
+	/* number of times that address selection fails */
+	u_quad_t ip6s_sources_none;
+	/* number of times that an address on the outgoing I/F is chosen */
+	u_quad_t ip6s_sources_sameif[16];
+	/* number of times that an address on a non-outgoing I/F is chosen */
+	u_quad_t ip6s_sources_otherif[16];
+	/*
+	 * number of times that an address that has the same scope
+	 * from the destination is chosen.
+	 */
+	u_quad_t ip6s_sources_samescope[16];
+	/*
+	 * number of times that an address that has a different scope
+	 * from the destination is chosen.
+	 */
+	u_quad_t ip6s_sources_otherscope[16];
+	/* number of times that an deprecated address is chosen */
+	u_quad_t ip6s_sources_deprecated[16];
+
+	u_quad_t ip6s_forward_cachehit;
+	u_quad_t ip6s_forward_cachemiss;
 };
 
 #ifdef _KERNEL
 /* flags passed to ip6_output as last parameter */
 #define	IPV6_DADOUTPUT		0x01	/* DAD */
 #define	IPV6_FORWARDING		0x02	/* most of IPv6 header exists */
-#define	IPV6_SOCKINMRCVIF	0x100	/* IPSEC hack;
-					 * socket pointer in sending
-					 * packet's m_pkthdr.rcvif */
+#define	IPV6_MINMTU		0x04	/* use minimum MTU (IPV6_USE_MIN_MTU) */
 
 extern struct	ip6stat ip6stat;	/* statistics */
-extern u_int32_t	ip6_id;		/* fragment identifier */
+extern u_int32_t ip6_id;		/* fragment identifier */
 extern int	ip6_defhlim;		/* default hop limit */
 extern int	ip6_defmcasthlim;	/* default multicast hop limit */
 extern int	ip6_forwarding;		/* act as router? */
@@ -189,7 +231,7 @@ extern int	ip6_rr_prune;		/* router renumbering prefix
 					 * walk list every 5 sec.    */
 extern int	ip6_mapped_addr_on;
 
-extern struct	socket *ip6_mrouter; 	/* multicast routing daemon */
+extern struct socket *ip6_mrouter; 	/* multicast routing daemon */
 extern int	ip6_sendredirects;	/* send IP redirects when forwarding? */
 extern int	ip6_maxfragpackets; /* Maximum packets in reassembly queue */
 extern int	ip6_sourcecheck;	/* Verify source interface */
@@ -201,12 +243,13 @@ extern time_t	ip6_log_time;
 extern int	ip6_hdrnestlimit; /* upper limit of # of extension headers */
 extern int	ip6_dad_count;		/* DupAddrDetectionTransmits */
 
-extern u_int32_t	ip6_flow_seq;
-extern int	ip6_auto_flowlabel;
+extern u_int32_t ip6_flow_seq;
+extern int ip6_auto_flowlabel;
 
 extern struct	pr_usrreqs rip6_usrreqs;
-struct	sockopt;
-struct	inpcb;
+struct sockopt;
+
+struct inpcb;
 
 int	icmp6_ctloutput __P((struct socket *, struct sockopt *sopt));
 
@@ -216,6 +259,8 @@ void	ip6_input __P((struct mbuf *));
 void	ip6_freemoptions __P((struct ip6_moptions *));
 int	ip6_unknown_opt __P((u_int8_t *, struct mbuf *, int));
 char *	ip6_get_prevhdr __P((struct mbuf *, int));
+int	ip6_nexthdr __P((struct mbuf *, int, int, int *));
+int	ip6_lasthdr __P((struct mbuf *, int, int, int *));
 int	ip6_mforward __P((struct ip6_hdr *, struct ifnet *, struct mbuf *));
 int	ip6_process_hopopts __P((struct mbuf *, u_int8_t *, int, u_int32_t *,
 				 u_int32_t *));
@@ -231,6 +276,8 @@ int	ip6_output __P((struct mbuf *, struct ip6_pktopts *,
 			struct ip6_moptions *, struct ifnet **));
 int	ip6_ctloutput __P((struct socket *, struct sockopt *sopt));
 int	ip6_setpktoptions __P((struct mbuf *, struct ip6_pktopts *, int));
+void	ip6_clearpktopts __P((struct ip6_pktopts *, int, int));
+struct ip6_pktopts *ip6_copypktopts __P((struct ip6_pktopts *, int));
 int	ip6_optlen __P((struct inpcb *));
 
 int	route6_input __P((struct mbuf **, int *, int));
@@ -242,6 +289,7 @@ void	frag6_drain __P((void));
 
 void	rip6_init __P((void));
 int	rip6_input __P((struct mbuf **mp, int *offp, int proto));
+void	rip6_ctlinput __P((int, struct sockaddr *, void *));
 int	rip6_ctloutput __P((struct socket *so, struct sockopt *sopt));
 int	rip6_output __P((struct mbuf *, ...));
 int	rip6_usrreq __P((struct socket *,