Deprecate internal use of afb_event

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

diff --git a/src/afb-xreq.h b/src/afb-xreq.h
index a37b6bf..497b163 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,19 +25,23 @@ struct afb_evt_listener;
 struct afb_xreq;
 struct afb_cred;
 struct afb_apiset;
-struct afb_event;
+struct afb_eventid;
 struct afb_verb_desc_v1;
 struct afb_verb_v2;
+struct afb_req;
+struct afb_req_itf;
+struct afb_request;
+struct afb_stored_req;
 
 struct afb_xreq_query_itf {
        struct json_object *(*json)(struct afb_xreq *xreq);
        struct afb_arg (*get)(struct afb_xreq *xreq, const char *name);
        void (*success)(struct afb_xreq *xreq, struct json_object *obj, const char *info);
        void (*fail)(struct afb_xreq *xreq, const char *status, const char *info);
-       void (*reply)(struct afb_xreq *xreq, int iserror, struct json_object *obj);
+       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,
@@ -51,6 +56,7 @@ struct afb_xreq_query_itf {
  */
 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 */
@@ -60,9 +66,10 @@ struct afb_xreq
        int refcount;                   /**< current ref count */
        int replied;                    /**< is replied? */
        int hookflags;                  /**< flags for hooking */
-       int hookindex;                  /**< index for hooking */
+       int hookindex;                  /**< hook index of the request if hooked */
        struct afb_evt_listener *listener; /**< event listener for the request */
        struct afb_cred *cred;          /**< client credential if revelant */
+       struct afb_xreq *caller;        /**< caller request if any */
 };
 
 /**
@@ -85,8 +92,11 @@ struct afb_xreq
 #define CONTAINER_OF_XREQ(type,x) CONTAINER_OF(type,xreq,x)
 
 /* req wrappers for 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);
 
@@ -100,8 +110,8 @@ 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,