diff options
| author | Martin Willi <martin@revosec.ch> | 2011-04-11 16:41:25 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2011-04-15 10:07:12 +0200 |
| commit | 6e2791715b7534b601ff5d5163d63d88ad7a8a5e (patch) | |
| tree | 2228f68dd17886b3a8b6bb3a2db2ae92a26570d9 /src/libcharon/plugins/smp/smp.c | |
| parent | 2b36342551c4d14da6eb29295ebdd60978a2d563 (diff) | |
| download | strongswan-6e2791715b7534b601ff5d5163d63d88ad7a8a5e.tar.bz2 strongswan-6e2791715b7534b601ff5d5163d63d88ad7a8a5e.tar.xz | |
Migrated remaining plugin_t implementations to INIT/METHOD macros
Diffstat (limited to 'src/libcharon/plugins/smp/smp.c')
| -rw-r--r-- | src/libcharon/plugins/smp/smp.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/libcharon/plugins/smp/smp.c b/src/libcharon/plugins/smp/smp.c index 60937f23d..0e6cf2a2a 100644 --- a/src/libcharon/plugins/smp/smp.c +++ b/src/libcharon/plugins/smp/smp.c @@ -707,10 +707,8 @@ static job_requeue_t dispatch(private_smp_t *this) return JOB_REQUEUE_DIRECT; } -/** - * Implementation of itnerface_t.destroy. - */ -static void destroy(private_smp_t *this) +METHOD(plugin_t, destroy, void, + private_smp_t *this) { this->job->cancel(this->job); close(this->socket); @@ -723,10 +721,16 @@ static void destroy(private_smp_t *this) plugin_t *smp_plugin_create() { struct sockaddr_un unix_addr = { AF_UNIX, IPSEC_PIDDIR "/charon.xml"}; - private_smp_t *this = malloc_thing(private_smp_t); + private_smp_t *this; mode_t old; - this->public.plugin.destroy = (void (*)(plugin_t*))destroy; + INIT(this, + .public = { + .plugin = { + .destroy = _destroy, + }, + }, + ); /* set up unix socket */ this->socket = socket(AF_UNIX, SOCK_STREAM, 0); |