Change-Id: I0986113475f354bccdbc711e74a63c9ca809c5ed
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
- * Checks wether the request 'req' is valid or not.
+ * Checks whether the request 'req' is valid or not.
*
* Returns 0 if not valid or 1 if valid.
*/
*
* Returns 0 if not valid or 1 if valid.
*/
/******************************************************************************/
/******************************************************************************/
-extern const struct afb_req_itf xreq_itf;
-extern const struct afb_req_itf xreq_hooked_itf;
-
static inline struct afb_req to_req(struct afb_xreq *xreq)
{
static inline struct afb_req to_req(struct afb_xreq *xreq)
{
- return (struct afb_req){ .itf = xreq->hookflags ? &xreq_hooked_itf : &xreq_itf, .closure = xreq };
+ return (struct afb_req){ .itf = xreq->itf, .closure = xreq };
}
/******************************************************************************/
}
/******************************************************************************/
void afb_xreq_init(struct afb_xreq *xreq, const struct afb_xreq_query_itf *queryitf)
{
memset(xreq, 0, sizeof *xreq);
void afb_xreq_init(struct afb_xreq *xreq, const struct afb_xreq_query_itf *queryitf)
{
memset(xreq, 0, sizeof *xreq);
+ xreq->itf = &xreq_hooked_itf; /* hook by default */
xreq->refcount = 1;
xreq->queryitf = queryitf;
}
xreq->refcount = 1;
xreq->queryitf = queryitf;
}
afb_hook_init_xreq(xreq);
if (xreq->hookflags)
afb_hook_xreq_begin(xreq);
afb_hook_init_xreq(xreq);
if (xreq->hookflags)
afb_hook_xreq_begin(xreq);
+ else
+ xreq->itf = &xreq_itf; /* unhook the interface */
struct afb_verb_desc_v1;
struct afb_verb_v2;
struct afb_req;
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 afb_stored_req;
struct afb_xreq_query_itf {
+ const struct afb_req_itf *itf; /**< interface functions */
struct afb_context context; /**< context of the request */
struct afb_apiset *apiset; /**< apiset of the xreq */
const char *api; /**< the requested API */
struct afb_context context; /**< context of the request */
struct afb_apiset *apiset; /**< apiset of the xreq */
const char *api; /**< the requested API */
int refcount; /**< current ref count */
int replied; /**< is replied? */
int hookflags; /**< flags for hooking */
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 */
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 */