X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-xreq.h;h=4e79686c847985ff721e39f44ed82e4209c1cd41;hb=4c7b7d3adcc10fbcf64d790a4e7c194ff3d5c6de;hp=4978f0a577cd882fa54b3c51f156d9e92636de41;hpb=770ca7e254bba07bb7d1ade4fa95afed7a7f7693;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-xreq.h b/src/afb-xreq.h
index 4978f0a5..4e79686c 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,12 +25,11 @@ 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 {
@@ -39,8 +39,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,
@@ -55,11 +55,9 @@ struct afb_xreq_query_itf {
  */
 struct afb_xreq
 {
-	const struct afb_req_itf *itf;	/**< interface functions */
+	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 */
@@ -79,7 +77,7 @@ struct afb_xreq
  * @param ptr the pointer to an element 'field'
  * @return the pointer to the structure that contains the 'field' at address 'ptr'
  */
-#define CONTAINER_OF(type,field,ptr) ((type*)(((intptr_t)(ptr))-((intptr_t)&(((type*)NULL)->field))))
+#define CONTAINER_OF(type,field,ptr) ((type*)(((char*)(ptr))-((char*)&(((type*)NULL)->field))))
 
 /**
  * Macro for retrieve the pointer of a structure of 'type' having a field named "xreq"
@@ -109,22 +107,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(
@@ -147,4 +145,16 @@ 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);
+
+static inline struct afb_request *xreq_to_request(struct afb_xreq *xreq)
+{
+	return &xreq->request;
+}
+
+static inline struct afb_xreq *xreq_from_request(struct afb_request *request)
+{
+	return CONTAINER_OF(struct afb_xreq, request, request);
+}
+