Reactivate 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 42824d7..3376bb2 100644 (file)
--- a/src/afb-xreq.h
+++ b/src/afb-xreq.h
@@ -31,7 +31,7 @@ struct afb_xreq_query_itf {
        struct afb_arg (*get)(void *closure, const char *name);
        void (*success)(void *closure, struct json_object *obj, const char *info);
        void (*fail)(void *closure, const char *status, const char *info);
-       void (*reply)(void *closure, struct json_object *obj);
+       void (*reply)(void *closure, int iserror, struct json_object *obj);
        void (*unref)(void *closure);
        int (*subscribe)(void *closure, struct afb_event event);
        int (*unsubscribe)(void *closure, struct afb_event event);
@@ -45,22 +45,29 @@ struct afb_xreq_query_itf {
 struct afb_xreq
 {
        struct afb_context context; /**< context of the request */
-       char *api;      /**< the requested API */
-       char *verb;     /**< the requested VERB */
+       const char *api;        /**< the requested API */
+       const char *verb;       /**< the requested VERB */
+       struct json_object *json; /**< the json object (or NULL) */
        void *query;    /**< closure for the query */
        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;
 };
 
 extern void afb_xreq_addref(struct afb_xreq *xreq);
 extern void afb_xreq_unref(struct afb_xreq *xreq);
+extern void afb_xreq_success(struct afb_xreq *xreq, struct json_object *obj, const char *info);
+extern void afb_xreq_fail(struct afb_xreq *xreq, const char *status, const char *info);
 extern void afb_xreq_fail_f(struct afb_xreq *xreq, const char *status, const char *info, ...);
 extern void afb_xreq_success_f(struct afb_xreq *xreq, struct json_object *obj, const char *info, ...);
-extern void afb_xreq_call(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 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_begin(struct afb_xreq *xreq);
+extern void afb_xreq_call(struct afb_xreq *xreq, int sessionflags, void (*callback)(struct afb_req req));