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

diff --git a/src/afb-xreq.h b/src/afb-xreq.h
index d899a3d3..4e79686c 100644
--- a/src/afb-xreq.h
+++ b/src/afb-xreq.h
@@ -25,12 +25,11 @@ struct afb_evt_listener;
 struct afb_xreq;
 struct afb_cred;
 struct afb_apiset;
+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 {
@@ -59,8 +58,6 @@ 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 */
@@ -80,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"
@@ -148,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);
+}
+