- rework rest/jsonapi API; bugfixes

2 files changed, 8 insertions, 6 deletions

diff --git a/src/rest/gnunet-rest-server.c b/src/rest/gnunet-rest-server.c
index ffd65228a..92bef1094 100644
--- a/src/rest/gnunet-rest-server.c
+++ b/src/rest/gnunet-rest-server.c
@@ -129,7 +129,7 @@ struct MhdConnectionHandle
 
   struct GNUNET_REST_Plugin *plugin;
 
-  struct RestConnectionDataHandle *data_handle;
+  struct GNUNET_REST_RequestHandle *data_handle;
 
   int status;
 
@@ -217,7 +217,7 @@ url_iterator (void *cls,
               const char *key,
               const char *value)
 {
-  struct RestConnectionDataHandle *handle = cls;
+  struct GNUNET_REST_RequestHandle *handle = cls;
   struct GNUNET_HashCode hkey;
   char *val;
 
@@ -274,7 +274,7 @@ create_response (void *cls,
   char *plugin_name;
   struct GNUNET_HashCode key;
   struct MhdConnectionHandle *con_handle;
-  struct RestConnectionDataHandle *rest_conndata_handle;
+  struct GNUNET_REST_RequestHandle *rest_conndata_handle;
 
   con_handle = *con_cls;
 
@@ -311,7 +311,7 @@ create_response (void *cls,
   }
   if (GN_REST_STATE_INIT == con_handle->state)
   {
-    rest_conndata_handle = GNUNET_new (struct RestConnectionDataHandle);
+    rest_conndata_handle = GNUNET_new (struct GNUNET_REST_RequestHandle);
     rest_conndata_handle->method = meth;
     rest_conndata_handle->url = url;
     rest_conndata_handle->data = upload_data;
diff --git a/src/rest/rest.c b/src/rest/rest.c
index a17955314..bf32c9849 100644
--- a/src/rest/rest.c
+++ b/src/rest/rest.c
@@ -75,8 +75,9 @@ GNUNET_REST_create_json_response (const char *data)
 }
 
 int
-GNUNET_REST_handle_request (struct RestConnectionDataHandle *conn,
-                            const struct GNUNET_REST_RestConnectionHandler *handlers,
+GNUNET_REST_handle_request (struct GNUNET_REST_RequestHandle *conn,
+                            const struct GNUNET_REST_RequestHandler *handlers,
+                            struct GNUNET_REST_RequestHandlerError *err,
                             void *cls)
 {
   int count;
@@ -104,6 +105,7 @@ GNUNET_REST_handle_request (struct RestConnectionDataHandle *conn,
     return GNUNET_YES;
   }
   GNUNET_free (url);
+  err->error_code = MHD_HTTP_BAD_REQUEST;
   return GNUNET_NO;
 }