Introduce apiset for grouping apis

[src/app-framework-binder.git] / src / afb-hreq.h

diff --git a/src/afb-hreq.h b/src/afb-hreq.h
index f07f2fa..f4c00ff 100644 (file)
--- a/src/afb-hreq.h
+++ b/src/afb-hreq.h
@@ -17,22 +17,16 @@
 
 #pragma once
 
+#include "afb-xreq.h"
+
 struct afb_session;
 struct json_object;
 struct hreq_data;
 struct afb_hsrv;
-struct afb_req_itf;
 struct locale_search;
 
-extern const struct afb_req_itf afb_hreq_req_itf;
-
 struct afb_hreq {
-       /*
-        * CAUTION: 'context' field should be the first because there
-        * is an implicit convertion to struct afb_context
-        */
-       struct afb_context context;
-       int refcount;
+       struct afb_xreq xreq;
        struct afb_hsrv *hsrv;
        const char *cacheTimeout;
        struct MHD_Connection *connection;
@@ -81,7 +75,7 @@ extern int afb_hreq_post_add_file(struct afb_hreq *hreq, const char *name, const
 
 extern int afb_hreq_post_add(struct afb_hreq *hreq, const char *name, const char *data, size_t size);
 
-extern struct afb_req afb_hreq_to_req(struct afb_hreq *hreq);
+extern void afb_hreq_call(struct afb_hreq *hreq, struct afb_apiset *apiset, const char *api, size_t lenapi, const char *verb, size_t lenverb);
 
 extern int afb_hreq_init_context(struct afb_hreq *hreq);
 
@@ -101,3 +95,4 @@ extern void afb_hreq_addref(struct afb_hreq *hreq);
 
 extern void afb_hreq_unref(struct afb_hreq *hreq);
 
+extern struct afb_hreq *afb_hreq_create();