xnu-3789.1.32.tar.gz

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

diff --git a/bsd/netkey/keydb.h b/bsd/netkey/keydb.h
index 715e5e6fbce1664074690313e5ce80bce4543601..c62dc964c68fe953efdcd97d595ab206a9aeb20b 100644 (file)
--- a/bsd/netkey/keydb.h
+++ b/bsd/netkey/keydb.h
@@ -36,7 +36,6 @@
 #ifdef BSD_KERNEL_PRIVATE
 
 #include <netkey/key_var.h>
-#include <net/if_utun.h>
 
 /* Security Association Index */
 /* NOTE: Ensure to be same address family */
@@ -71,9 +70,6 @@ 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;
@@ -109,17 +105,13 @@ struct secasvar {
        struct secashead *sah;          /* back pointer to the secashead */
        
        /* Nat Traversal related bits */
-       u_int32_t       natt_last_activity;
+       u_int64_t       natt_last_activity;
        u_int16_t       remote_ike_port;
        u_int16_t       natt_encapsulated_src_port;     /* network byte order */
        u_int16_t       natt_interval; /* Interval in seconds */
        u_int16_t       natt_offload_interval; /* Hardware Offload Interval in seconds */
        
        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 */