-more rest handling

4 files changed, 112 insertions, 34 deletions

diff --git a/src/identity/plugin_rest_identity.c b/src/identity/plugin_rest_identity.c
index ea611128d..75c65466c 100644
--- a/src/identity/plugin_rest_identity.c
+++ b/src/identity/plugin_rest_identity.c
@@ -285,12 +285,15 @@ get_ego_for_subsys (void *cls,
  * @param handle the RequestHandle
  */
 void
-ego_info_response (struct RequestHandle *handle)
+ego_info_response (struct RestConnectionDataHandle *con,
+                   const char *url,
+                   void *cls)
 {
   const char *egoname;
   char *keystring;
   char *result_str;
   char *subsys_val;
+  struct RequestHandle *handle = cls;
   struct EgoEntry *ego_entry;
   struct GNUNET_HashCode key;
   struct MHD_Response *resp;
@@ -414,9 +417,12 @@ create_finished (void *cls, const char *emsg)
 }
 
 static void
-ego_create_cont (struct RequestHandle *handle)
+ego_create_cont (struct RestConnectionDataHandle *con,
+                 const char *url,
+                 void *cls)
 {
   const char* egoname;
+  struct RequestHandle *handle = cls;
   char term_data[handle->data_size+1];
   struct EgoEntry *ego_entry;
   struct MHD_Response *resp;
@@ -500,10 +506,13 @@ ego_create_cont (struct RequestHandle *handle)
 }
 
 void 
-subsys_set_cont (struct RequestHandle *handle)
+subsys_set_cont (struct RestConnectionDataHandle *con,
+                 const char *url,
+                 void *cls)
 {
   const char *egoname;
   const char *subsys;
+  struct RequestHandle *handle = cls;
   char term_data[handle->data_size+1];
   struct EgoEntry *ego_entry;
   struct MHD_Response *resp;
@@ -604,11 +613,14 @@ subsys_set_cont (struct RequestHandle *handle)
 }
 
 void 
-ego_delete_cont (struct RequestHandle *handle)
+ego_delete_cont (struct RestConnectionDataHandle *con_handle,
+                 const char* url,
+                 void *cls)
 {
   const char *egoname;
   struct EgoEntry *ego_entry;
   struct MHD_Response *resp;
+  struct RequestHandle *handle = cls;
   int ego_exists = GNUNET_NO;
 
   if (strlen (API_NAMESPACE) >= strlen (handle->url))
@@ -645,15 +657,15 @@ ego_delete_cont (struct RequestHandle *handle)
 void
 init_cont (struct RequestHandle *handle)
 {
-  if (0 == strcasecmp (handle->method, MHD_HTTP_METHOD_GET))
-    ego_info_response (handle);
-  else if (0 == strcasecmp (handle->method, MHD_HTTP_METHOD_POST))
-    ego_create_cont (handle);
-  else if (0 == strcasecmp (handle->method, MHD_HTTP_METHOD_PUT))
-    subsys_set_cont (handle);
-  else if (0 == strcasecmp (handle->method, MHD_HTTP_METHOD_DELETE))
-    ego_delete_cont (handle);
-  else
+  static const struct GNUNET_REST_RestConnectionHandler handlers[] = {
+    {MHD_HTTP_METHOD_GET, API_NAMESPACE, &ego_info_response},
+    {MHD_HTTP_METHOD_POST, API_NAMESPACE, &ego_create_cont},
+    {MHD_HTTP_METHOD_PUT, API_NAMESPACE, &subsys_set_cont},
+    {MHD_HTTP_METHOD_DELETE, API_NAMESPACE, &ego_delete_cont},
+    GNUNET_REST_HANDLER_END
+  };
+
+  if (GNUNET_NO == GNUNET_REST_handle_request (handle->conndata_handle, handlers, handle))
     GNUNET_SCHEDULER_add_now (&do_error, handle);
 }
 
diff --git a/src/include/gnunet_rest_lib.h b/src/include/gnunet_rest_lib.h
index 19a0168e5..cc02f01d0 100644
--- a/src/include/gnunet_rest_lib.h
+++ b/src/include/gnunet_rest_lib.h
@@ -36,6 +36,52 @@
 
 #define GNUNET_REST_JSONAPI_KEY_TYPE "type"
 
+#define GNUNET_REST_HANDLER_END {NULL, NULL, NULL}
+
+struct RestConnectionDataHandle
+{
+  struct GNUNET_CONTAINER_MultiHashMap *url_param_map;
+  const char *method;
+  const char *url;
+  const char *data;
+  size_t data_size;
+
+};
+
+struct GNUNET_REST_RestConnectionHandler
+{
+  /**
+   * Http method to handle
+   */
+  const char *method;
+
+  /**
+   * Namespace to handle
+   */
+  const char *namespace;
+
+  /**
+   * callback handler
+   */
+  void (*proc) (struct RestConnectionDataHandle *handle,
+                const char *url,
+                void *cls);
+
+};
+
+
+/**
+ * Iterator called on obtained result for a REST result.
+ *
+ * @param cls closure
+ * @param resp the response
+ * @param status status code (HTTP)
+ */
+typedef void (*GNUNET_REST_ResultProcessor) (void *cls,
+                                             struct MHD_Response *resp,
+                                             int status);
+
+
 /**
  * Resource structs for JSON API
  */
@@ -152,5 +198,9 @@ GNUNET_REST_namespace_match (const char *url, const char *namespace);
 GNUNET_REST_create_json_response (const char *data);
 
 
+int
+GNUNET_REST_handle_request (struct RestConnectionDataHandle *conn,
+                            const struct GNUNET_REST_RestConnectionHandler *handlers,
+                            void *cls);
 
 #endif
diff --git a/src/include/gnunet_rest_plugin.h b/src/include/gnunet_rest_plugin.h
index e085ccf32..e1eabd813 100644
--- a/src/include/gnunet_rest_plugin.h
+++ b/src/include/gnunet_rest_plugin.h
@@ -27,6 +27,7 @@
 #define GNUNET_REST_PLUGIN_H
 
 #include "gnunet_util_lib.h"
+#include "gnunet_rest_lib.h"
 #include "microhttpd.h"
 
 #ifdef __cplusplus
@@ -39,27 +40,6 @@ extern "C"
 
 
 /**
- * Iterator called on obtained result for a REST result.
- *
- * @param cls closure
- * @param resp the response
- * @param status status code (HTTP)
- */
-typedef void (*GNUNET_REST_ResultProcessor) (void *cls,
-                                             struct MHD_Response *resp,
-                                             int status);
-
-struct RestConnectionDataHandle
-{
-  struct GNUNET_CONTAINER_MultiHashMap *url_param_map;
-  const char *method;
-  const char *url;
-  const char *data;
-  size_t data_size;
-
-};
-
-/**
  * @brief struct returned by the initialization function of the plugin
  */
 struct GNUNET_REST_Plugin
diff --git a/src/rest/rest.c b/src/rest/rest.c
index 0b843ec61..ec46e1273 100644
--- a/src/rest/rest.c
+++ b/src/rest/rest.c
@@ -68,6 +68,7 @@ struct JsonApiResponse
   int res_count;
 };
 
+
 /**
  * JSON API
  */
@@ -296,4 +297,39 @@ GNUNET_REST_create_json_response (const char *data)
 
 }
 
+int
+GNUNET_REST_handle_request (struct RestConnectionDataHandle *conn,
+                            const struct GNUNET_REST_RestConnectionHandler *handlers,
+                            void *cls)
+{
+  int count;
+  int i;
+  char *url;
+
+  count = 0;
+
+  while (NULL != handlers[count].method)
+    count++;
+
+  GNUNET_asprintf (&url, "%s", conn->url);
+  if (url[strlen (url)-1] == '/')
+    url[strlen (url)-1] = '\0';
+
+  for (i = 0; i < count; i++)
+  {
+    if (0 != strcasecmp (conn->method, handlers[count].method))
+      break;
+    if (strlen (url) < strlen (handlers[count].namespace))
+      break;
+    if (GNUNET_NO == GNUNET_REST_namespace_match (url, handlers[count].namespace))
+      break;
+    //Match
+    handlers[count].proc (conn, (const char*)url, cls);
+    GNUNET_free (url);
+    return GNUNET_YES;
+  }
+  GNUNET_free (url);
+  return GNUNET_NO;
+}
+
 /* end of rest.c */