diff options
Diffstat (limited to 'Source/charon/sa/states')
-rw-r--r-- | Source/charon/sa/states/ike_auth_requested.c | 6 | ||||
-rw-r--r-- | Source/charon/sa/states/ike_auth_requested.h | 7 | ||||
-rw-r--r-- | Source/charon/sa/states/ike_sa_established.c | 6 | ||||
-rw-r--r-- | Source/charon/sa/states/ike_sa_established.h | 8 | ||||
-rw-r--r-- | Source/charon/sa/states/ike_sa_init_requested.c | 6 | ||||
-rw-r--r-- | Source/charon/sa/states/ike_sa_init_requested.h | 8 | ||||
-rw-r--r-- | Source/charon/sa/states/ike_sa_init_responded.c | 6 | ||||
-rw-r--r-- | Source/charon/sa/states/ike_sa_init_responded.h | 8 | ||||
-rw-r--r-- | Source/charon/sa/states/initiator_init.c | 5 | ||||
-rw-r--r-- | Source/charon/sa/states/initiator_init.h | 10 | ||||
-rw-r--r-- | Source/charon/sa/states/responder_init.c | 6 | ||||
-rw-r--r-- | Source/charon/sa/states/responder_init.h | 11 | ||||
-rw-r--r-- | Source/charon/sa/states/state.h | 13 |
13 files changed, 56 insertions, 44 deletions
diff --git a/Source/charon/sa/states/ike_auth_requested.c b/Source/charon/sa/states/ike_auth_requested.c index b1033eb62..4681b64b0 100644 --- a/Source/charon/sa/states/ike_auth_requested.c +++ b/Source/charon/sa/states/ike_auth_requested.c @@ -24,12 +24,14 @@ #include <utils/allocator.h> + +typedef struct private_ike_auth_requested_t private_ike_auth_requested_t; + /** * Private data of a ike_auth_requested_t object. * */ -typedef struct private_ike_auth_requested_s private_ike_auth_requested_t; -struct private_ike_auth_requested_s { +struct private_ike_auth_requested_t { /** * methods of the state_t interface */ diff --git a/Source/charon/sa/states/ike_auth_requested.h b/Source/charon/sa/states/ike_auth_requested.h index f7e58e9ff..2b8bc776a 100644 --- a/Source/charon/sa/states/ike_auth_requested.h +++ b/Source/charon/sa/states/ike_auth_requested.h @@ -26,13 +26,14 @@ #include <sa/states/state.h> #include <sa/ike_sa.h> + +typedef struct ike_auth_requested_t ike_auth_requested_t; + /** * @brief This class represents an IKE_SA, which has requested an IKE_AUTH. * */ -typedef struct ike_auth_requested_s ike_auth_requested_t; - -struct ike_auth_requested_s { +struct ike_auth_requested_t { /** * methods of the state_t interface */ diff --git a/Source/charon/sa/states/ike_sa_established.c b/Source/charon/sa/states/ike_sa_established.c index 0a0dd4b75..769ac8c4c 100644 --- a/Source/charon/sa/states/ike_sa_established.c +++ b/Source/charon/sa/states/ike_sa_established.c @@ -24,12 +24,14 @@ #include <utils/allocator.h> + +typedef struct private_ike_sa_established_t private_ike_sa_established_t; + /** * Private data of a ike_sa_established_t object. * */ -typedef struct private_ike_sa_established_s private_ike_sa_established_t; -struct private_ike_sa_established_s { +struct private_ike_sa_established_t { /** * methods of the state_t interface */ diff --git a/Source/charon/sa/states/ike_sa_established.h b/Source/charon/sa/states/ike_sa_established.h index 3ecdd1df1..68581d155 100644 --- a/Source/charon/sa/states/ike_sa_established.h +++ b/Source/charon/sa/states/ike_sa_established.h @@ -26,14 +26,14 @@ #include <sa/states/state.h> #include <sa/ike_sa.h> +typedef struct ike_sa_established_t ike_sa_established_t; + /** - * @brief This class represents an the state of an established + * @brief This class represents an the state of an established. * IKE_SA. * */ -typedef struct ike_sa_established_s ike_sa_established_t; - -struct ike_sa_established_s { +struct ike_sa_established_t { /** * methods of the state_t interface */ diff --git a/Source/charon/sa/states/ike_sa_init_requested.c b/Source/charon/sa/states/ike_sa_init_requested.c index ea03602a9..a42b57ed4 100644 --- a/Source/charon/sa/states/ike_sa_init_requested.c +++ b/Source/charon/sa/states/ike_sa_init_requested.c @@ -29,12 +29,14 @@ #include <encoding/payloads/nonce_payload.h> #include <transforms/diffie_hellman.h> + +typedef struct private_ike_sa_init_requested_t private_ike_sa_init_requested_t; + /** * Private data of a ike_sa_init_requested_t object. * */ -typedef struct private_ike_sa_init_requested_s private_ike_sa_init_requested_t; -struct private_ike_sa_init_requested_s { +struct private_ike_sa_init_requested_t { /** * methods of the state_t interface */ diff --git a/Source/charon/sa/states/ike_sa_init_requested.h b/Source/charon/sa/states/ike_sa_init_requested.h index 1f4f58804..0c1c01b67 100644 --- a/Source/charon/sa/states/ike_sa_init_requested.h +++ b/Source/charon/sa/states/ike_sa_init_requested.h @@ -29,13 +29,13 @@ #include <sa/states/state.h> #include <transforms/diffie_hellman.h> +typedef struct ike_sa_init_requested_t ike_sa_init_requested_t; + /** - * @brief This class represents an IKE_SA state when requested an IKE_SA_INIT + * @brief This class represents an IKE_SA state when requested an IKE_SA_INIT. * */ -typedef struct ike_sa_init_requested_s ike_sa_init_requested_t; - -struct ike_sa_init_requested_s { +struct ike_sa_init_requested_t { /** * methods of the state_t interface */ diff --git a/Source/charon/sa/states/ike_sa_init_responded.c b/Source/charon/sa/states/ike_sa_init_responded.c index 885d4bea6..5c7ba0927 100644 --- a/Source/charon/sa/states/ike_sa_init_responded.c +++ b/Source/charon/sa/states/ike_sa_init_responded.c @@ -24,12 +24,14 @@ #include <utils/allocator.h> + +typedef struct private_ike_sa_init_responded_t private_ike_sa_init_responded_t; + /** * Private data of a ike_sa_init_responded_t object. * */ -typedef struct private_ike_sa_init_responded_s private_ike_sa_init_responded_t; -struct private_ike_sa_init_responded_s { +struct private_ike_sa_init_responded_t { /** * methods of the state_t interface */ diff --git a/Source/charon/sa/states/ike_sa_init_responded.h b/Source/charon/sa/states/ike_sa_init_responded.h index e9780da22..5e871702d 100644 --- a/Source/charon/sa/states/ike_sa_init_responded.h +++ b/Source/charon/sa/states/ike_sa_init_responded.h @@ -26,13 +26,13 @@ #include <sa/ike_sa.h> #include <sa/states/state.h> +typedef struct ike_sa_init_responded_t ike_sa_init_responded_t; + /** - * @brief This class represents an IKE_SA state when responded to an IKE_SA_INIT request + * @brief This class represents an IKE_SA state when responded to an IKE_SA_INIT request. * */ -typedef struct ike_sa_init_responded_s ike_sa_init_responded_t; - -struct ike_sa_init_responded_s { +struct ike_sa_init_responded_t { /** * methods of the state_t interface */ diff --git a/Source/charon/sa/states/initiator_init.c b/Source/charon/sa/states/initiator_init.c index eca25c6a3..5825eb2a0 100644 --- a/Source/charon/sa/states/initiator_init.c +++ b/Source/charon/sa/states/initiator_init.c @@ -33,12 +33,13 @@ #include <encoding/payloads/nonce_payload.h> +typedef struct private_initiator_init_t private_initiator_init_t; + /** * Private data of a initiator_init_t object. * */ -typedef struct private_initiator_init_s private_initiator_init_t; -struct private_initiator_init_s { +struct private_initiator_init_t { /** * Methods of the state_t interface. */ diff --git a/Source/charon/sa/states/initiator_init.h b/Source/charon/sa/states/initiator_init.h index 01269c0da..c61c137d1 100644 --- a/Source/charon/sa/states/initiator_init.h +++ b/Source/charon/sa/states/initiator_init.h @@ -28,14 +28,14 @@ #include <sa/states/state.h> +typedef struct initiator_init_t initiator_init_t; + /** - * @brief This class represents an IKE_SA state when initializing - * a connection as initiator + * @brief This class represents an IKE_SA state when initializing. + * a connection as initiator * */ -typedef struct initiator_init_s initiator_init_t; - -struct initiator_init_s { +struct initiator_init_t { /** * methods of the state_t interface */ diff --git a/Source/charon/sa/states/responder_init.c b/Source/charon/sa/states/responder_init.c index c44cd4f00..885e0d7f4 100644 --- a/Source/charon/sa/states/responder_init.c +++ b/Source/charon/sa/states/responder_init.c @@ -31,12 +31,14 @@ #include <encoding/payloads/nonce_payload.h> #include <transforms/diffie_hellman.h> + +typedef struct private_responder_init_t private_responder_init_t; + /** * Private data of a responder_init_t object. * */ -typedef struct private_responder_init_s private_responder_init_t; -struct private_responder_init_s { +struct private_responder_init_t { /** * Methods of the state_t interface. */ diff --git a/Source/charon/sa/states/responder_init.h b/Source/charon/sa/states/responder_init.h index 80c2caed5..592cb6168 100644 --- a/Source/charon/sa/states/responder_init.h +++ b/Source/charon/sa/states/responder_init.h @@ -26,14 +26,15 @@ #include <sa/ike_sa.h> #include <sa/states/state.h> + +typedef struct responder_init_t responder_init_t; + /** - * @brief This class represents an IKE_SA state when initializing - * a connection as responder + * @brief This class represents an IKE_SA state when initializing. + * a connection as responder * */ -typedef struct responder_init_s responder_init_t; - -struct responder_init_s { +struct responder_init_t { /** * methods of the state_t interface */ diff --git a/Source/charon/sa/states/state.h b/Source/charon/sa/states/state.h index 305199f3f..e888eaf31 100644 --- a/Source/charon/sa/states/state.h +++ b/Source/charon/sa/states/state.h @@ -29,12 +29,12 @@ extern mapping_t ike_sa_state_m[]; +typedef enum ike_sa_state_t ike_sa_state_t; + /** * States in which a IKE_SA can actually be */ -typedef enum ike_sa_state_e ike_sa_state_t; - -enum ike_sa_state_e { +enum ike_sa_state_t { /** * IKE_SA is is not in a state as initiator @@ -75,13 +75,12 @@ enum ike_sa_state_e { */ extern mapping_t ike_sa_state_m[]; +typedef struct state_t state_t; + /** * @brief This interface represents an IKE_SA state - * */ -typedef struct state_s state_t; - -struct state_s { +struct state_t { /** * @brief Processes a incoming IKEv2-Message of type message_t |