Migrated child_create_t to INIT/METHOD macros

diff --git a/src/libcharon/sa/tasks/child_create.c b/src/libcharon/sa/tasks/child_create.c
index 9a50dff047df33a45d3b34e1a51f8f6d927f9e9c..c77486157dd7ebea112467f46a99dc6b88f15000 100644 (file)
--- a/src/libcharon/sa/tasks/child_create.c
+++ b/src/libcharon/sa/tasks/child_create.c
@@ -706,10 +706,8 @@ static void process_payloads(private_child_create_t *this, message_t *message)
        enumerator->destroy(enumerator);
 }
 
-/**
- * Implementation of task_t.build for initiator
- */
-static status_t build_i(private_child_create_t *this, message_t *message)
+METHOD(task_t, build_i, status_t,
+       private_child_create_t *this, message_t *message)
 {
        host_t *me, *other, *vip;
        peer_cfg_t *peer_cfg;
@@ -846,10 +844,8 @@ static status_t build_i(private_child_create_t *this, message_t *message)
        return NEED_MORE;
 }
 
-/**
- * Implementation of task_t.process for responder
- */
-static status_t process_r(private_child_create_t *this, message_t *message)
+METHOD(task_t, process_r, status_t,
+       private_child_create_t *this, message_t *message)
 {
        switch (message->get_exchange_type(message))
        {
@@ -892,10 +888,8 @@ static void handle_child_sa_failure(private_child_create_t *this,
        }
 }
 
-/**
- * Implementation of task_t.build for responder
- */
-static status_t build_r(private_child_create_t *this, message_t *message)
+METHOD(task_t, build_r, status_t,
+       private_child_create_t *this, message_t *message)
 {
        peer_cfg_t *peer_cfg;
        payload_t *payload;
@@ -1044,10 +1038,8 @@ static status_t build_r(private_child_create_t *this, message_t *message)
        return SUCCESS;
 }
 
-/**
- * Implementation of task_t.process for initiator
- */
-static status_t process_i(private_child_create_t *this, message_t *message)
+METHOD(task_t, process_i, status_t,
+       private_child_create_t *this, message_t *message)
 {
        enumerator_t *enumerator;
        payload_t *payload;
@@ -1170,34 +1162,20 @@ static status_t process_i(private_child_create_t *this, message_t *message)
        return SUCCESS;
 }
 
-/**
- * Implementation of task_t.get_type
- */
-static task_type_t get_type(private_child_create_t *this)
-{
-       return CHILD_CREATE;
-}
-
-/**
- * Implementation of child_create_t.use_reqid
- */
-static void use_reqid(private_child_create_t *this, u_int32_t reqid)
+METHOD(child_create_t, use_reqid, void,
+       private_child_create_t *this, u_int32_t reqid)
 {
        this->reqid = reqid;
 }
 
-/**
- * Implementation of child_create_t.get_child
- */
-static child_sa_t* get_child(private_child_create_t *this)
+METHOD(child_create_t, get_child, child_sa_t*,
+       private_child_create_t *this)
 {
        return this->child_sa;
 }
 
-/**
- * Implementation of child_create_t.get_lower_nonce
- */
-static chunk_t get_lower_nonce(private_child_create_t *this)
+METHOD(child_create_t, get_lower_nonce, chunk_t,
+       private_child_create_t *this)
 {
        if (memcmp(this->my_nonce.ptr, this->other_nonce.ptr,
                           min(this->my_nonce.len, this->other_nonce.len)) < 0)
@@ -1210,10 +1188,14 @@ static chunk_t get_lower_nonce(private_child_create_t *this)
        }
 }
 
-/**
- * Implementation of task_t.migrate
- */
-static void migrate(private_child_create_t *this, ike_sa_t *ike_sa)
+METHOD(task_t, get_type, task_type_t,
+       private_child_create_t *this)
+{
+       return CHILD_CREATE;
+}
+
+METHOD(task_t, migrate, void,
+       private_child_create_t *this, ike_sa_t *ike_sa)
 {
        chunk_free(&this->my_nonce);
        chunk_free(&this->other_nonce);
@@ -1249,10 +1231,8 @@ static void migrate(private_child_create_t *this, ike_sa_t *ike_sa)
        this->established = FALSE;
 }
 
-/**
- * Implementation of task_t.destroy
- */
-static void destroy(private_child_create_t *this)
+METHOD(task_t, destroy, void,
+       private_child_create_t *this)
 {
        chunk_free(&this->my_nonce);
        chunk_free(&this->other_nonce);
@@ -1288,53 +1268,45 @@ child_create_t *child_create_create(ike_sa_t *ike_sa,
                                                        child_cfg_t *config, bool rekey,
                                                        traffic_selector_t *tsi, traffic_selector_t *tsr)
 {
-       private_child_create_t *this = malloc_thing(private_child_create_t);
-
-       this->public.get_child = (child_sa_t*(*)(child_create_t*))get_child;
-       this->public.get_lower_nonce = (chunk_t(*)(child_create_t*))get_lower_nonce;
-       this->public.use_reqid = (void(*)(child_create_t*,u_int32_t))use_reqid;
-       this->public.task.get_type = (task_type_t(*)(task_t*))get_type;
-       this->public.task.migrate = (void(*)(task_t*,ike_sa_t*))migrate;
-       this->public.task.destroy = (void(*)(task_t*))destroy;
+       private_child_create_t *this;
+
+       INIT(this,
+               .public = {
+                       .get_child = _get_child,
+                       .get_lower_nonce = _get_lower_nonce,
+                       .use_reqid = _use_reqid,
+                       .task = {
+                               .get_type = _get_type,
+                               .migrate = _migrate,
+                               .destroy = _destroy,
+                       },
+               },
+               .ike_sa = ike_sa,
+               .config = config,
+               .packet_tsi = tsi ? tsi->clone(tsi) : NULL,
+               .packet_tsr = tsr ? tsr->clone(tsr) : NULL,
+               .dh_group = MODP_NONE,
+               .keymat = ike_sa->get_keymat(ike_sa),
+               .mode = MODE_TUNNEL,
+               .tfcv3 = TRUE,
+               .ipcomp = IPCOMP_NONE,
+               .ipcomp_received = IPCOMP_NONE,
+               .rekey = rekey,
+       );
+
        if (config)
        {
-               this->public.task.build = (status_t(*)(task_t*,message_t*))build_i;
-               this->public.task.process = (status_t(*)(task_t*,message_t*))process_i;
-               this->initiator = TRUE;
+               this->public.task.build = _build_i;
+               this->public.task.process = _process_i;
+               this->initiator = TRUE;
                config->get_ref(config);
        }
        else
        {
-               this->public.task.build = (status_t(*)(task_t*,message_t*))build_r;
-               this->public.task.process = (status_t(*)(task_t*,message_t*))process_r;
+               this->public.task.build = _build_r;
+               this->public.task.process = _process_r;
                this->initiator = FALSE;
        }
 
-       this->ike_sa = ike_sa;
-       this->config = config;
-       this->my_nonce = chunk_empty;
-       this->other_nonce = chunk_empty;
-       this->proposals = NULL;
-       this->proposal = NULL;
-       this->tsi = NULL;
-       this->tsr = NULL;
-       this->packet_tsi = tsi ? tsi->clone(tsi) : NULL;
-       this->packet_tsr = tsr ? tsr->clone(tsr) : NULL;
-       this->dh = NULL;
-       this->dh_group = MODP_NONE;
-       this->keymat = ike_sa->get_keymat(ike_sa);
-       this->child_sa = NULL;
-       this->mode = MODE_TUNNEL;
-       this->tfcv3 = TRUE;
-       this->ipcomp = IPCOMP_NONE;
-       this->ipcomp_received = IPCOMP_NONE;
-       this->my_spi = 0;
-       this->other_spi = 0;
-       this->my_cpi = 0;
-       this->other_cpi = 0;
-       this->reqid = 0;
-       this->established = FALSE;
-       this->rekey = rekey;
-
        return &this->public;
 }