Migrated load_tester_listern to INIT/METHOD macros

This commit is contained in:
Martin Willi
2011-05-16 15:24:15 +02:00
parent a4c040d536
commit 8606725676
@@ -47,11 +47,8 @@ struct private_load_tester_listener_t {
u_int shutdown_on; u_int shutdown_on;
}; };
/** METHOD(listener_t, ike_state_change, bool,
* Implementation of listener_t.ike_state_change private_load_tester_listener_t *this, ike_sa_t *ike_sa, ike_sa_state_t state)
*/
static bool ike_state_change(private_load_tester_listener_t *this,
ike_sa_t *ike_sa, ike_sa_state_t state)
{ {
if (state == IKE_ESTABLISHED) if (state == IKE_ESTABLISHED)
{ {
@@ -75,27 +72,27 @@ static bool ike_state_change(private_load_tester_listener_t *this,
return TRUE; return TRUE;
} }
/** METHOD(load_tester_listener_t, destroy, void,
* Implementation of load_tester_listener_t.destroy private_load_tester_listener_t *this)
*/
static void destroy(private_load_tester_listener_t *this)
{ {
free(this); free(this);
} }
load_tester_listener_t *load_tester_listener_create(u_int shutdown_on) load_tester_listener_t *load_tester_listener_create(u_int shutdown_on)
{ {
private_load_tester_listener_t *this = malloc_thing(private_load_tester_listener_t); private_load_tester_listener_t *this;
memset(&this->public.listener, 0, sizeof(listener_t)); INIT(this,
this->public.listener.ike_state_change = (void*)ike_state_change; .public = {
this->public.destroy = (void(*) (load_tester_listener_t*))destroy; .listener = {
.ike_state_change = _ike_state_change,
this->delete_after_established = lib->settings->get_bool(lib->settings, },
"charon.plugins.load-tester.delete_after_established", FALSE); .destroy = _destroy,
},
this->shutdown_on = shutdown_on; .delete_after_established = lib->settings->get_bool(lib->settings,
this->established = 0; "charon.plugins.load-tester.delete_after_established", FALSE),
.shutdown_on = shutdown_on,
);
return &this->public; return &this->public;
} }