denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrated ike_reauth to INIT/METHOD macros

Browse Source
This commit is contained in:
Andreas Steffen
2011-10-03 21:38:04 +02:00
parent 6b44a99f9e
commit 7db8fd0d9a
1 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/tasks/ike_reauth.c
+24 -29
View File
@@ -42,18 +42,14 @@ struct private_ike_reauth_t {
ike_delete_t *ike_delete; ike_delete_t *ike_delete;
}; };
/** METHOD(task_t, build_i, status_t,
* Implementation of task_t.build for initiator private_ike_reauth_t *this, message_t *message)
*/
static status_t build_i(private_ike_reauth_t *this, message_t *message)
{ {
return this->ike_delete->task.build(&this->ike_delete->task, message); return this->ike_delete->task.build(&this->ike_delete->task, message);
} }
/** METHOD(task_t, process_i, status_t,
* Implementation of task_t.process for initiator private_ike_reauth_t *this, message_t *message)
*/
static status_t process_i(private_ike_reauth_t *this, message_t *message)
{ {
ike_sa_t *new; ike_sa_t *new;
host_t *host; host_t *host;
@@ -148,27 +144,21 @@ static status_t process_i(private_ike_reauth_t *this, message_t *message)
return DESTROY_ME; return DESTROY_ME;
} }
/** METHOD(task_t, get_type, task_type_t,
* Implementation of task_t.get_type private_ike_reauth_t *this)
*/
static task_type_t get_type(private_ike_reauth_t *this)
{ {
return IKE_REAUTH; return IKE_REAUTH;
} }
/** METHOD(task_t, migrate, void,
* Implementation of task_t.migrate private_ike_reauth_t *this, ike_sa_t *ike_sa)
*/
static void migrate(private_ike_reauth_t *this, ike_sa_t *ike_sa)
{ {
this->ike_delete->task.migrate(&this->ike_delete->task, ike_sa); this->ike_delete->task.migrate(&this->ike_delete->task, ike_sa);
this->ike_sa = ike_sa; this->ike_sa = ike_sa;
} }
/** METHOD(task_t, destroy, void,
* Implementation of task_t.destroy private_ike_reauth_t *this)
*/
static void destroy(private_ike_reauth_t *this)
{ {
this->ike_delete->task.destroy(&this->ike_delete->task); this->ike_delete->task.destroy(&this->ike_delete->task);
free(this); free(this);
@@ -179,16 +169,21 @@ static void destroy(private_ike_reauth_t *this)
*/ */
ike_reauth_t *ike_reauth_create(ike_sa_t *ike_sa) ike_reauth_t *ike_reauth_create(ike_sa_t *ike_sa)
{ {
private_ike_reauth_t *this = malloc_thing(private_ike_reauth_t); private_ike_reauth_t *this;
this->public.task.get_type = (task_type_t(*)(task_t*))get_type; INIT(this,
this->public.task.migrate = (void(*)(task_t*,ike_sa_t*))migrate; .public = {
this->public.task.destroy = (void(*)(task_t*))destroy; .task = {
this->public.task.build = (status_t(*)(task_t*,message_t*))build_i; .get_type = _get_type,
this->public.task.process = (status_t(*)(task_t*,message_t*))process_i; .migrate = _migrate,
.build = _build_i,
this->ike_sa = ike_sa; .process = _process_i,
this->ike_delete = ike_delete_create(ike_sa, TRUE); .destroy = _destroy,
},
},
.ike_sa = ike_sa,
.ike_delete = ike_delete_create(ike_sa, TRUE),
);
return &this->public; return &this->public;
} }