X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-xreq.h;h=6c112130ad80810a8c4964bedee49ab3181e8d1e;hb=0891ef4826e347d5554c630b5c0ce73c68f76c9c;hp=77f843fa68868226814ef83c4f6d0e46e4d1cdc2;hpb=052c3aee6362b2e33c060e0fbddd68439bb73dcb;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-xreq.h b/src/afb-xreq.h
index 77f843fa..6c112130 100644
--- 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,10 +25,13 @@ 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;
+struct afb_req_itf;
+struct afb_request;
 struct afb_stored_req;
 
 struct afb_xreq_query_itf {
@@ -37,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,
@@ -53,18 +57,18 @@ 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 */
-	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 */
 	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 */
 };
 
 /**
@@ -90,6 +94,8 @@ struct afb_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);
 
@@ -103,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(
@@ -141,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);