xnu-6153.61.1.tar.gz

[apple/xnu.git] / bsd / netkey / key_var.h

diff --git a/bsd/netkey/key_var.h b/bsd/netkey/key_var.h
index 6efb8dfe745026251ad31045ba4d7ef3154a3bc8..64a3f26167ae87d8b1d96aa33a5ee8589c5eea41 100644 (file)
--- a/bsd/netkey/key_var.h
+++ b/bsd/netkey/key_var.h
@@ -32,22 +32,25 @@
 #ifndef _NETKEY_KEY_VAR_H_
 #define _NETKEY_KEY_VAR_H_
 #include <sys/appleapiopts.h>
-#ifdef __APPLE_API_PRIVATE
 
 /* 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_ESP_KEYMIN              9
-#define KEYCTL_ESP_AUTH                        10
-#define KEYCTL_AH_KEYMIN               11
-#define KEYCTL_MAXID                   12
+#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_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 BSD_KERNEL_PRIVATE
 #define KEYCTL_NAMES { \
        { 0, 0 }, \
        { "debug", CTLTYPE_INT }, \
@@ -58,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, \
@@ -73,29 +81,14 @@
        &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, \
-//     &ipsec_esp_keymin, \
-//     &ipsec_ah_keymin, \
-//}
-//#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 /* __APPLE_API_PRIVATE */
+#endif /* BSD_KERNEL_PRIVATE */
 #endif /* _NETKEY_KEY_VAR_H_ */