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, 43 insertions, 17 deletions

diff --git a/sys/netkey/keysock.h b/sys/netkey/keysock.h
index 97da6f8..5eed3eb 100644
--- a/sys/netkey/keysock.h
+++ b/sys/netkey/keysock.h
@@ -1,3 +1,6 @@
+/*	$FreeBSD$	*/
+/*	$KAME: keysock.h,v 1.8 2000/03/27 05:11:06 sumikawa Exp $	*/
+
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
@@ -25,32 +28,55 @@
  * 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: keysock.h,v 1.1.6.3.6.1 1999/05/17 17:03:19 itojun Exp $ */
-
 #ifndef _NETKEY_KEYSOCK_H_
-#define	_NETKEY_KEYSOCK_H_
+#define _NETKEY_KEYSOCK_H_
+
+/* statistics for pfkey socket */
+struct pfkeystat {
+	/* kernel -> userland */
+	u_quad_t out_total;		/* # of total calls */
+	u_quad_t out_bytes;		/* total bytecount */
+	u_quad_t out_msgtype[256];	/* message type histogram */
+	u_quad_t out_invlen;		/* invalid length field */
+	u_quad_t out_invver;		/* invalid version field */
+	u_quad_t out_invmsgtype;	/* invalid message type field */
+	u_quad_t out_tooshort;		/* msg too short */
+	u_quad_t out_nomem;		/* memory allocation failure */
+	u_quad_t out_dupext;		/* duplicate extension */
+	u_quad_t out_invexttype;	/* invalid extension type */
+	u_quad_t out_invsatype;		/* invalid sa type */
+	u_quad_t out_invaddr;		/* invalid address extension */
+	/* userland -> kernel */
+	u_quad_t in_total;		/* # of total calls */
+	u_quad_t in_bytes;		/* total bytecount */
+	u_quad_t in_msgtype[256];	/* message type histogram */
+	u_quad_t in_msgtarget[3];	/* one/all/registered */
+	u_quad_t in_nomem;		/* memory allocation failure */
+	/* others */
+	u_quad_t sockerr;		/* # of socket related errors */
+};
+
+#define KEY_SENDUP_ONE		0
+#define KEY_SENDUP_ALL		1
+#define KEY_SENDUP_REGISTERED	2
 
 #ifdef _KERNEL
 struct keycb {
-	struct	rawcb kp_raw;	/* rawcb */
-	int	kp_promisc;		/* promiscuous mode */
-	int	kp_registered;	/* registered socket */
+	struct rawcb kp_raw;	/* rawcb */
+	int kp_promisc;		/* promiscuous mode */
+	int kp_registered;	/* registered socket */
 };
 
-extern int	key_output __P((struct mbuf *, struct socket *));
-extern int	key_usrreq __P((struct socket *, int, struct mbuf *,
-				struct mbuf *, struct mbuf *));
+extern struct pfkeystat pfkeystat;
 
-#define	KEY_SENDUP_ONE		0
-#define	KEY_SENDUP_ALL		1
-#define	KEY_SENDUP_REGISTERED	2
+extern int key_output __P((struct mbuf *, ...));
+extern int key_usrreq __P((struct socket *,
+	int, struct mbuf *, struct mbuf *, struct mbuf *));
 
-extern int	key_sendup __P((struct socket *, struct sadb_msg *, u_int,
-				int));
+extern int key_sendup __P((struct socket *, struct sadb_msg *, u_int, int));
+extern int key_sendup_mbuf __P((struct socket *, struct mbuf *, int));
 #endif /* _KERNEL */
 
-#endif /* _NETKEY_KEYSOCK_H_ */
+#endif /*_NETKEY_KEYSOCK_H_*/