Merge upstream version 4.5.2

1 files changed, 18 insertions, 6 deletions

diff --git a/src/libcharon/plugins/smp/smp.c b/src/libcharon/plugins/smp/smp.c
index 60937f23d..d20f32248 100644
--- a/src/libcharon/plugins/smp/smp.c
+++ b/src/libcharon/plugins/smp/smp.c
@@ -707,10 +707,14 @@ 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, get_name, char*,
+	private_smp_t *this)
+{
+	return "smp";
+}
+
+METHOD(plugin_t, destroy, void,
+	private_smp_t *this)
 {
 	this->job->cancel(this->job);
 	close(this->socket);
@@ -723,10 +727,18 @@ 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 = {
+				.get_name = _get_name,
+				.reload = (void*)return_false,
+				.destroy = _destroy,
+			},
+		},
+	);
 
 	/* set up unix socket */
 	this->socket = socket(AF_UNIX, SOCK_STREAM, 0);