Fixed spelling

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

diff --git a/src/afb-xreq.h b/src/afb-xreq.h
index 497b163..ae1419f 100644 (file)
--- a/src/afb-xreq.h
+++ b/src/afb-xreq.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017, 2018 "IoT.bzh"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,6 +18,7 @@
 #pragma once
 
 #include <afb/afb-request-itf.h>
+#include <afb/afb-req-itf.h>
 #include "afb-context.h"
 
 struct json_object;
@@ -25,12 +26,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,10 +59,8 @@ 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 */
+       const struct afb_xreq_query_itf *queryitf; /**< interface of xreq implementation functions */
        int refcount;                   /**< current ref count */
        int replied;                    /**< is replied? */
        int hookflags;                  /**< flags for hooking */
@@ -74,17 +72,17 @@ struct afb_xreq
 
 /**
  * Macro for retrieve the pointer of a structure of 'type' having a field named 'field'
- * of adress 'ptr'.
+ * of address 'ptr'.
  * @param type the type that has the 'field' (ex: "struct mystruct")
  * @param field the name of the field within the structure 'type'
  * @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"
- * of adress 'x'.
+ * of address 'x'.
  * @param type the type that has the field "xreq" (ex: "struct mystruct")
  * @param x the pointer to the field "xreq"
  * @return the pointer to the structure that contains the field "xreq" of address 'x'
@@ -118,14 +116,14 @@ extern void afb_xreq_subcall(
                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(
@@ -148,4 +146,23 @@ 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_req xreq_to_req(struct afb_xreq *xreq)
+{
+       return (struct afb_req){ .itf = xreq->request.itf, .closure = &xreq->request };
+}
+
+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);
+}
+