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, 24 insertions, 25 deletions

diff --git a/sys/netkey/key.h b/sys/netkey/key.h
index 2062a24..65a2755 100644
--- a/sys/netkey/key.h
+++ b/sys/netkey/key.h
@@ -1,3 +1,6 @@
+/*	$FreeBSD$	*/
+/*	$KAME: key.h,v 1.17 2000/06/12 07:01:13 itojun Exp $	*/
+
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
@@ -25,14 +28,10 @@
  * 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$
  */
 
-/* $Id: key.h,v 1.1.6.1.6.1 1999/05/17 17:03:14 itojun Exp $ */
-
 #ifndef _NETKEY_KEY_H_
-#define	_NETKEY_KEY_H_
+#define _NETKEY_KEY_H_
 
 #ifdef _KERNEL
 
@@ -47,32 +46,32 @@ struct socket;
 struct sadb_msg;
 struct sadb_x_policy;
 
-extern struct secpolicy *key_allocsp __P((struct secpolicyindex *spidx,
-					u_int dir));
-extern int key_checkrequest __P((struct ipsecrequest *isr));
-extern struct secasvar *key_allocsa __P((u_int family, caddr_t src, caddr_t dst,
-					u_int proto, u_int32_t spi));
-extern void key_freesp __P((struct secpolicy *sp));
-extern void key_freeso __P((struct socket *so));
-extern void key_freesav __P((struct secasvar *sav));
+extern struct secpolicy *key_allocsp __P((struct secpolicyindex *, u_int));
+extern int key_checkrequest
+	__P((struct ipsecrequest *isr, struct secasindex *));
+extern struct secasvar *key_allocsa __P((u_int, caddr_t, caddr_t,
+					u_int, u_int32_t));
+extern void key_freesp __P((struct secpolicy *));
+extern void key_freeso __P((struct socket *));
+extern void key_freesav __P((struct secasvar *));
 extern struct secpolicy *key_newsp __P((void));
-extern struct secpolicy *key_msg2sp __P((struct sadb_x_policy *xpl0));
-extern struct sadb_x_policy *key_sp2msg __P((struct secpolicy *sp));
-extern int key_ismyaddr __P((u_int family, caddr_t addr));
+extern struct secpolicy *key_msg2sp __P((struct sadb_x_policy *,
+	size_t, int *));
+extern struct mbuf *key_sp2msg __P((struct secpolicy *));
+extern int key_ismyaddr __P((struct sockaddr *));
+extern int key_spdacquire __P((struct secpolicy *));
 extern void key_timehandler __P((void));
-extern void key_srandom __P((void));
-extern void key_freereg __P((struct socket *so));
-extern int key_parse __P((struct sadb_msg **msgp, struct socket *so,
-			int *targetp));
+extern void key_freereg __P((struct socket *));
+extern int key_parse __P((struct mbuf *, struct socket *));
 extern void key_init __P((void));
-extern int key_checktunnelsanity __P((struct secasvar *sav, u_int family,
-					caddr_t src, caddr_t dst));
-extern void key_sa_recordxfer __P((struct secasvar *sav, struct mbuf *m));
-extern void key_sa_routechange __P((struct sockaddr *dst));
+extern int key_checktunnelsanity __P((struct secasvar *, u_int,
+					caddr_t, caddr_t));
+extern void key_sa_recordxfer __P((struct secasvar *, struct mbuf *));
+extern void key_sa_routechange __P((struct sockaddr *));
 
 #ifdef MALLOC_DECLARE
 MALLOC_DECLARE(M_SECA);
 #endif /* MALLOC_DECLARE */
 
-#endif /* _KERNEL */
+#endif /* defined(_KERNEL) */
 #endif /* _NETKEY_KEY_H_ */