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, 35 insertions, 35 deletions

diff --git a/sys/netinet6/in6_prefix.h b/sys/netinet6/in6_prefix.h
index fa5a0e3..2ce18db 100644
--- a/sys/netinet6/in6_prefix.h
+++ b/sys/netinet6/in6_prefix.h
@@ -1,3 +1,6 @@
+/*	$FreeBSD$	*/
+/*	$KAME: in6_prefix.h,v 1.6 2000/03/25 07:23:45 sumikawa Exp $	*/
+
 /*
  * Copyright (C) 1995, 1996, 1997, 1998 and 1999 WIDE Project.
  * All rights reserved.
@@ -25,64 +28,61 @@
  * 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$
  */
 
 struct rr_prefix {
-	struct	ifprefix	rp_ifpr;
+	struct ifprefix	rp_ifpr;
 	LIST_ENTRY(rr_prefix) rp_entry;
 	LIST_HEAD(rp_addrhead, rp_addr) rp_addrhead;
-	struct	sockaddr_in6 rp_prefix;	/* prefix */
-	u_int32_t	rp_vltime;	/* advertised valid lifetime */
-	u_int32_t	rp_pltime;	/* advertised preferred lifetime */
-	time_t	rp_expire;	/* expiration time of the prefix */
-	time_t	rp_preferred;	/* preferred time of the prefix */
-	struct	in6_prflags rp_flags;
+	struct sockaddr_in6 rp_prefix;	/* prefix */
+	u_int32_t rp_vltime;	/* advertised valid lifetime */
+	u_int32_t rp_pltime;	/* advertised preferred lifetime */
+	time_t rp_expire;	/* expiration time of the prefix */
+	time_t rp_preferred;	/* preferred time of the prefix */
+	struct in6_prflags rp_flags;
 	u_char	rp_origin; /* from where this prefix info is obtained */
 	struct	rp_stateflags {
 		/* if some prefix should be added to this prefix */
-		u_char	addmark : 1;
-		u_char	delmark : 1; /* if this prefix will be deleted */
+		u_char addmark : 1;
+		u_char delmark : 1; /* if this prefix will be deleted */
 	} rp_stateflags;
 };
 
-#define	rp_type			rp_ifpr.ifpr_type
-#define	rp_ifp			rp_ifpr.ifpr_ifp
-#define	rp_plen			rp_ifpr.ifpr_plen
+#define rp_type		rp_ifpr.ifpr_type
+#define rp_ifp		rp_ifpr.ifpr_ifp
+#define rp_plen		rp_ifpr.ifpr_plen
 
-#define	rp_raf			rp_flags.prf_ra
-#define	rp_raf_onlink		rp_flags.prf_ra.onlink
-#define	rp_raf_auto		rp_flags.prf_ra.autonomous
+#define rp_raf		rp_flags.prf_ra
+#define rp_raf_onlink		rp_flags.prf_ra.onlink
+#define rp_raf_auto		rp_flags.prf_ra.autonomous
 
-#define	rp_statef_addmark	rp_stateflags.addmark
-#define	rp_statef_delmark	rp_stateflags.delmark
+#define rp_statef_addmark	rp_stateflags.addmark
+#define rp_statef_delmark	rp_stateflags.delmark
 
-#define	rp_rrf			rp_flags.prf_rr
-#define	rp_rrf_decrvalid	rp_flags.prf_rr.decrvalid
-#define	rp_rrf_decrprefd	rp_flags.prf_rr.decrprefd
+#define rp_rrf		rp_flags.prf_rr
+#define rp_rrf_decrvalid	rp_flags.prf_rr.decrvalid
+#define rp_rrf_decrprefd	rp_flags.prf_rr.decrprefd
 
 struct rp_addr {
-	LIST_ENTRY(rp_addr) ra_entry;
-	struct	in6_addr	ra_ifid;
-	struct	in6_ifaddr	*ra_addr;
-	struct	ra_flags {
-		u_char	anycast : 1;
+	LIST_ENTRY(rp_addr)	ra_entry;
+	struct in6_addr		ra_ifid;
+	struct in6_ifaddr	*ra_addr;
+	struct ra_flags {
+		u_char anycast : 1;
 	} ra_flags;
 };
 
-#define	ifpr2rp(ifpr)	((struct rr_prefix *)(ifpr))
-#define	rp2ifpr(rp)	((struct ifprefix *)(rp))
+#define ifpr2rp(ifpr)	((struct rr_prefix *)(ifpr))
+#define rp2ifpr(rp)	((struct ifprefix *)(rp))
 
-#define	RP_IN6(rp)	(&(rp)->rp_prefix.sin6_addr)
+#define RP_IN6(rp)	(&(rp)->rp_prefix.sin6_addr)
 
-#define	RR_INFINITE_LIFETIME		0xffffffff
+#define RR_INFINITE_LIFETIME		0xffffffff
 
 
 LIST_HEAD(rr_prhead, rr_prefix);
 
-extern struct	rr_prhead rr_prefix;
+extern struct rr_prhead rr_prefix;
 
-void	in6_rr_timer __P((void *));
-int	delete_each_prefix  __P((struct socket *so, struct rr_prefix *rpp,
-				 u_char origin));
+void in6_rr_timer __P((void *));
+int delete_each_prefix  __P((struct rr_prefix *rpp, u_char origin));