xnu-2422.115.4.tar.gz

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

diff --git a/bsd/netkey/keydb.h b/bsd/netkey/keydb.h
index e304c336f2906ecac6a12f846144b1a848a95b98..dc1563a604995c3fc8279e8e3b65f5b1b0c1fe23 100644 (file)
--- a/bsd/netkey/keydb.h
+++ b/bsd/netkey/keydb.h
@@ -33,10 +33,10 @@
 #define _NETKEY_KEYDB_H_
 #include <sys/appleapiopts.h>
 
-#ifdef KERNEL
-#ifdef KERNEL_PRIVATE
+#ifdef BSD_KERNEL_PRIVATE
 
 #include <netkey/key_var.h>
+#include <net/if_utun.h>
 
 /* Security Assocciation Index */
 /* NOTE: Ensure to be same address family */
@@ -68,6 +68,9 @@ struct secashead {
        struct route sa_route;          /* route cache */
 };
 
+typedef int (*utun_is_keepalive_func) __P((void *, void *, u_int16_t, u_int32_t, size_t));
+typedef int (*utun_input_func) __P((void *, void *, protocol_family_t family));
+
 /* Security Association */
 struct secasvar {
        LIST_ENTRY(secasvar) chain;
@@ -103,6 +106,12 @@ struct secasvar {
        u_int32_t       natt_last_activity;
        u_int16_t       remote_ike_port;
        u_int16_t       natt_encapsulated_src_port;     /* network byte order */
+       
+       u_int8_t        always_expire; /* Send expire/delete messages even if unused */
+
+       void              *utun_pcb;
+       utun_is_keepalive_func    utun_is_keepalive_fn;
+       utun_input_func    utun_in_fn;
 };
 
 /* replay prevention */
@@ -162,7 +171,6 @@ extern void keydb_delsecreplay(struct secreplay *);
 // extern struct secreg *keydb_newsecreg(void);                        // not used
 // extern void keydb_delsecreg(struct secreg *);               // not used
 
-#endif /* KERNEL_PRIVATE */
-#endif /* KERNEL */
+#endif /* BSD_KERNEL_PRIVATE */
 
 #endif /* _NETKEY_KEYDB_H_ */