xnu-2782.40.9.tar.gz

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

diff --git a/bsd/netkey/keydb.h b/bsd/netkey/keydb.h
index dc1563a604995c3fc8279e8e3b65f5b1b0c1fe23..c2e4630738e4e2cb9c512284c458cf0ad92a836f 100644 (file)
--- a/bsd/netkey/keydb.h
+++ b/bsd/netkey/keydb.h
@@ -38,7 +38,7 @@
 #include <netkey/key_var.h>
 #include <net/if_utun.h>
 
 #include <netkey/key_var.h>
 #include <net/if_utun.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 +47,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 +60,8 @@ 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];
        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];


@@ -82,6 +85,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 */


@@ -97,6 +101,8 @@ 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 */
 
        u_int32_t seq;                  /* sequence number */
        pid_t pid;                      /* message's pid */
 


@@ -106,6 +112,7 @@ 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_int32_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_int8_t        always_expire; /* Send expire/delete messages even if unused */
 
        
        u_int8_t        always_expire; /* Send expire/delete messages even if unused */