diff options
| author | Martin Willi <martin@revosec.ch> | 2011-05-05 12:48:38 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2011-05-16 15:24:15 +0200 |
| commit | 86067256762ee8660c04c9b3db45c2351dc5d5c8 (patch) | |
| tree | fd7827b49ee0b00209666183ebd6d7d6512fff1c /src | |
| parent | a4c040d5366200cc550b311825328f448403084c (diff) | |
| download | strongswan-86067256762ee8660c04c9b3db45c2351dc5d5c8.tar.bz2 strongswan-86067256762ee8660c04c9b3db45c2351dc5d5c8.tar.xz | |
Migrated load_tester_listern to INIT/METHOD macros
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcharon/plugins/load_tester/load_tester_listener.c | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/src/libcharon/plugins/load_tester/load_tester_listener.c b/src/libcharon/plugins/load_tester/load_tester_listener.c index cf6dd0562..328b5510a 100644 --- a/src/libcharon/plugins/load_tester/load_tester_listener.c +++ b/src/libcharon/plugins/load_tester/load_tester_listener.c @@ -47,11 +47,8 @@ struct private_load_tester_listener_t { u_int shutdown_on; }; -/** - * Implementation of listener_t.ike_state_change - */ -static bool ike_state_change(private_load_tester_listener_t *this, - ike_sa_t *ike_sa, ike_sa_state_t state) +METHOD(listener_t, ike_state_change, bool, + private_load_tester_listener_t *this, ike_sa_t *ike_sa, ike_sa_state_t state) { if (state == IKE_ESTABLISHED) { @@ -75,27 +72,27 @@ static bool ike_state_change(private_load_tester_listener_t *this, return TRUE; } -/** - * Implementation of load_tester_listener_t.destroy - */ -static void destroy(private_load_tester_listener_t *this) +METHOD(load_tester_listener_t, destroy, void, + private_load_tester_listener_t *this) { free(this); } 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); - - memset(&this->public.listener, 0, sizeof(listener_t)); - this->public.listener.ike_state_change = (void*)ike_state_change; - this->public.destroy = (void(*) (load_tester_listener_t*))destroy; - - this->delete_after_established = lib->settings->get_bool(lib->settings, - "charon.plugins.load-tester.delete_after_established", FALSE); - - this->shutdown_on = shutdown_on; - this->established = 0; + private_load_tester_listener_t *this; + + INIT(this, + .public = { + .listener = { + .ike_state_change = _ike_state_change, + }, + .destroy = _destroy, + }, + .delete_after_established = lib->settings->get_bool(lib->settings, + "charon.plugins.load-tester.delete_after_established", FALSE), + .shutdown_on = shutdown_on, + ); return &this->public; } |