diff options
45 files changed, 198 insertions, 177 deletions
diff --git a/Source/charon/config/configuration_manager.c b/Source/charon/config/configuration_manager.c index 3b1488cf6..72e801a18 100644 --- a/Source/charon/config/configuration_manager.c +++ b/Source/charon/config/configuration_manager.c @@ -34,12 +34,12 @@ #include <encoding/payloads/ke_payload.h> #include <encoding/payloads/transform_attribute.h> +typedef struct private_configuration_manager_t private_configuration_manager_t; + /** * Private data of an configuration_t object */ -typedef struct private_configuration_manager_s private_configuration_manager_t; - -struct private_configuration_manager_s { +struct private_configuration_manager_t { /** * Public part diff --git a/Source/charon/config/configuration_manager.h b/Source/charon/config/configuration_manager.h index a3bc099fd..54d302d60 100644 --- a/Source/charon/config/configuration_manager.h +++ b/Source/charon/config/configuration_manager.h @@ -31,6 +31,9 @@ #include <transforms/signers/signer.h> #include <transforms/crypters/crypter.h> + +typedef struct configuration_manager_t configuration_manager_t; + /** * @brief Manages all configuration aspects of the daemon. * @@ -39,9 +42,7 @@ * or a hash map and are managed by this class. * */ -typedef struct configuration_manager_s configuration_manager_t; - -struct configuration_manager_s { +struct configuration_manager_t { /** * Gets the remote host information for a specific configuration name. diff --git a/Source/charon/encoding/generator.c b/Source/charon/encoding/generator.c index 734c089a0..0d047c277 100644 --- a/Source/charon/encoding/generator.c +++ b/Source/charon/encoding/generator.c @@ -41,12 +41,13 @@ #include <encoding/payloads/notify_payload.h> #include <encoding/payloads/nonce_payload.h> + +typedef struct private_generator_t private_generator_t; + /** * Private part of a generator_t object */ -typedef struct private_generator_s private_generator_t; - -struct private_generator_s { +struct private_generator_t { /** * Public part of a generator_t object */ diff --git a/Source/charon/encoding/generator.h b/Source/charon/encoding/generator.h index 312ac0054..81f0bd9c4 100644 --- a/Source/charon/encoding/generator.h +++ b/Source/charon/encoding/generator.h @@ -38,12 +38,12 @@ */ #define GENERATOR_DATA_BUFFER_INCREASE_VALUE 500 +typedef struct generator_t generator_t; + /** *A generator_t object which generates payloads of specific type. */ -typedef struct generator_s generator_t; - -struct generator_s { +struct generator_t { /** * @brief Generates a specific payload from given payload object. diff --git a/Source/charon/encoding/message.c b/Source/charon/encoding/message.c index 5a6501d54..db6efb369 100644 --- a/Source/charon/encoding/message.c +++ b/Source/charon/encoding/message.c @@ -36,13 +36,13 @@ #include <encoding/payloads/payload.h> +typedef struct supported_payload_entry_t supported_payload_entry_t; + /** * Supported payload entry used in message_rule_t * */ -typedef struct supported_payload_entry_s supported_payload_entry_t; - -struct supported_payload_entry_s { +struct supported_payload_entry_t { /** * Payload type */ @@ -59,13 +59,13 @@ struct supported_payload_entry_s { size_t max_occurence; }; +typedef struct message_rule_t message_rule_t; + /** * Message Rule used to find out which payloads are supported by each message type * */ -typedef struct message_rule_s message_rule_t; - -struct message_rule_s { +struct message_rule_t { /** * Type of message */ diff --git a/Source/charon/encoding/message.h b/Source/charon/encoding/message.h index 106160407..2883ebf5a 100644 --- a/Source/charon/encoding/message.h +++ b/Source/charon/encoding/message.h @@ -30,16 +30,14 @@ #include <utils/linked_list.h> - +typedef struct message_t message_t; /** * @brief This class is used to represent an IKEv2-Message. * * An IKEv2-Message is either a request or response. */ -typedef struct message_s message_t; - -struct message_s { +struct message_t { /** * @brief Sets the IKE major version of the message. diff --git a/Source/charon/encoding/parser.c b/Source/charon/encoding/parser.c index cf7d0b8ee..74d4b49f5 100644 --- a/Source/charon/encoding/parser.c +++ b/Source/charon/encoding/parser.c @@ -43,14 +43,15 @@ + +typedef struct private_parser_t private_parser_t; + /** * @private data stored in a context * * contains pointers and counters to store current state */ -typedef struct private_parser_s private_parser_t; - -struct private_parser_s { +struct private_parser_t { /** * Public members, see parser_t */ diff --git a/Source/charon/encoding/parser.h b/Source/charon/encoding/parser.h index 9a99fabb4..6f47fefab 100644 --- a/Source/charon/encoding/parser.h +++ b/Source/charon/encoding/parser.h @@ -28,6 +28,8 @@ #include <encoding/payloads/payload.h> +typedef struct parser_t parser_t; + /** * @brief A parser_t object which parses payloads * @@ -35,9 +37,7 @@ * payloads can be parsed out of the chunk using parse_payload. * The parser remains the state until destroyed. */ -typedef struct parser_s parser_t; - -struct parser_s { +struct parser_t { /** * @brief parses the next payload diff --git a/Source/charon/encoding/payloads/encodings.h b/Source/charon/encoding/payloads/encodings.h index 1401ea798..b6814f303 100644 --- a/Source/charon/encoding/payloads/encodings.h +++ b/Source/charon/encoding/payloads/encodings.h @@ -33,6 +33,8 @@ #include <definitions.h> +typedef enum encoding_type_t encoding_type_t; + /** * @brief All different kinds of encoding types. * @@ -40,9 +42,7 @@ * which has to be parsed or generated differently has its own * type defined here. */ -typedef enum encoding_type_e encoding_type_t; - -enum encoding_type_e{ +enum encoding_type_t{ /** * Representing a 4 Bit unsigned int value * diff --git a/Source/charon/encoding/payloads/ike_header.c b/Source/charon/encoding/payloads/ike_header.c index 1f1c34253..58091b5e0 100644 --- a/Source/charon/encoding/payloads/ike_header.c +++ b/Source/charon/encoding/payloads/ike_header.c @@ -31,9 +31,14 @@ #include <encoding/payloads/encodings.h> #include <utils/allocator.h> -typedef struct private_ike_header_s private_ike_header_t; -struct private_ike_header_s { +typedef struct private_ike_header_t private_ike_header_t; + +/** + * Private data of an ike_header_t Object + * + */ +struct private_ike_header_t { /** * public interface */ diff --git a/Source/charon/encoding/payloads/ike_header.h b/Source/charon/encoding/payloads/ike_header.h index ce52b55df..4f05c4431 100644 --- a/Source/charon/encoding/payloads/ike_header.h +++ b/Source/charon/encoding/payloads/ike_header.h @@ -49,14 +49,14 @@ */ #define IKE_HEADER_LENGTH 28 +typedef enum exchange_type_t exchange_type_t; + /** * @brief Different types of IKE-Exchanges. * * See RFC for different types. */ -typedef enum exchange_type_e exchange_type_t; - -enum exchange_type_e{ +enum exchange_type_t{ /** * EXCHANGE_TYPE_UNDEFINED, not a official message type :-) @@ -82,6 +82,8 @@ enum exchange_type_e{ extern mapping_t exchange_type_m[]; +typedef struct ike_header_t ike_header_t; + /** * Object representing an IKEv2-Header * @@ -90,9 +92,7 @@ extern mapping_t exchange_type_m[]; * both versions of the IKE-protocol. * */ -typedef struct ike_header_s ike_header_t; - -struct ike_header_s { +struct ike_header_t { /** * implements payload_t interface */ diff --git a/Source/charon/encoding/payloads/ke_payload.c b/Source/charon/encoding/payloads/ke_payload.c index 478519634..d2181560d 100644 --- a/Source/charon/encoding/payloads/ke_payload.c +++ b/Source/charon/encoding/payloads/ke_payload.c @@ -33,13 +33,13 @@ #include <utils/allocator.h> +typedef struct private_ke_payload_t private_ke_payload_t; + /** * Private data of an ke_payload_t Object * */ -typedef struct private_ke_payload_s private_ke_payload_t; - -struct private_ke_payload_s { +struct private_ke_payload_t { /** * public ke_payload_t interface */ diff --git a/Source/charon/encoding/payloads/ke_payload.h b/Source/charon/encoding/payloads/ke_payload.h index 8855941f1..60c7a1e56 100644 --- a/Source/charon/encoding/payloads/ke_payload.h +++ b/Source/charon/encoding/payloads/ke_payload.h @@ -42,15 +42,16 @@ */ #define KE_PAYLOAD_HEADER_LENGTH 8 + +typedef struct ke_payload_t ke_payload_t; + /** * Object representing an IKEv2-KE Payload * * The KE Payload format is described in RFC section 3.4. * */ -typedef struct ke_payload_s ke_payload_t; - -struct ke_payload_s { +struct ke_payload_t { /** * implements payload_t interface */ diff --git a/Source/charon/encoding/payloads/nonce_payload.c b/Source/charon/encoding/payloads/nonce_payload.c index fa3730e2f..33860f585 100644 --- a/Source/charon/encoding/payloads/nonce_payload.c +++ b/Source/charon/encoding/payloads/nonce_payload.c @@ -31,14 +31,13 @@ #include <utils/allocator.h> +typedef struct private_nonce_payload_t private_nonce_payload_t; /** * Private data of an nonce_payload_t' Object * */ -typedef struct private_nonce_payload_s private_nonce_payload_t; - -struct private_nonce_payload_s { +struct private_nonce_payload_t { /** * public nonce_payload_t interface */ diff --git a/Source/charon/encoding/payloads/nonce_payload.h b/Source/charon/encoding/payloads/nonce_payload.h index 7768fa990..c5abf9af0 100644 --- a/Source/charon/encoding/payloads/nonce_payload.h +++ b/Source/charon/encoding/payloads/nonce_payload.h @@ -33,15 +33,15 @@ */ #define NONCE_PAYLOAD_HEADER_LENGTH 4 +typedef struct nonce_payload_t nonce_payload_t; + /** * Object representing an IKEv2 Nonce payload * * The Nonce payload format is described in draft section 3.3. * */ -typedef struct nonce_payload_s nonce_payload_t; - -struct nonce_payload_s { +struct nonce_payload_t { /** * implements payload_t interface */ diff --git a/Source/charon/encoding/payloads/notify_payload.c b/Source/charon/encoding/payloads/notify_payload.c index adcde11a2..b8c58537c 100644 --- a/Source/charon/encoding/payloads/notify_payload.c +++ b/Source/charon/encoding/payloads/notify_payload.c @@ -32,13 +32,14 @@ #include <encoding/payloads/encodings.h> #include <utils/allocator.h> + +typedef struct private_notify_payload_t private_notify_payload_t; + /** * Private data of an notify_payload_t Object * */ -typedef struct private_notify_payload_s private_notify_payload_t; - -struct private_notify_payload_s { +struct private_notify_payload_t { /** * public notify_payload_t interface */ diff --git a/Source/charon/encoding/payloads/notify_payload.h b/Source/charon/encoding/payloads/notify_payload.h index cf4235fc3..ac810d935 100644 --- a/Source/charon/encoding/payloads/notify_payload.h +++ b/Source/charon/encoding/payloads/notify_payload.h @@ -42,15 +42,15 @@ */ #define NOTIFY_PAYLOAD_HEADER_LENGTH 8 +typedef struct notify_payload_t notify_payload_t; + /** * Object representing an IKEv2-Notify Payload * * The Notify Payload format is described in Draft section 3.10. * */ -typedef struct notify_payload_s notify_payload_t; - -struct notify_payload_s { +struct notify_payload_t { /** * implements payload_t interface */ diff --git a/Source/charon/encoding/payloads/payload.h b/Source/charon/encoding/payloads/payload.h index 9d8b753cb..a1c5cb007 100644 --- a/Source/charon/encoding/payloads/payload.h +++ b/Source/charon/encoding/payloads/payload.h @@ -29,6 +29,8 @@ #include <encoding/payloads/encodings.h> +typedef enum payload_type_t payload_type_t; + /** * Payload-Types of a IKEv2-Message * @@ -36,9 +38,7 @@ * Header and substructures are also defined as * payload types with values from PRIVATE USE space. */ -typedef enum payload_type_e payload_type_t; - -enum payload_type_e{ +enum payload_type_t{ /** * NO_PAYLOAD @@ -150,15 +150,15 @@ enum payload_type_e{ extern mapping_t payload_type_m[]; +typedef struct payload_t payload_t; + /** * @brief Generic interface for all payload types (inclusive * header and substructures) * * */ -typedef struct payload_s payload_t; - -struct payload_s { +struct payload_t { /** * @brief Destroys a payload and all included substructures. * diff --git a/Source/charon/encoding/payloads/proposal_substructure.c b/Source/charon/encoding/payloads/proposal_substructure.c index b53633fb5..5cdd3b25b 100644 --- a/Source/charon/encoding/payloads/proposal_substructure.c +++ b/Source/charon/encoding/payloads/proposal_substructure.c @@ -33,13 +33,13 @@ #include <utils/allocator.h> #include <utils/linked_list.h> +typedef struct private_proposal_substructure_t private_proposal_substructure_t; + /** * Private data of an proposal_substructure_t' Object * */ -typedef struct private_proposal_substructure_s private_proposal_substructure_t; - -struct private_proposal_substructure_s { +struct private_proposal_substructure_t { /** * public proposal_substructure_t interface */ diff --git a/Source/charon/encoding/payloads/proposal_substructure.h b/Source/charon/encoding/payloads/proposal_substructure.h index 1da42d10d..134c4776e 100644 --- a/Source/charon/encoding/payloads/proposal_substructure.h +++ b/Source/charon/encoding/payloads/proposal_substructure.h @@ -37,27 +37,27 @@ #define PROPOSAL_SUBSTRUCTURE_HEADER_LENGTH 8 +typedef enum protocol_id_t protocol_id_t; + /** * Protocol ID of a proposal */ -typedef enum protocol_id_e protocol_id_t; - -enum protocol_id_e { +enum protocol_id_t { UNDEFINED_PROTOCOL_ID = 201, IKE = 1, AH = 2, ESP = 3, }; +typedef struct proposal_substructure_t proposal_substructure_t; + /** * Object representing an IKEv2- PROPOSAL SUBSTRUCTURE * * The PROPOSAL SUBSTRUCTURE format is described in RFC section 3.3.1. * */ -typedef struct proposal_substructure_s proposal_substructure_t; - -struct proposal_substructure_s { +struct proposal_substructure_t { /** * implements payload_t interface */ diff --git a/Source/charon/encoding/payloads/sa_payload.c b/Source/charon/encoding/payloads/sa_payload.c index 83eb62acd..7a8b71452 100644 --- a/Source/charon/encoding/payloads/sa_payload.c +++ b/Source/charon/encoding/payloads/sa_payload.c @@ -33,13 +33,13 @@ #include <utils/linked_list.h> +typedef struct private_sa_payload_t private_sa_payload_t; + /** * Private data of an sa_payload_t' Object * */ -typedef struct private_sa_payload_s private_sa_payload_t; - -struct private_sa_payload_s { +struct private_sa_payload_t { /** * public sa_payload_t interface */ diff --git a/Source/charon/encoding/payloads/sa_payload.h b/Source/charon/encoding/payloads/sa_payload.h index f13282de9..2f882d0d8 100644 --- a/Source/charon/encoding/payloads/sa_payload.h +++ b/Source/charon/encoding/payloads/sa_payload.h @@ -41,15 +41,15 @@ */ #define SA_PAYLOAD_HEADER_LENGTH 4 +typedef struct sa_payload_t sa_payload_t; + /** * Object representing an IKEv2-SA Payload * * The SA Payload format is described in RFC section 3.3. * */ -typedef struct sa_payload_s sa_payload_t; - -struct sa_payload_s { +struct sa_payload_t { /** * implements payload_t interface */ diff --git a/Source/charon/encoding/payloads/transform_attribute.c b/Source/charon/encoding/payloads/transform_attribute.c index 9aed1e332..f949fca9c 100644 --- a/Source/charon/encoding/payloads/transform_attribute.c +++ b/Source/charon/encoding/payloads/transform_attribute.c @@ -31,13 +31,13 @@ #include <types.h> #include <utils/allocator.h> +typedef struct private_transform_attribute_t private_transform_attribute_t; + /** * Private data of an transform_attribute_t Object * */ -typedef struct private_transform_attribute_s private_transform_attribute_t; - -struct private_transform_attribute_s { +struct private_transform_attribute_t { /** * public transform_attribute_t interface */ diff --git a/Source/charon/encoding/payloads/transform_attribute.h b/Source/charon/encoding/payloads/transform_attribute.h index 7cc72f207..c268a7b1e 100644 --- a/Source/charon/encoding/payloads/transform_attribute.h +++ b/Source/charon/encoding/payloads/transform_attribute.h @@ -29,12 +29,12 @@ #include <encoding/payloads/payload.h> +typedef enum transform_attribute_type_t transform_attribute_type_t; + /** * Type of the attribute, as in IKEv2 draft 3.3.5 */ -typedef enum transform_attribute_type_e transform_attribute_type_t; - -enum transform_attribute_type_e { +enum transform_attribute_type_t { ATTRIBUTE_UNDEFINED = 16384, KEY_LENGTH = 14 }; @@ -44,15 +44,15 @@ enum transform_attribute_type_e { */ extern mapping_t transform_attribute_type_m[]; +typedef struct transform_attribute_t transform_attribute_t; + /** * Object representing an IKEv2- TRANSFORM Attribute * * The TRANSFORM ATTRIBUTE format is described in RFC section 3.3.5. * */ -typedef struct transform_attribute_s transform_attribute_t; - -struct transform_attribute_s { +struct transform_attribute_t { /** * implements payload_t interface */ diff --git a/Source/charon/encoding/payloads/transform_substructure.c b/Source/charon/encoding/payloads/transform_substructure.c index d44d4c4f8..0d931c984 100644 --- a/Source/charon/encoding/payloads/transform_substructure.c +++ b/Source/charon/encoding/payloads/transform_substructure.c @@ -33,13 +33,14 @@ #include <utils/allocator.h> #include <utils/linked_list.h> + +typedef struct private_transform_substructure_t private_transform_substructure_t; + /** * Private data of an transform_substructure_t' Object * */ -typedef struct private_transform_substructure_s private_transform_substructure_t; - -struct private_transform_substructure_s { +struct private_transform_substructure_t { /** * public transform_substructure_t interface */ diff --git a/Source/charon/encoding/payloads/transform_substructure.h b/Source/charon/encoding/payloads/transform_substructure.h index 1be66597e..9cd94775b 100644 --- a/Source/charon/encoding/payloads/transform_substructure.h +++ b/Source/charon/encoding/payloads/transform_substructure.h @@ -43,12 +43,12 @@ #define TRANSFORM_SUBSTRUCTURE_HEADER_LENGTH 8 +typedef enum transform_type_t transform_type_t; + /** * Type of a transform, as in IKEv2 draft 3.3.2 */ -typedef enum transform_type_e transform_type_t; - -enum transform_type_e { +enum transform_type_t { UNDEFINED_TRANSFORM_TYPE = 241, ENCRYPTION_ALGORITHM = 1, PSEUDO_RANDOM_FUNCTION = 2, @@ -62,12 +62,12 @@ enum transform_type_e { */ extern mapping_t transform_type_m[]; +typedef enum encryption_algorithm_t encryption_algorithm_t; + /** * Encryption algorithm, as in IKEv2 draft 3.3.2 */ -typedef enum encryption_algorithm_e encryption_algorithm_t; - -enum encryption_algorithm_e { +enum encryption_algorithm_t { ENCR_UNDEFINED = 1024, ENCR_DES_IV64 = 1, ENCR_DES = 2, @@ -89,12 +89,12 @@ enum encryption_algorithm_e { */ extern mapping_t encryption_algorithm_m[]; +typedef enum pseudo_random_function_t pseudo_random_function_t; + /** * Pseudo random function, as in IKEv2 draft 3.3.2 */ -typedef enum pseudo_random_function_e pseudo_random_function_t; - -enum pseudo_random_function_e { +enum pseudo_random_function_t { PRF_UNDEFINED = 1024, PRF_HMAC_MD5 = 1, PRF_HMAC_SHA1 = 2, @@ -107,12 +107,12 @@ enum pseudo_random_function_e { */ extern mapping_t pseudo_random_function_m[]; +typedef enum integrity_algorithm_t integrity_algorithm_t; + /** * Integrity algorithm, as in IKEv2 draft 3.3.2 */ -typedef enum integrity_algorithm_e integrity_algorithm_t; - -enum integrity_algorithm_e { +enum integrity_algorithm_t { AUTH_UNDEFINED = 1024, AUTH_HMAC_MD5_96 = 1, AUTH_HMAC_SHA1_96 = 2, @@ -127,12 +127,12 @@ enum integrity_algorithm_e { extern mapping_t integrity_algorithm_m[]; +typedef enum diffie_hellman_group_t diffie_hellman_group_t; + /** * Diffie-Hellman group, as in IKEv2 draft 3.3.2 and RFC 3526 */ -typedef enum diffie_hellman_group_e diffie_hellman_group_t; - -enum diffie_hellman_group_e { +enum diffie_hellman_group_t { MODP_UNDEFINED = 1024, MODP_768_BIT = 1, MODP_1024_BIT = 2, @@ -149,12 +149,12 @@ enum diffie_hellman_group_e { */ extern mapping_t diffie_hellman_group_m[]; +typedef enum extended_sequence_numbers_t extended_sequence_numbers_t; + /** * Extended sequence numbers, as in IKEv2 draft 3.3.2 */ -typedef enum extended_sequence_numbers_e extended_sequence_numbers_t; - -enum extended_sequence_numbers_e { +enum extended_sequence_numbers_t { NO_EXT_SEQ_NUMBERS = 0, EXT_SEQ_NUMBERS = 1 }; @@ -164,15 +164,15 @@ enum extended_sequence_numbers_e { */ extern mapping_t extended_sequence_numbers_m[]; +typedef struct transform_substructure_t transform_substructure_t; + /** * Object representing an IKEv2- TRANSFORM SUBSTRUCTURE * * The TRANSFORM SUBSTRUCTURE format is described in RFC section 3.3.2. * */ -typedef struct transform_substructure_s transform_substructure_t; - -struct transform_substructure_s { +struct transform_substructure_t { /** * implements payload_t interface */ diff --git a/Source/charon/network/host.c b/Source/charon/network/host.c index c2b01d175..daba379bb 100644 --- a/Source/charon/network/host.c +++ b/Source/charon/network/host.c @@ -24,11 +24,13 @@ #include <utils/allocator.h> + +typedef struct private_host_t private_host_t; + /** - * @brief The logger object. + * @brief Private Data of a host object. */ -typedef struct private_host_s private_host_t; -struct private_host_s { +struct private_host_t { /** * Public data */ diff --git a/Source/charon/network/host.h b/Source/charon/network/host.h index f592e67eb..e1779f526 100644 --- a/Source/charon/network/host.h +++ b/Source/charon/network/host.h @@ -32,11 +32,12 @@ #include <types.h> + +typedef struct host_t host_t; /** - * @brief The logger object + * @brief Representates a Host */ -typedef struct host_s host_t; -struct host_s { +struct host_t { /** * @brief Build a clone of this host object. * diff --git a/Source/charon/network/packet.c b/Source/charon/network/packet.c index f09b18ae3..ea7af27b6 100644 --- a/Source/charon/network/packet.c +++ b/Source/charon/network/packet.c @@ -26,15 +26,15 @@ #include <utils/allocator.h> +typedef struct private_packet_t private_packet_t; + /** - * Private data of an packet_t object + * Private data of an packet_t object. */ -typedef struct private_packet_s private_packet_t; - -struct private_packet_s { +struct private_packet_t { /** - * Public part of a packet_t object + * Public part of a packet_t object. */ packet_t public; }; diff --git a/Source/charon/network/packet.h b/Source/charon/network/packet.h index b91756a03..d1220dfa0 100644 --- a/Source/charon/network/packet.h +++ b/Source/charon/network/packet.h @@ -28,12 +28,11 @@ #include <network/host.h> - +typedef struct packet_t packet_t; /** * @brief UDP-Packet, contains data, sender and receiver */ -typedef struct packet_s packet_t; -struct packet_s { +struct packet_t { /** * source address structure diff --git a/Source/charon/network/socket.c b/Source/charon/network/socket.c index fc652b557..f56d22ade 100644 --- a/Source/charon/network/socket.c +++ b/Source/charon/network/socket.c @@ -36,9 +36,13 @@ #include <utils/allocator.h> #include <utils/logger_manager.h> -typedef struct private_socket_s private_socket_t; -struct private_socket_s{ +typedef struct private_socket_t private_socket_t; + +/** + * Private data of an socket_t object + */ +struct private_socket_t{ /** * public functions */ diff --git a/Source/charon/network/socket.h b/Source/charon/network/socket.h index d5fd828ed..97f59ac02 100644 --- a/Source/charon/network/socket.h +++ b/Source/charon/network/socket.h @@ -37,12 +37,13 @@ #define MAX_PACKET 3000 +typedef struct socket_t socket_t; + /** * @brief abstraction of one (ipv4), or in future, of multiple sockets * */ -typedef struct socket_s socket_t; -struct socket_s { +struct socket_t { /** * @brief receive a packet * diff --git a/Source/charon/queues/event_queue.c b/Source/charon/queues/event_queue.c index ab2680c31..20802d3e8 100644 --- a/Source/charon/queues/event_queue.c +++ b/Source/charon/queues/event_queue.c @@ -31,15 +31,15 @@ +typedef struct event_t event_t; + /** * @brief Represents an event as it is stored in the event queue. * * A event consists of a event time and an assigned job object. * */ -typedef struct event_s event_t; - -struct event_s{ +struct event_t{ /** * Time to fire the event. */ @@ -95,14 +95,13 @@ static event_t *event_create(timeval_t time, job_t *job) } +typedef struct private_event_queue_t private_event_queue_t; + /** * @brief Private Variables and Functions of event_queue_t class. * */ -typedef struct private_event_queue_s private_event_queue_t; - - -struct private_event_queue_s { +struct private_event_queue_t { /** * Public part. */ diff --git a/Source/charon/queues/event_queue.h b/Source/charon/queues/event_queue.h index 49f6d718f..4f3d543d6 100644 --- a/Source/charon/queues/event_queue.h +++ b/Source/charon/queues/event_queue.h @@ -28,15 +28,15 @@ #include <types.h> #include <queues/jobs/job.h> +typedef struct event_queue_t event_queue_t; + /** * @brief Event-Queue used to store timed events. * * Although the event-queue is based on a linked_list_t * all access functions are thread-save implemented. */ -typedef struct event_queue_s event_queue_t; - -struct event_queue_s { +struct event_queue_t { /** * @brief Returns number of events in queue. diff --git a/Source/charon/queues/job_queue.c b/Source/charon/queues/job_queue.c index 9486bf6d4..bd11d0b26 100644 --- a/Source/charon/queues/job_queue.c +++ b/Source/charon/queues/job_queue.c @@ -28,14 +28,14 @@ #include <utils/allocator.h> #include <utils/linked_list.h> + +typedef struct private_job_queue_t private_job_queue_t; + /** * @brief Private Variables and Functions of job_queue class * */ -typedef struct private_job_queue_s private_job_queue_t; - - -struct private_job_queue_s { +struct private_job_queue_t { job_queue_t public; /** diff --git a/Source/charon/queues/job_queue.h b/Source/charon/queues/job_queue.h index 3fde9ccce..4c7c12241 100644 --- a/Source/charon/queues/job_queue.h +++ b/Source/charon/queues/job_queue.h @@ -26,15 +26,15 @@ #include <types.h> #include <queues/jobs/job.h> +typedef struct job_queue_t job_queue_t; + /** * @brief Job-Queue * * Although the job-queue is based on a linked_list_t * all access functions are thread-save implemented */ -typedef struct job_queue_s job_queue_t; - -struct job_queue_s { +struct job_queue_t { /** * @brief returns number of jobs in queue diff --git a/Source/charon/queues/jobs/delete_ike_sa_job.c b/Source/charon/queues/jobs/delete_ike_sa_job.c index 6d24d81eb..b87c4dc7d 100644 --- a/Source/charon/queues/jobs/delete_ike_sa_job.c +++ b/Source/charon/queues/jobs/delete_ike_sa_job.c @@ -24,13 +24,14 @@ #include <utils/allocator.h> + +typedef struct private_delete_ike_sa_job_t private_delete_ike_sa_job_t; + /** * Private data of an delete_ike_sa_job_t Object * */ -typedef struct private_delete_ike_sa_job_s private_delete_ike_sa_job_t; - -struct private_delete_ike_sa_job_s { +struct private_delete_ike_sa_job_t { /** * public delete_ike_sa_job_t interface */ diff --git a/Source/charon/queues/jobs/delete_ike_sa_job.h b/Source/charon/queues/jobs/delete_ike_sa_job.h index fe7c03f57..b5674fb59 100644 --- a/Source/charon/queues/jobs/delete_ike_sa_job.h +++ b/Source/charon/queues/jobs/delete_ike_sa_job.h @@ -28,13 +28,13 @@ #include <queues/jobs/job.h> +typedef struct delete_ike_sa_job_t delete_ike_sa_job_t; + /** * Object representing an DELETE_IKE_SA Job * */ -typedef struct delete_ike_sa_job_s delete_ike_sa_job_t; - -struct delete_ike_sa_job_s { +struct delete_ike_sa_job_t { /** * implements job_t interface */ diff --git a/Source/charon/queues/jobs/incoming_packet_job.c b/Source/charon/queues/jobs/incoming_packet_job.c index afd1474e0..9d66bee53 100644 --- a/Source/charon/queues/jobs/incoming_packet_job.c +++ b/Source/charon/queues/jobs/incoming_packet_job.c @@ -25,13 +25,14 @@ #include <utils/allocator.h> + +typedef struct private_incoming_packet_job_t private_incoming_packet_job_t; + /** * Private data of an incoming_packet_job_t Object * */ -typedef struct private_incoming_packet_job_s private_incoming_packet_job_t; - -struct private_incoming_packet_job_s { +struct private_incoming_packet_job_t { /** * public incoming_packet_job_t interface */ diff --git a/Source/charon/queues/jobs/incoming_packet_job.h b/Source/charon/queues/jobs/incoming_packet_job.h index 51842cfae..757ab12e3 100644 --- a/Source/charon/queues/jobs/incoming_packet_job.h +++ b/Source/charon/queues/jobs/incoming_packet_job.h @@ -27,13 +27,14 @@ #include <network/packet.h> #include <queues/jobs/job.h> + +typedef struct incoming_packet_job_t incoming_packet_job_t; + /** * Object representing an INCOMING_PACKET Job * */ -typedef struct incoming_packet_job_s incoming_packet_job_t; - -struct incoming_packet_job_s { +struct incoming_packet_job_t { /** * implements job_t interface */ diff --git a/Source/charon/queues/jobs/initiate_ike_sa_job.c b/Source/charon/queues/jobs/initiate_ike_sa_job.c index 59c1bf17e..b58bd71c4 100644 --- a/Source/charon/queues/jobs/initiate_ike_sa_job.c +++ b/Source/charon/queues/jobs/initiate_ike_sa_job.c @@ -27,13 +27,14 @@ #include <utils/allocator.h> + +typedef struct private_initiate_ike_sa_job_t private_initiate_ike_sa_job_t; + /** * Private data of an initiate_ike_sa_job_t Object * */ -typedef struct private_initiate_ike_sa_job_s private_initiate_ike_sa_job_t; - -struct private_initiate_ike_sa_job_s { +struct private_initiate_ike_sa_job_t { /** * public initiate_ike_sa_job_t interface */ diff --git a/Source/charon/queues/jobs/initiate_ike_sa_job.h b/Source/charon/queues/jobs/initiate_ike_sa_job.h index 4ffb732cd..a5bbc9300 100644 --- a/Source/charon/queues/jobs/initiate_ike_sa_job.h +++ b/Source/charon/queues/jobs/initiate_ike_sa_job.h @@ -26,13 +26,13 @@ #include <types.h> #include <queues/jobs/job.h> +typedef struct initiate_ike_sa_job_t initiate_ike_sa_job_t; + /** * Object representing an INITIATE_IKE_SA Job * */ -typedef struct initiate_ike_sa_job_s initiate_ike_sa_job_t; - -struct initiate_ike_sa_job_s { +struct initiate_ike_sa_job_t { /** * implements job_t interface */ diff --git a/Source/charon/queues/jobs/job.h b/Source/charon/queues/jobs/job.h index 59b0f7b65..57c615f25 100644 --- a/Source/charon/queues/jobs/job.h +++ b/Source/charon/queues/jobs/job.h @@ -26,12 +26,13 @@ #include <types.h> #include <definitions.h> + +typedef enum job_type_t job_type_t; + /** * Type of Jobs in Job-Queue */ -typedef enum job_type_e job_type_t; - -enum job_type_e { +enum job_type_t { /** * Process an incoming IKEv2-Message * @@ -61,14 +62,15 @@ enum job_type_e { extern mapping_t job_type_m[]; + +typedef struct job_t job_t; + /** * @brief Job-Interface as it is stored in the job queue * * A job consists of a job-type and one or more assigned values */ -typedef struct job_s job_t; - -struct job_s{ +struct job_t{ /** * @brief get type of job diff --git a/Source/charon/queues/send_queue.c b/Source/charon/queues/send_queue.c index 0cffa2d54..5782ce151 100644 --- a/Source/charon/queues/send_queue.c +++ b/Source/charon/queues/send_queue.c @@ -27,14 +27,14 @@ #include <utils/allocator.h> #include <utils/linked_list.h> + +typedef struct private_send_queue_t private_send_queue_t; + /** * @brief Private Variables and Functions of send_queue class * */ -typedef struct private_send_queue_s private_send_queue_t; - - -struct private_send_queue_s { +struct private_send_queue_t { /** * Public part of the send_queue_t object */ diff --git a/Source/charon/queues/send_queue.h b/Source/charon/queues/send_queue.h index c1f643c13..572c40e62 100644 --- a/Source/charon/queues/send_queue.h +++ b/Source/charon/queues/send_queue.h @@ -26,15 +26,16 @@ #include <types.h> #include <network/packet.h> + +typedef struct send_queue_t send_queue_t; + /** * @brief Send-Queue * * Although the send-queue is based on a linked_list_t * all access functions are thread-save implemented */ -typedef struct send_queue_s send_queue_t; - -struct send_queue_s { +struct send_queue_t { /** * @brief returns number of packets in queue |