Allow dynamic creation of APIs

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

diff --git a/src/afb-xreq.h b/src/afb-xreq.h
index f7ca03b..d78d88f 100644 (file)
--- a/src/afb-xreq.h
+++ b/src/afb-xreq.h
@@ -17,6 +17,7 @@
 
 #pragma once
 
+#include <afb/afb-request-itf.h>
 #include "afb-context.h"
 
 struct json_object;
@@ -24,7 +25,8 @@ struct afb_evt_listener;
 struct afb_xreq;
 struct afb_cred;
 struct afb_apiset;
-struct afb_event;
+struct afb_api_dyn_verb;
+struct afb_eventid;
 struct afb_verb_desc_v1;
 struct afb_verb_v2;
 struct afb_req;
@@ -39,8 +41,8 @@ struct afb_xreq_query_itf {
        void (*fail)(struct afb_xreq *xreq, const char *status, const char *info);
        void (*reply)(struct afb_xreq *xreq, int status, struct json_object *obj);
        void (*unref)(struct afb_xreq *xreq);
-       int (*subscribe)(struct afb_xreq *xreq, struct afb_event event);
-       int (*unsubscribe)(struct afb_xreq *xreq, struct afb_event event);
+       int (*subscribe)(struct afb_xreq *xreq, struct afb_eventid *eventid);
+       int (*unsubscribe)(struct afb_xreq *xreq, struct afb_eventid *eventid);
        void (*subcall)(
                struct afb_xreq *xreq,
                const char *api,
@@ -55,7 +57,7 @@ struct afb_xreq_query_itf {
  */
 struct afb_xreq
 {
-       const struct afb_req_itf *itf;  /**< interface functions */
+       struct afb_request request;     /**< exported request */
        struct afb_context context;     /**< context of the request */
        struct afb_apiset *apiset;      /**< apiset of the xreq */
        const char *api;                /**< the requested API */
@@ -94,6 +96,8 @@ struct afb_xreq
 extern struct afb_req afb_xreq_unstore(struct afb_stored_req *sreq);
 extern void afb_xreq_addref(struct afb_xreq *xreq);
 extern void afb_xreq_unref(struct afb_xreq *xreq);
+extern void afb_xreq_unhooked_addref(struct afb_xreq *xreq);
+extern void afb_xreq_unhooked_unref(struct afb_xreq *xreq);
 
 extern struct json_object *afb_xreq_json(struct afb_xreq *xreq);
 
@@ -107,22 +111,22 @@ extern void afb_xreq_fail_unknown_verb(struct afb_xreq *xreq);
 
 extern const char *afb_xreq_raw(struct afb_xreq *xreq, size_t *size);
 
-extern int afb_xreq_subscribe(struct afb_xreq *xreq, struct afb_event event);
-extern int afb_xreq_unsubscribe(struct afb_xreq *xreq, struct afb_event event);
+extern int afb_xreq_subscribe(struct afb_xreq *xreq, struct afb_eventid *eventid);
+extern int afb_xreq_unsubscribe(struct afb_xreq *xreq, struct afb_eventid *eventid);
 
 extern void afb_xreq_subcall(
                struct afb_xreq *xreq,
                const char *api,
                const char *verb,
                struct json_object *args,
-               void (*callback)(void*, int, struct json_object*),
+               void (*callback)(void*, int, struct json_object*, struct afb_request *),
                void *cb_closure);
 extern void afb_xreq_unhooked_subcall(
                struct afb_xreq *xreq,
                const char *api,
                const char *verb,
                struct json_object *args,
-               void (*callback)(void*, int, struct json_object*),
+               void (*callback)(void*, int, struct json_object*, struct afb_request *),
                void *cb_closure);
 
 extern int afb_xreq_unhooked_subcall_sync(
@@ -145,4 +149,4 @@ extern void afb_xreq_process(struct afb_xreq *xreq, struct afb_apiset *apiset);
 
 extern void afb_xreq_call_verb_v1(struct afb_xreq *xreq, const struct afb_verb_desc_v1 *verb);
 extern void afb_xreq_call_verb_v2(struct afb_xreq *xreq, const struct afb_verb_v2 *verb);
-
+extern void afb_xreq_call_verb_vdyn(struct afb_xreq *xreq, const struct afb_api_dyn_verb *verb);