Finalize hooking of requests

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

diff --git a/src/afb-xreq.h b/src/afb-xreq.h
index 29dcb3e..ba99d4a 100644 (file)
--- a/src/afb-xreq.h
+++ b/src/afb-xreq.h
@@ -52,10 +52,8 @@ struct afb_xreq
        const struct afb_xreq_query_itf *queryitf;
        int refcount;   /**< current ref count */
        int replied;    /**< is replied? */
-       int timeout;    /**< timeout */
-       int sessionflags; /**< flags to check */
-       void *group;
-       void (*callback)(struct afb_req req);
+       int hookflags;  /**< flags for hooking */
+       int hookindex;  /**< index for hooking */
        struct afb_evt_listener *listener;
 };
 
@@ -68,6 +66,9 @@ extern void afb_xreq_success_f(struct afb_xreq *xreq, struct json_object *obj, c
 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 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 *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 *cb_closure);
 
-extern void afb_xreq_call(struct afb_xreq *xreq);
+extern void afb_xreq_begin(struct afb_xreq *xreq);
+extern void afb_xreq_call(struct afb_xreq *xreq, int sessionflags, void (*callback)(struct afb_req req));