Migrated cp_payload to INIT/METHOD macros
authorMartin Willi <martin@revosec.ch>
Wed, 24 Nov 2010 10:16:37 +0000 (11:16 +0100)
committerMartin Willi <martin@revosec.ch>
Wed, 5 Jan 2011 15:45:50 +0000 (16:45 +0100)
src/libcharon/encoding/payloads/cp_payload.c

index f0a26ee..1c03262 100644 (file)
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2005-2009 Martin Willi
+ * Copyright (C) 2005-2010 Martin Willi
+ * Copyright (C) 2010 revosec AG
  * Copyright (C) 2005 Jan Hutter
  * Hochschule fuer Technik Rapperswil
  *
@@ -32,9 +33,9 @@ typedef struct private_cp_payload_t private_cp_payload_t;
 
 /**
  * Private data of an cp_payload_t object.
- *
  */
 struct private_cp_payload_t {
+
        /**
         * Public cp_payload_t interface.
         */
@@ -71,30 +72,29 @@ struct private_cp_payload_t {
  *
  * The defined offsets are the positions in a object of type
  * private_cp_payload_t.
- *
  */
 encoding_rule_t cp_payload_encodings[] = {
        /* 1 Byte next payload type, stored in the field next_payload */
-       { U_INT_8,              offsetof(private_cp_payload_t, next_payload)                    },
+       { U_INT_8,                                      offsetof(private_cp_payload_t, next_payload)    },
        /* the critical bit */
-       { FLAG,                 offsetof(private_cp_payload_t, critical)                                },
+       { FLAG,                                         offsetof(private_cp_payload_t, critical)                },
        /* 7 Bit reserved bits, nowhere stored */
-       { RESERVED_BIT, 0                                                                                                               },
-       { RESERVED_BIT, 0                                                                                                               },
-       { RESERVED_BIT, 0                                                                                                               },
-       { RESERVED_BIT, 0                                                                                                               },
-       { RESERVED_BIT, 0                                                                                                               },
-       { RESERVED_BIT, 0                                                                                                               },
-       { RESERVED_BIT, 0                                                                                                               },
+       { RESERVED_BIT,                         0                                                                                               },
+       { RESERVED_BIT,                         0                                                                                               },
+       { RESERVED_BIT,                         0                                                                                               },
+       { RESERVED_BIT,                         0                                                                                               },
+       { RESERVED_BIT,                         0                                                                                               },
+       { RESERVED_BIT,                         0                                                                                               },
+       { RESERVED_BIT,                         0                                                                                               },
        /* Length of the whole CP payload*/
-       { PAYLOAD_LENGTH,               offsetof(private_cp_payload_t, payload_length)  },
+       { PAYLOAD_LENGTH,                       offsetof(private_cp_payload_t, payload_length)  },
        /* Proposals are stored in a proposal substructure,
           offset points to a linked_list_t pointer */
-       { U_INT_8,                              offsetof(private_cp_payload_t, type)                    },
-       { RESERVED_BYTE,0                                                                                                               },
-       { RESERVED_BYTE,0                                                                                                               },
-       { RESERVED_BYTE,0                                                                                                               },
-       { CONFIGURATION_ATTRIBUTES,     offsetof(private_cp_payload_t, attributes)      }
+       { U_INT_8,                                      offsetof(private_cp_payload_t, type)                    },
+       { RESERVED_BYTE,0                                                                                                                       },
+       { RESERVED_BYTE,0                                                                                                                       },
+       { RESERVED_BYTE,0                                                                                                                       },
+       { CONFIGURATION_ATTRIBUTES,     offsetof(private_cp_payload_t, attributes)              }
 };
 
 /*
@@ -111,10 +111,8 @@ encoding_rule_t cp_payload_encodings[] = {
       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 */
 
-/**
- * Implementation of payload_t.verify.
- */
-static status_t verify(private_cp_payload_t *this)
+METHOD(payload_t, verify, status_t,
+       private_cp_payload_t *this)
 {
        status_t status = SUCCESS;
        enumerator_t *enumerator;
@@ -133,36 +131,27 @@ static status_t verify(private_cp_payload_t *this)
        return status;
 }
 
-/**
- * Implementation of payload_t.get_encoding_rules.
- */
-static void get_encoding_rules(private_cp_payload_t *this,
-                                                          encoding_rule_t **rules, size_t *rule_count)
+METHOD(payload_t, get_encoding_rules, void,
+       private_cp_payload_t *this, encoding_rule_t **rules, size_t *rule_count)
 {
        *rules = cp_payload_encodings;
-       *rule_count = sizeof(cp_payload_encodings) / sizeof(encoding_rule_t);
+       *rule_count = countof(cp_payload_encodings);
 }
 
-/**
- * Implementation of payload_t.get_type.
- */
-static payload_type_t get_type(private_cp_payload_t *this)
+METHOD(payload_t, get_type, payload_type_t,
+       private_cp_payload_t *this)
 {
        return CONFIGURATION;
 }
 
-/**
- * Implementation of payload_t.get_next_type.
- */
-static payload_type_t get_next_type(private_cp_payload_t *this)
+METHOD(payload_t, get_next_type, payload_type_t,
+       private_cp_payload_t *this)
 {
        return this->next_payload;
 }
 
-/**
- * Implementation of payload_t.set_next_type.
- */
-static void set_next_type(private_cp_payload_t *this,payload_type_t type)
+METHOD(payload_t, set_next_type, void,
+       private_cp_payload_t *this,payload_type_t type)
 {
        this->next_payload = type;
 }
@@ -185,44 +174,33 @@ static void compute_length(private_cp_payload_t *this)
        enumerator->destroy(enumerator);
 }
 
-/**
- * Implementation of payload_t.get_length.
- */
-static size_t get_length(private_cp_payload_t *this)
+METHOD(payload_t, get_length, size_t,
+       private_cp_payload_t *this)
 {
        return this->payload_length;
 }
 
-/**
- * Implementation of cp_payload_t.create_attribute_enumerator.
- */
-static enumerator_t *create_attribute_enumerator(private_cp_payload_t *this)
+METHOD(cp_payload_t, create_attribute_enumerator, enumerator_t*,
+       private_cp_payload_t *this)
 {
        return this->attributes->create_enumerator(this->attributes);
 }
 
-/**
- * Implementation of cp_payload_t.add_attribute.
- */
-static void add_attribute(private_cp_payload_t *this,
-                                                 configuration_attribute_t *attribute)
+METHOD(cp_payload_t, add_attribute, void,
+       private_cp_payload_t *this, configuration_attribute_t *attribute)
 {
        this->attributes->insert_last(this->attributes, attribute);
        compute_length(this);
 }
 
-/**
- * Implementation of cp_payload_t.get_type.
- */
-static config_type_t get_config_type(private_cp_payload_t *this)
+METHOD(cp_payload_t, get_config_type, config_type_t,
+       private_cp_payload_t *this)
 {
        return this->type;
 }
 
-/**
- * Implementation of payload_t.destroy and cp_payload_t.destroy.
- */
-static void destroy(private_cp_payload_t *this)
+METHOD2(payload_t, cp_payload_t, destroy, void,
+       private_cp_payload_t *this)
 {
        this->attributes->destroy_offset(this->attributes,
                                                                offsetof(configuration_attribute_t, destroy));
@@ -232,42 +210,38 @@ static void destroy(private_cp_payload_t *this)
 /*
  * Described in header.
  */
-cp_payload_t *cp_payload_create()
+cp_payload_t *cp_payload_create_type(config_type_t type)
 {
-       private_cp_payload_t *this = malloc_thing(private_cp_payload_t);
-
-       this->public.payload_interface.verify = (status_t (*) (payload_t *))verify;
-       this->public.payload_interface.get_encoding_rules = (void (*) (payload_t *, encoding_rule_t **, size_t *) ) get_encoding_rules;
-       this->public.payload_interface.get_length = (size_t (*) (payload_t *)) get_length;
-       this->public.payload_interface.get_next_type = (payload_type_t (*) (payload_t *)) get_next_type;
-       this->public.payload_interface.set_next_type = (void (*) (payload_t *,payload_type_t)) set_next_type;
-       this->public.payload_interface.get_type = (payload_type_t (*) (payload_t *)) get_type;
-       this->public.payload_interface.destroy = (void (*) (payload_t *))destroy;
-
-       this->public.create_attribute_enumerator = (enumerator_t*(*)(cp_payload_t *))create_attribute_enumerator;
-       this->public.add_attribute = (void (*) (cp_payload_t *,configuration_attribute_t*))add_attribute;
-       this->public.get_type = (config_type_t (*) (cp_payload_t *))get_config_type;
-       this->public.destroy = (void (*)(cp_payload_t *))destroy;
-
-       /* set default values of the fields */
-       this->critical = FALSE;
-       this->next_payload = NO_PAYLOAD;
-       this->payload_length = CP_PAYLOAD_HEADER_LENGTH;
-       this->attributes = linked_list_create();
-       this->type = CFG_REQUEST;
-
+       private_cp_payload_t *this;
+
+       INIT(this,
+               .public = {
+                       .payload_interface = {
+                               .verify = _verify,
+                               .get_encoding_rules = _get_encoding_rules,
+                               .get_length = _get_length,
+                               .get_next_type = _get_next_type,
+                               .set_next_type = _set_next_type,
+                               .get_type = _get_type,
+                               .destroy = _destroy,
+                       },
+                       .create_attribute_enumerator = _create_attribute_enumerator,
+                       .add_attribute = _add_attribute,
+                       .get_type = _get_config_type,
+                       .destroy = _destroy,
+               },
+               .next_payload = NO_PAYLOAD,
+               .payload_length = CP_PAYLOAD_HEADER_LENGTH,
+               .attributes = linked_list_create(),
+               .type = type,
+       );
        return &this->public;
 }
 
 /*
  * Described in header.
  */
-cp_payload_t *cp_payload_create_type(config_type_t type)
+cp_payload_t *cp_payload_create()
 {
-       private_cp_payload_t *this = (private_cp_payload_t*)cp_payload_create();
-
-       this->type = type;
-
-       return &this->public;
+       return cp_payload_create_type(CFG_REQUEST);
 }
-