diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2020-08-06 19:12:17 +0200 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2020-08-06 19:12:17 +0200 |
commit | 8c48060e129877767f58a8403deba8a4beaeea24 (patch) | |
tree | 79cbe944d851c7c7536b63641eb36cb96a87b4b5 /src/rest | |
parent | b12644f83637c2508a11927490ae0b94d8ee4095 (diff) | |
download | gnunet-8c48060e129877767f58a8403deba8a4beaeea24.tar.gz gnunet-8c48060e129877767f58a8403deba8a4beaeea24.zip |
-fix rest plugin issues
Diffstat (limited to 'src/rest')
-rw-r--r-- | src/rest/gnunet-rest-server.c | 2 | ||||
-rw-r--r-- | src/rest/plugin_rest_config.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/rest/gnunet-rest-server.c b/src/rest/gnunet-rest-server.c index 8a1c7e32f..e6e03b16d 100644 --- a/src/rest/gnunet-rest-server.c +++ b/src/rest/gnunet-rest-server.c | |||
@@ -937,7 +937,7 @@ do_shutdown (void *cls) | |||
937 | GNUNET_CONTAINER_DLL_remove (plugins_head, | 937 | GNUNET_CONTAINER_DLL_remove (plugins_head, |
938 | plugins_tail, | 938 | plugins_tail, |
939 | ple); | 939 | ple); |
940 | GNUNET_PLUGIN_unload (ple->libname, NULL); | 940 | GNUNET_PLUGIN_unload (ple->libname, ple->plugin); |
941 | GNUNET_free (ple->libname); | 941 | GNUNET_free (ple->libname); |
942 | GNUNET_free (ple); | 942 | GNUNET_free (ple); |
943 | } | 943 | } |
diff --git a/src/rest/plugin_rest_config.c b/src/rest/plugin_rest_config.c index d9ae57acd..e5d0fffb0 100644 --- a/src/rest/plugin_rest_config.c +++ b/src/rest/plugin_rest_config.c | |||
@@ -392,15 +392,13 @@ libgnunet_plugin_rest_config_init (void *cls) | |||
392 | cfg = cls; | 392 | cfg = cls; |
393 | struct GNUNET_REST_Plugin *api; | 393 | struct GNUNET_REST_Plugin *api; |
394 | 394 | ||
395 | if (NULL != plugin.cfg) | ||
396 | return NULL; /* can only initialize once! */ | ||
397 | memset (&plugin, 0, sizeof(struct Plugin)); | 395 | memset (&plugin, 0, sizeof(struct Plugin)); |
398 | plugin.cfg = cfg; | 396 | plugin.cfg = cfg; |
399 | api = GNUNET_new (struct GNUNET_REST_Plugin); | 397 | api = GNUNET_new (struct GNUNET_REST_Plugin); |
400 | api->cls = &plugin; | 398 | api->cls = &plugin; |
401 | api->name = GNUNET_REST_API_NS_CONFIG; | 399 | api->name = GNUNET_REST_API_NS_CONFIG; |
402 | api->process_request = &rest_config_process_request; | 400 | api->process_request = &rest_config_process_request; |
403 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, _ ("CONFIG REST API initialized\n")); | 401 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("CONFIG REST API initialized\n")); |
404 | return api; | 402 | return api; |
405 | } | 403 | } |
406 | 404 | ||
@@ -415,7 +413,9 @@ void * | |||
415 | libgnunet_plugin_rest_config_done (void *cls) | 413 | libgnunet_plugin_rest_config_done (void *cls) |
416 | { | 414 | { |
417 | struct GNUNET_REST_Plugin *api = cls; | 415 | struct GNUNET_REST_Plugin *api = cls; |
418 | struct Plugin *plugin = api->cls; | 416 | struct Plugin *plugin; |
417 | |||
418 | plugin = api->cls; | ||
419 | 419 | ||
420 | plugin->cfg = NULL; | 420 | plugin->cfg = NULL; |
421 | GNUNET_free (api); | 421 | GNUNET_free (api); |