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 497b163..6c11213 100644 (file)
--- a/src/afb-xreq.h
+++ b/src/afb-xreq.h
@@ -25,6 +25,7 @@ struct afb_evt_listener;
 struct afb_xreq;
 struct afb_cred;
 struct afb_apiset;
+struct afb_api_dyn_verb;
 struct afb_eventid;
 struct afb_verb_desc_v1;
 struct afb_verb_v2;
@@ -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 */
@@ -118,14 +117,14 @@ extern void afb_xreq_subcall(
                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);