Merge branch 'master' of ssh://gnunet.org/gnunet

3 files changed, 75 insertions, 10 deletions

diff --git a/src/rest/gnunet-rest-server.c b/src/rest/gnunet-rest-server.c
index 436b5b205..e6e03b16d 100644
--- a/src/rest/gnunet-rest-server.c
+++ b/src/rest/gnunet-rest-server.c
@@ -208,6 +208,11 @@ struct AcceptedRequest
    * Connection
    */
   struct MhdConnectionHandle *con_handle;
+
+  /**
+   * State
+   */
+  int socket_with_mhd;
 };
 
 /**
@@ -310,7 +315,13 @@ cleanup_ar (struct AcceptedRequest *ar)
   {
     cleanup_handle (ar->con_handle);
   }
-  GNUNET_NETWORK_socket_free_memory_only_ (ar->sock);
+  if (GNUNET_YES == ar->socket_with_mhd)
+  {
+    GNUNET_NETWORK_socket_free_memory_only_ (ar->sock);
+  } else {
+    GNUNET_NETWORK_socket_close (ar->sock);
+  }
+  ar->sock = NULL;
   GNUNET_CONTAINER_DLL_remove (req_list_head,
                                req_list_tail,
                                ar);
@@ -529,7 +540,7 @@ create_response (void *cls,
     MHD_suspend_connection (con_handle->con);
     return MHD_YES;
   }
-  MHD_resume_connection (con_handle->con);
+  //MHD_resume_connection (con_handle->con);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Queueing response from plugin with MHD\n");
   // Handle Preflights for extensions
@@ -767,7 +778,7 @@ mhd_completed_cb (void *cls,
     cleanup_handle (ar->con_handle);
     ar->con_handle = NULL;
   }
-  schedule_httpd ();
+  ar->socket_with_mhd = GNUNET_YES;
   *con_cls = NULL;
 }
 
@@ -882,6 +893,7 @@ do_accept (void *cls)
   else
     GNUNET_assert (0);
   ar = GNUNET_new (struct AcceptedRequest);
+  ar->socket_with_mhd = GNUNET_YES;
   ar->sock = GNUNET_NETWORK_socket_accept (lsock, NULL, NULL);
   if (NULL == ar->sock)
   {
@@ -925,7 +937,7 @@ do_shutdown (void *cls)
     GNUNET_CONTAINER_DLL_remove (plugins_head,
                                  plugins_tail,
                                  ple);
-    GNUNET_PLUGIN_unload (ple->libname, NULL);
+    GNUNET_PLUGIN_unload (ple->libname, ple->plugin);
     GNUNET_free (ple->libname);
     GNUNET_free (ple);
   }
diff --git a/src/rest/plugin_rest_config.c b/src/rest/plugin_rest_config.c
index d9ae57acd..af833efff 100644
--- a/src/rest/plugin_rest_config.c
+++ b/src/rest/plugin_rest_config.c
@@ -45,6 +45,16 @@ const struct GNUNET_CONFIGURATION_Handle *cfg;
 struct RequestHandle
 {
   /**
+   * DLL
+   */
+  struct RequestHandle *next;
+
+  /**
+   * DLL
+   */
+  struct RequestHandle *prev;
+
+  /**
    * Handle to rest request
    */
   struct GNUNET_REST_RequestHandle *rest_handle;
@@ -70,6 +80,17 @@ struct RequestHandle
   char *url;
 };
 
+/**
+ * DLL
+ */
+static struct RequestHandle *requests_head;
+
+/**
+ * DLL
+ */
+static struct RequestHandle *requests_tail;
+
+
 
 /**
  * Cleanup request handle.
@@ -82,6 +103,9 @@ cleanup_handle (struct RequestHandle *handle)
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Cleaning up\n");
   if (NULL != handle->url)
     GNUNET_free (handle->url);
+  GNUNET_CONTAINER_DLL_remove (requests_head,
+                               requests_tail,
+                               handle);
   GNUNET_free (handle);
 }
 
@@ -367,7 +391,9 @@ rest_config_process_request (struct GNUNET_REST_RequestHandle *conndata_handle,
   handle->url = GNUNET_strdup (conndata_handle->url);
   if (handle->url[strlen (handle->url) - 1] == '/')
     handle->url[strlen (handle->url) - 1] = '\0';
-
+  GNUNET_CONTAINER_DLL_insert (requests_head,
+                               requests_tail,
+                               handle);
   if (GNUNET_NO ==
       GNUNET_REST_handle_request (conndata_handle, handlers, &err, handle))
   {
@@ -392,15 +418,13 @@ libgnunet_plugin_rest_config_init (void *cls)
   cfg = cls;
   struct GNUNET_REST_Plugin *api;
 
-  if (NULL != plugin.cfg)
-    return NULL; /* can only initialize once! */
   memset (&plugin, 0, sizeof(struct Plugin));
   plugin.cfg = cfg;
   api = GNUNET_new (struct GNUNET_REST_Plugin);
   api->cls = &plugin;
   api->name = GNUNET_REST_API_NS_CONFIG;
   api->process_request = &rest_config_process_request;
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, _ ("CONFIG REST API initialized\n"));
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("CONFIG REST API initialized\n"));
   return api;
 }
 
@@ -415,8 +439,11 @@ void *
 libgnunet_plugin_rest_config_done (void *cls)
 {
   struct GNUNET_REST_Plugin *api = cls;
-  struct Plugin *plugin = api->cls;
+  struct Plugin *plugin;
 
+  while (NULL != requests_head)
+    cleanup_handle (requests_head);
+  plugin = api->cls;
   plugin->cfg = NULL;
   GNUNET_free (api);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "CONFIG REST plugin is finished\n");
diff --git a/src/rest/plugin_rest_copying.c b/src/rest/plugin_rest_copying.c
index 1649da3bb..6d074d3d1 100644
--- a/src/rest/plugin_rest_copying.c
+++ b/src/rest/plugin_rest_copying.c
@@ -46,6 +46,16 @@ const struct GNUNET_CONFIGURATION_Handle *cfg;
 struct RequestHandle
 {
   /**
+   * DLL
+   */
+  struct RequestHandle *next;
+
+  /**
+   * DLL
+   */
+  struct RequestHandle *prev;
+
+  /**
    * Handle to rest request
    */
   struct GNUNET_REST_RequestHandle *rest_handle;
@@ -66,6 +76,15 @@ struct RequestHandle
   int response_code;
 };
 
+/**
+ * DLL
+ */
+static struct RequestHandle *requests_head;
+
+/**
+ * DLL
+ */
+static struct RequestHandle *requests_tail;
 
 /**
  * Cleanup request handle.
@@ -77,6 +96,9 @@ cleanup_handle (struct RequestHandle *handle)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Cleaning up\n");
+  GNUNET_CONTAINER_DLL_remove (requests_head,
+                               requests_tail,
+                               handle);
   GNUNET_free (handle);
 }
 
@@ -153,7 +175,9 @@ rest_copying_process_request (struct GNUNET_REST_RequestHandle *conndata_handle,
   handle->proc_cls = proc_cls;
   handle->proc = proc;
   handle->rest_handle = conndata_handle;
-
+  GNUNET_CONTAINER_DLL_insert (requests_head,
+                               requests_tail,
+                               handle);
   return GNUNET_REST_handle_request (conndata_handle,
                                      handlers,
                                      &err,
@@ -201,6 +225,8 @@ libgnunet_plugin_rest_copying_done (void *cls)
   struct GNUNET_REST_Plugin *api = cls;
   struct Plugin *plugin = api->cls;
 
+  while (NULL != requests_head)
+    cleanup_handle (requests_head);
   plugin->cfg = NULL;
   GNUNET_free (api);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,