Provide API and VERB name of requests

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

diff --git a/src/afb-xreq.h b/src/afb-xreq.h
index df868bf..6c11213 100644 (file)
--- a/src/afb-xreq.h
+++ b/src/afb-xreq.h
@@ -25,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;
@@ -40,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,
@@ -59,8 +60,6 @@ struct afb_xreq
        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 */
-       const char *verb;               /**< the requested VERB */
        struct json_object *json;       /**< the json object (or NULL) */
        const struct afb_xreq_query_itf *queryitf; /**< interface of xreq implmentation functions */
        int refcount;                   /**< current ref count */
@@ -110,22 +109,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(
@@ -148,4 +147,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);