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 1d9ef21cb4e7c83d2e79f3324f68356619df10d0..c62dc964c68fe953efdcd97d595ab206a9aeb20b 100644 (file)
--- a/bsd/netkey/keydb.h
+++ b/bsd/netkey/keydb.h
@@ -33,12 +33,11 @@
 #define _NETKEY_KEYDB_H_
 #include <sys/appleapiopts.h>
 
 #define _NETKEY_KEYDB_H_
 #include <sys/appleapiopts.h>
 

-#ifdef KERNEL
-#ifdef __APPLE_API_PRIVATE
+#ifdef BSD_KERNEL_PRIVATE

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

-/* Security Assocciation Index */
+/* Security Association Index */

 /* NOTE: Ensure to be same address family */
 struct secasindex {
        struct sockaddr_storage src;    /* srouce address for SA */
 /* NOTE: Ensure to be same address family */
 struct secasindex {
        struct sockaddr_storage src;    /* srouce address for SA */


@@ -47,6 +46,7 @@ struct secasindex {
        u_int8_t mode;                  /* mode of protocol, see ipsec.h */
        u_int32_t reqid;                /* reqid id who owned this SA */
                                        /* see IPSEC_MANUAL_REQID_MAX. */
        u_int8_t mode;                  /* mode of protocol, see ipsec.h */
        u_int32_t reqid;                /* reqid id who owned this SA */
                                        /* see IPSEC_MANUAL_REQID_MAX. */

+       u_int ipsec_ifindex;

 };
 
 /* Security Association Data Base */
 };
 
 /* Security Association Data Base */


@@ -59,6 +59,9 @@ struct secashead {
        struct sadb_ident *identd;      /* destination identity */
                                        /* XXX I don't know how to use them. */
 
        struct sadb_ident *identd;      /* destination identity */
                                        /* XXX I don't know how to use them. */
 

+       ifnet_t ipsec_if;
+       u_int outgoing_if;
+       u_int8_t dir;                   /* IPSEC_DIR_INBOUND or IPSEC_DIR_OUTBOUND */

        u_int8_t state;                 /* MATURE or DEAD. */
        LIST_HEAD(_satree, secasvar) savtree[SADB_SASTATE_MAX+1];
                                        /* SA chain */
        u_int8_t state;                 /* MATURE or DEAD. */
        LIST_HEAD(_satree, secasvar) savtree[SADB_SASTATE_MAX+1];
                                        /* SA chain */


@@ -70,7 +73,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 */
 


@@ -78,6 +81,7 @@ struct secasvar {
        u_int8_t alg_enc;               /* Cipher Algorithm Identifier */
        u_int32_t spi;                  /* SPI Value, network byte order */
        u_int32_t flags;                /* holder for SADB_KEY_FLAGS */
        u_int8_t alg_enc;               /* Cipher Algorithm Identifier */
        u_int32_t spi;                  /* SPI Value, network byte order */
        u_int32_t flags;                /* holder for SADB_KEY_FLAGS */

+       u_int16_t flags2;               /* holder for SADB_SA2_KEY_FLAGS */

 
        struct sadb_key *key_auth;      /* Key for Authentication */
        struct sadb_key *key_enc;       /* Key for Encryption */
 
        struct sadb_key *key_auth;      /* Key for Authentication */
        struct sadb_key *key_enc;       /* Key for Encryption */


@@ -93,10 +97,21 @@ struct secasvar {
        struct sadb_lifetime *lft_h;    /* HARD lifetime */
        struct sadb_lifetime *lft_s;    /* SOFT lifetime */
 
        struct sadb_lifetime *lft_h;    /* HARD lifetime */
        struct sadb_lifetime *lft_s;    /* SOFT lifetime */
 

+       struct socket *so; /* Associated socket */
+

        u_int32_t seq;                  /* sequence number */
        pid_t pid;                      /* message's pid */
 
        struct secashead *sah;          /* back pointer to the secashead */
        u_int32_t seq;                  /* sequence number */
        pid_t pid;                      /* message's pid */
 
        struct secashead *sah;          /* back pointer to the secashead */

+       
+       /* Nat Traversal related bits */
+       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 */

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


@@ -140,23 +155,22 @@ 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 *); // not used

 /* 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);            // not used
+// extern void keydb_refsecasvar(struct secasvar *);   // not used
+// extern void keydb_freesecasvar(struct secasvar *);  // not used

 /* 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);                        // not used
+// extern void keydb_delsecreg(struct secreg *);               // not used

 
 

-#endif /* __APPLE_API_PRIVATE */
-#endif /* KERNEL */
+#endif /* BSD_KERNEL_PRIVATE */

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