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

Migrated control_controller_t to INIT/METHOD macros.

Browse Source
This commit is contained in:
Tobias Brunner
2011-10-04 11:25:22 +02:00
parent 62d4707b20
commit a17eb787de
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/manager/controller/control_controller.c
+18 -19
View File
@@ -120,19 +120,15 @@ static void terminate(private_control_controller_t *this, request_t *r,
handle_result(this, r, e); handle_result(this, r, e);
} }
/** METHOD(controller_t, get_name, char*,
* Implementation of controller_t.get_name private_control_controller_t *this)
*/
static char* get_name(private_control_controller_t *this)
{ {
return "control"; return "control";
} }
/** METHOD(controller_t, handle, void,
* Implementation of controller_t.handle private_control_controller_t *this, request_t *request, char *action,
*/ char *str, char *p3, char *p4, char *p5)
static void handle(private_control_controller_t *this,
request_t *request, char *action, char *str)
{ {
if (!this->manager->logged_in(this->manager)) if (!this->manager->logged_in(this->manager))
{ {
@@ -178,10 +174,8 @@ static void handle(private_control_controller_t *this,
return request->redirect(request, "ikesa/list"); return request->redirect(request, "ikesa/list");
} }
/** METHOD(controller_t, destroy, void,
* Implementation of controller_t.destroy private_control_controller_t *this)
*/
static void destroy(private_control_controller_t *this)
{ {
free(this); free(this);
} }
@@ -191,13 +185,18 @@ static void destroy(private_control_controller_t *this)
*/ */
controller_t *control_controller_create(context_t *context, void *param) controller_t *control_controller_create(context_t *context, void *param)
{ {
private_control_controller_t *this = malloc_thing(private_control_controller_t); private_control_controller_t *this;
this->public.controller.get_name = (char*(*)(controller_t*))get_name; INIT(this,
this->public.controller.handle = (void(*)(controller_t*,request_t*,char*,char*,char*,char*,char*))handle; .public = {
this->public.controller.destroy = (void(*)(controller_t*))destroy; .controller = {
.get_name = _get_name,
this->manager = (manager_t*)context; .handle = _handle,
.destroy = _destroy,
},
},
.manager = (manager_t*)context,
);
return &this->public.controller; return &this->public.controller;
} }