xnu-792.6.22.tar.gz

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

diff --git a/bsd/netkey/keydb.h b/bsd/netkey/keydb.h
index 1d9ef21cb4e7c83d2e79f3324f68356619df10d0..80b16054f084f3aa34bad6da635f4c5fc7b0c1df 100644 (file)
--- a/bsd/netkey/keydb.h
+++ b/bsd/netkey/keydb.h
@@ -34,7 +34,7 @@
 #include <sys/appleapiopts.h>
 
 #ifdef KERNEL
 #include <sys/appleapiopts.h>
 
 #ifdef KERNEL

-#ifdef __APPLE_API_PRIVATE
+#ifdef KERNEL_PRIVATE

 
 #include <netkey/key_var.h>
 
 
 #include <netkey/key_var.h>
 


@@ -70,7 +70,7 @@ struct secashead {
 /* Security Association */
 struct secasvar {
        LIST_ENTRY(secasvar) chain;
 /* Security Association */
 struct secasvar {
        LIST_ENTRY(secasvar) chain;

-
+       LIST_ENTRY(secasvar) spihash;

        int refcnt;                     /* reference count */
        u_int8_t state;                 /* Status of this Association */
 
        int refcnt;                     /* reference count */
        u_int8_t state;                 /* Status of this Association */
 


@@ -97,6 +97,10 @@ struct secasvar {
        pid_t pid;                      /* message's pid */
 
        struct secashead *sah;          /* back pointer to the secashead */
        pid_t pid;                      /* message's pid */
 
        struct secashead *sah;          /* back pointer to the secashead */

+       
+       /* Nat Traversal related bits */
+       u_int32_t       natt_last_activity;
+       u_int16_t       remote_ike_port;

 };
 
 /* replay prevention */
 };
 
 /* replay prevention */


@@ -140,23 +144,23 @@ struct key_cb {
 };
 
 /* secpolicy */
 };
 
 /* secpolicy */

-extern struct secpolicy *keydb_newsecpolicy __P((void));
-extern void keydb_delsecpolicy __P((struct secpolicy *));
+extern struct secpolicy *keydb_newsecpolicy(void);
+extern void keydb_delsecpolicy(struct secpolicy *);

 /* secashead */
 /* secashead */

-extern struct secashead *keydb_newsecashead __P((void));
-extern void keydb_delsecashead __P((struct secashead *));
+extern struct secashead *keydb_newsecashead(void);
+extern void keydb_delsecashead(struct secashead *);

 /* secasvar */
 /* secasvar */

-extern struct secasvar *keydb_newsecasvar __P((void));
-extern void keydb_refsecasvar __P((struct secasvar *));
-extern void keydb_freesecasvar __P((struct secasvar *));
+extern struct secasvar *keydb_newsecasvar(void);
+extern void keydb_refsecasvar(struct secasvar *);
+extern void keydb_freesecasvar(struct secasvar *);

 /* secreplay */
 /* secreplay */

-extern struct secreplay *keydb_newsecreplay __P((size_t));
-extern void keydb_delsecreplay __P((struct secreplay *));
+extern struct secreplay *keydb_newsecreplay(size_t);
+extern void keydb_delsecreplay(struct secreplay *);

 /* secreg */
 /* secreg */

-extern struct secreg *keydb_newsecreg __P((void));
-extern void keydb_delsecreg __P((struct secreg *));
+extern struct secreg *keydb_newsecreg(void);
+extern void keydb_delsecreg(struct secreg *);

 
 

-#endif /* __APPLE_API_PRIVATE */
+#endif /* KERNEL_PRIVATE */

 #endif /* KERNEL */
 
 #endif /* _NETKEY_KEYDB_H_ */
 #endif /* KERNEL */
 
 #endif /* _NETKEY_KEYDB_H_ */