From a341a68fac045e94a45aa3fb1f7ac3e821e8a8be Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Thu, 25 Sep 2008 13:56:23 +0000 Subject: merging renaming of mode_t to ipsec_mode_t back to trunk --- src/charon/kernel/kernel_ipsec.h | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'src/charon/kernel/kernel_ipsec.h') diff --git a/src/charon/kernel/kernel_ipsec.h b/src/charon/kernel/kernel_ipsec.h index b8ca3c91b..342d6ceb2 100644 --- a/src/charon/kernel/kernel_ipsec.h +++ b/src/charon/kernel/kernel_ipsec.h @@ -26,6 +26,7 @@ #ifndef KERNEL_IPSEC_H_ #define KERNEL_IPSEC_H_ +typedef enum ipsec_mode_t ipsec_mode_t; typedef enum policy_dir_t policy_dir_t; typedef struct kernel_ipsec_t kernel_ipsec_t; @@ -33,6 +34,25 @@ typedef struct kernel_ipsec_t kernel_ipsec_t; #include #include +/** + * Mode of an CHILD_SA. + * + * These are equal to those defined in XFRM, so don't change. + */ +enum ipsec_mode_t { + /** transport mode, no inner address */ + MODE_TRANSPORT = 0, + /** tunnel mode, inner and outer addresses */ + MODE_TUNNEL = 1, + /** BEET mode, tunnel mode but fixed, bound inner addresses */ + MODE_BEET = 4, +}; + +/** + * enum names for ipsec_mode_t. + */ +extern enum_name_t *ipsec_mode_names; + /** * Direction of a policy. These are equal to those * defined in xfrm.h, but we want to stay implementation @@ -124,7 +144,7 @@ struct kernel_ipsec_t { u_int64_t expire_soft, u_int64_t expire_hard, u_int16_t enc_alg, u_int16_t enc_size, u_int16_t int_alg, u_int16_t int_size, - prf_plus_t *prf_plus, mode_t mode, + prf_plus_t *prf_plus, ipsec_mode_t mode, u_int16_t ipcomp, bool encap, bool update); @@ -199,7 +219,7 @@ struct kernel_ipsec_t { traffic_selector_t *src_ts, traffic_selector_t *dst_ts, policy_dir_t direction, protocol_id_t protocol, - u_int32_t reqid, bool high_prio, mode_t mode, + u_int32_t reqid, bool high_prio, ipsec_mode_t mode, u_int16_t ipcomp); /** -- cgit v1.2.3