xnu-3789.1.32.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 aa7d7f677dc50646dc9836b2dc1c5854187494eb..7552efebc0f2a21f90ea3aee5375b2b00cde3476 100644 (file)
--- a/bsd/netkey/key_var.h
+++ b/bsd/netkey/key_var.h
@@ -32,7 +32,6 @@
 #ifndef _NETKEY_KEY_VAR_H_
 #define _NETKEY_KEY_VAR_H_
 #include <sys/appleapiopts.h>
-#ifdef __APPLE_API_PRIVATE
 
 /* sysctl */
 #define KEYCTL_DEBUG_LEVEL             1
@@ -47,9 +46,11 @@
 #define KEYCTL_ESP_AUTH                        10
 #define KEYCTL_AH_KEYMIN               11
 #define KEYCTL_PREFERED_OLDSA          12
-#define KEYCTL_NATT_KEEPALIVE_INTERVAL 13
-#define KEYCTL_MAXID                   14
+#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 }, \
@@ -65,6 +66,7 @@
        { "ah_keymin", CTLTYPE_INT }, \
        { "prefered_oldsa", CTLTYPE_INT }, \
        { "natt_keepalive_interval", CTLTYPE_INT }, \
+       { "pfkeystat", CTLTYPE_STRUCT }, \
 }
 
 #define KEYCTL_VARS { \
@@ -83,12 +85,11 @@
        &natt_keepalive_interval, \
 }
 
-#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_ */
+