X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/1c79356b52d46aa6b508fb032f5ae709b1f2897b..21362eb3e66fd2c787aee132bce100a44d71a99c:/bsd/netkey/key_var.h

diff --git a/bsd/netkey/key_var.h b/bsd/netkey/key_var.h
index ac785a140..7f3f45c52 100644
--- a/bsd/netkey/key_var.h
+++ b/bsd/netkey/key_var.h
@@ -31,12 +31,7 @@
 
 #ifndef _NETKEY_KEY_VAR_H_
 #define _NETKEY_KEY_VAR_H_
-
-#ifdef __NetBSD__
-#if defined(_KERNEL) && !defined(_LKM)
-#include "opt_inet.h"
-#endif
-#endif
+#include <sys/appleapiopts.h>
 
 /* sysctl */
 #define KEYCTL_DEBUG_LEVEL		1
@@ -47,8 +42,15 @@
 #define KEYCTL_LARVAL_LIFETIME		6
 #define KEYCTL_BLOCKACQ_COUNT		7
 #define KEYCTL_BLOCKACQ_LIFETIME	8
-#define KEYCTL_MAXID			9
+#define KEYCTL_ESP_KEYMIN		9
+#define KEYCTL_ESP_AUTH			10
+#define KEYCTL_AH_KEYMIN		11
+#define KEYCTL_PREFERED_OLDSA		12
+#define KEYCTL_NATT_KEEPALIVE_INTERVAL	13
+#define KEYCTL_PFKEYSTAT		14
+#define KEYCTL_MAXID			15
 
+#ifdef KERNEL_PRIVATE
 #define KEYCTL_NAMES { \
 	{ 0, 0 }, \
 	{ "debug", CTLTYPE_INT }, \
@@ -59,9 +61,14 @@
 	{ "larval_lifetime", CTLTYPE_INT }, \
 	{ "blockacq_count", CTLTYPE_INT }, \
 	{ "blockacq_lifetime", CTLTYPE_INT }, \
+	{ "esp_keymin", CTLTYPE_INT }, \
+	{ "esp_auth", CTLTYPE_INT }, \
+	{ "ah_keymin", CTLTYPE_INT }, \
+	{ "prefered_oldsa", CTLTYPE_INT }, \
+	{ "natt_keepalive_interval", CTLTYPE_INT }, \
+	{ "pfkeystat", CTLTYPE_STRUCT }, \
 }
 
-//#if IPSEC_DEBUG
 #define KEYCTL_VARS { \
 	0, \
 	&key_debug_level, \
@@ -72,62 +79,19 @@
 	&key_larval_lifetime, \
 	&key_blockacq_count, \
 	&key_blockacq_lifetime, \
+	&ipsec_esp_keymin, \
+	&ipsec_ah_keymin, \
+	&ipsec_prefered_oldsa, \
+	&natt_keepalive_interval, \
 }
-//#else
-//#define KEYCTL_VARS { \
-//	0, \
-//	0, \
-//	&key_spi_trycnt, \
-//	&key_spi_minval, \
-//	&key_spi_maxval, \
-//	&key_int_random, \
-//	&key_larval_lifetime, \
-//	&key_blockacq_count, \
-//	&key_blockacq_lifetime, \
-//}
-//#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*/
 
-#define _INADDR(in) ((struct sockaddr_in *)(in))
-
-#if defined(INET6)
-#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)
-#if 0
-#define _SADDRBYSA(saddr) \
-	((((struct sockaddr *)(saddr))->sa_family == AF_INET) ? \
-		(caddr_t)&((struct sockaddr_in *)(saddr))->sin_addr.s_addr : \
-		(caddr_t)&((struct sockaddr_in6 *)(saddr))->sin6_addr.s6_addr)
-#endif
-#else
-#define _IN6ADDR(in6) "#error"
-#define _SALENBYAF(family) sizeof(struct sockaddr_in)
-#define _INALENBYAF(family) sizeof(struct in_addr)
-#define _INADDRBYSA(saddr) ((caddr_t)&((struct sockaddr_in *)(saddr))->sin_addr)
-#define _INPORTBYSA(saddr) (((struct sockaddr_in *)(saddr))->sin_port)
-#if 0
-#define _SADDRBYSA(saddr) \
-	((caddr_t)&((struct sockaddr_in *)(saddr))->sin_addr.s_addr)
-#endif
-#endif /* defined(INET6) */
-
+#endif /* KERNEL_PRIVATE */
 #endif /* _NETKEY_KEY_VAR_H_ */
+