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, 30 insertions, 38 deletions

diff --git a/sys/netkey/key_var.h b/sys/netkey/key_var.h
index 85e4b92..b7a62ba 100644
--- a/sys/netkey/key_var.h
+++ b/sys/netkey/key_var.h
@@ -1,3 +1,6 @@
+/*	$FreeBSD$	*/
+/*	$KAME: key_var.h,v 1.8 2000/05/24 17:28:23 itojun Exp $	*/
+
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
@@ -25,50 +28,39 @@
  * 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$
  */
 
 #ifndef _NETKEY_KEY_VAR_H_
-#define	_NETKEY_KEY_VAR_H_
+#define _NETKEY_KEY_VAR_H_
 
 /* sysctl */
-#define	KEYCTL_DEBUG_LEVEL		1
-#define	KEYCTL_SPI_TRY			2
-#define	KEYCTL_SPI_MIN_VALUE		3
-#define	KEYCTL_SPI_MAX_VALUE		4
-#define	KEYCTL_RANDOM_INT		5
-#define	KEYCTL_LARVAL_LIFETIME		6
-#define	KEYCTL_BLOCKACQ_COUNT		7
-#define	KEYCTL_BLOCKACQ_LIFETIME	8
-#define	KEYCTL_MAXID			9
-
-#define	_ARRAYLEN(p) (sizeof(p)/sizeof(p[0]))
-#define	_KEYLEN(key) ((u_int)((key)->sadb_key_bits >> 3))
-#define	_KEYBITS(key) ((u_int)((key)->sadb_key_bits))
-#define	_KEYBUF(key) ((caddr_t)((caddr_t)(key) + sizeof(struct sadb_key)))
+#define KEYCTL_DEBUG_LEVEL		1
+#define KEYCTL_SPI_TRY			2
+#define KEYCTL_SPI_MIN_VALUE		3
+#define KEYCTL_SPI_MAX_VALUE		4
+#define KEYCTL_RANDOM_INT		5
+#define KEYCTL_LARVAL_LIFETIME		6
+#define KEYCTL_BLOCKACQ_COUNT		7
+#define KEYCTL_BLOCKACQ_LIFETIME	8
+#define KEYCTL_MAXID			9
 
-#define	_INADDR(in) ((struct sockaddr_in *)(in))
-#define	_IN6ADDR(in6) ((struct sockaddr_in6 *)(in6))
-#define	_SALENBYAF(family) \
-	(((family) == AF_INET) ? \
-		(u_int)sizeof(struct sockaddr_in) : \
-		(u_int)sizeof(struct sockaddr_in6))
-#define	_INALENBYAF(family) \
-	(((family) == AF_INET) ? \
-		(u_int)sizeof(struct in_addr) : \
-		(u_int)sizeof(struct in6_addr))
-#define	_INADDRBYSA(saddr) \
-	((((struct sockaddr *)(saddr))->sa_family == AF_INET) ? \
-		(caddr_t)&((struct sockaddr_in *)(saddr))->sin_addr : \
-		(caddr_t)&((struct sockaddr_in6 *)(saddr))->sin6_addr)
-#define	_INPORTBYSA(saddr) \
-	((((struct sockaddr *)(saddr))->sa_family == AF_INET) ? \
-		((struct sockaddr_in *)(saddr))->sin_port : \
-		((struct sockaddr_in6 *)(saddr))->sin6_port)
+#define KEYCTL_NAMES { \
+	{ 0, 0 }, \
+	{ "debug", CTLTYPE_INT }, \
+	{ "spi_try", CTLTYPE_INT }, \
+	{ "spi_min_value", CTLTYPE_INT }, \
+	{ "spi_max_value", CTLTYPE_INT }, \
+	{ "random_int", CTLTYPE_INT }, \
+	{ "larval_lifetime", CTLTYPE_INT }, \
+	{ "blockacq_count", CTLTYPE_INT }, \
+	{ "blockacq_lifetime", CTLTYPE_INT }, \
+}
 
-#ifdef SYSCTL_DECL
-SYSCTL_DECL(_net_key);
-#endif
+#ifdef _KERNEL
+#define _ARRAYLEN(p) (sizeof(p)/sizeof(p[0]))
+#define _KEYLEN(key) ((u_int)((key)->sadb_key_bits >> 3))
+#define _KEYBITS(key) ((u_int)((key)->sadb_key_bits))
+#define _KEYBUF(key) ((caddr_t)((caddr_t)(key) + sizeof(struct sadb_key)))
+#endif /*_KERNEL*/
 
 #endif /* _NETKEY_KEY_VAR_H_ */