X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-xreq.c;h=582e9b72522bdc921fffafaa4375f2c2da7d4a79;hb=c8558c8a28966110aa3a356f95d3c60afe32b64a;hp=f9f2324aa2e51118cd5980cc4b592af45a5772f7;hpb=be63003e3f1841b43614f0e11b0a291e11f1dad1;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-xreq.c b/src/afb-xreq.c
index f9f2324a..582e9b72 100644
--- a/src/afb-xreq.c
+++ b/src/afb-xreq.c
@@ -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");
@@ -34,6 +34,7 @@
 #include "afb-cred.h"
 #include "afb-hook.h"
 #include "afb-api.h"
+#include "afb-api-dyn.h"
 #include "afb-apiset.h"
 #include "afb-auth.h"
 #include "jobs.h"
@@ -65,23 +66,6 @@ inline void afb_xreq_unhooked_unref(struct afb_xreq *xreq)
 
 /******************************************************************************/
 
-static inline struct afb_request *to_request(struct afb_xreq *xreq)
-{
-	return &xreq->request;
-}
-
-static inline struct afb_req to_req(struct afb_xreq *xreq)
-{
-	return (struct afb_req){ .itf = xreq->request.itf, .closure = &xreq->request };
-}
-
-static inline struct afb_xreq *from_request(struct afb_request *request)
-{
-	return CONTAINER_OF(struct afb_xreq, request, request);
-}
-
-/******************************************************************************/
-
 struct subcall
 {
 	struct afb_xreq xreq;
@@ -97,7 +81,8 @@ struct subcall
 		struct {
 			union {
 				void (*callback)(void*, int, struct json_object*);
-				void (*callback2)(void*, int, struct json_object*, struct afb_req);
+				void (*callback_req)(void*, int, struct json_object*, struct afb_req);
+				void (*callback_request)(void*, int, struct json_object*, struct afb_request*);
 			};
 			void *closure;
 		};
@@ -171,8 +156,8 @@ static struct subcall *subcall_alloc(
 		afb_context_subinit(&subcall->xreq.context, &caller->context);
 		subcall->xreq.cred = afb_cred_addref(caller->cred);
 		subcall->xreq.json = args;
-		subcall->xreq.api = api;
-		subcall->xreq.verb = verb;
+		subcall->xreq.request.api = api;
+		subcall->xreq.request.verb = verb;
 		subcall->xreq.caller = caller;
 		afb_xreq_unhooked_addref(caller);
 	}
@@ -187,7 +172,12 @@ static void subcall_on_reply(struct subcall *subcall, int status, struct json_ob
 
 static void subcall_req_on_reply(struct subcall *subcall, int status, struct json_object *result)
 {
-	subcall->callback2(subcall->closure, status, result, to_req(subcall->xreq.caller));
+	subcall->callback_req(subcall->closure, status, result, xreq_to_req(subcall->xreq.caller));
+}
+
+static void subcall_request_on_reply(struct subcall *subcall, int status, struct json_object *result)
+{
+	subcall->callback_request(subcall->closure, status, result, xreq_to_request(subcall->xreq.caller));
 }
 
 static void subcall_hooked_on_reply(struct subcall *subcall, int status, struct json_object *result)
@@ -202,6 +192,12 @@ static void subcall_req_hooked_on_reply(struct subcall *subcall, int status, str
 	subcall_req_on_reply(subcall, status, result);
 }
 
+static void subcall_request_hooked_on_reply(struct subcall *subcall, int status, struct json_object *result)
+{
+	afb_hook_xreq_subcall_result(subcall->xreq.caller, status, result);
+	subcall_request_on_reply(subcall, status, result);
+}
+
 static void subcall_reply_direct_cb(void *closure, int status, struct json_object *result)
 {
 	struct afb_xreq *xreq = closure;
@@ -220,7 +216,7 @@ static void subcall_process(struct subcall *subcall, void (*completion)(struct s
 	subcall->completion = completion;
 	if (subcall->xreq.caller->queryitf->subcall) {
 		subcall->xreq.caller->queryitf->subcall(
-			subcall->xreq.caller, subcall->xreq.api, subcall->xreq.verb,
+			subcall->xreq.caller, subcall->xreq.request.api, subcall->xreq.request.verb,
 			subcall->xreq.json, subcall_reply_direct_cb, &subcall->xreq);
 	} else {
 		afb_xreq_unhooked_addref(&subcall->xreq);
@@ -237,11 +233,18 @@ static void subcall(struct subcall *subcall, void (*callback)(void*, int, struct
 
 static void subcall_req(struct subcall *subcall, void (*callback)(void*, int, struct json_object*, struct afb_req), void *cb_closure)
 {
-	subcall->callback2 = callback;
+	subcall->callback_req = callback;
 	subcall->closure = cb_closure;
 	subcall_process(subcall, subcall_req_on_reply);
 }
 
+static void subcall_request(struct subcall *subcall, void (*callback)(void*, int, struct json_object*, struct afb_request*), void *cb_closure)
+{
+	subcall->callback_request = callback;
+	subcall->closure = cb_closure;
+	subcall_process(subcall, subcall_request_on_reply);
+}
+
 static void subcall_hooked(struct subcall *subcall, void (*callback)(void*, int, struct json_object*), void *cb_closure)
 {
 	subcall->callback = callback;
@@ -251,11 +254,18 @@ static void subcall_hooked(struct subcall *subcall, void (*callback)(void*, int,
 
 static void subcall_req_hooked(struct subcall *subcall, void (*callback)(void*, int, struct json_object*, struct afb_req), void *cb_closure)
 {
-	subcall->callback2 = callback;
+	subcall->callback_req = callback;
 	subcall->closure = cb_closure;
 	subcall_process(subcall, subcall_req_hooked_on_reply);
 }
 
+static void subcall_request_hooked(struct subcall *subcall, void (*callback)(void*, int, struct json_object*, struct afb_request*), void *cb_closure)
+{
+	subcall->callback_request = callback;
+	subcall->closure = cb_closure;
+	subcall_process(subcall, subcall_request_hooked_on_reply);
+}
+
 static void subcall_sync_leave(struct subcall *subcall)
 {
 	struct jobloop *jobloop = __atomic_exchange_n(&subcall->jobloop, NULL, __ATOMIC_RELAXED);
@@ -315,7 +325,7 @@ static void vinfo(void *first, void *second, const char *fmt, va_list args, void
 
 static struct json_object *xreq_json_cb(struct afb_request *closure)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	if (!xreq->json && xreq->queryitf->json)
 		xreq->json = xreq->queryitf->json(xreq);
 	return xreq->json;
@@ -323,7 +333,7 @@ static struct json_object *xreq_json_cb(struct afb_request *closure)
 
 static struct afb_arg xreq_get_cb(struct afb_request *closure, const char *name)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	struct afb_arg arg;
 	struct json_object *object, *value;
 
@@ -345,7 +355,7 @@ static struct afb_arg xreq_get_cb(struct afb_request *closure, const char *name)
 
 static void xreq_success_cb(struct afb_request *closure, struct json_object *obj, const char *info)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 
 	if (xreq->replied) {
 		ERROR("reply called more than one time!!");
@@ -361,7 +371,7 @@ static void xreq_success_cb(struct afb_request *closure, struct json_object *obj
 
 static void xreq_fail_cb(struct afb_request *closure, const char *status, const char *info)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 
 	if (xreq->replied) {
 		ERROR("reply called more than one time!!");
@@ -386,38 +396,38 @@ static void xreq_vfail_cb(struct afb_request *closure, const char *status, const
 
 static void *xreq_context_get_cb(struct afb_request *closure)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	return afb_context_get(&xreq->context);
 }
 
 static void xreq_context_set_cb(struct afb_request *closure, void *value, void (*free_value)(void*))
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	afb_context_set(&xreq->context, value, free_value);
 }
 
 static struct afb_request *xreq_addref_cb(struct afb_request *closure)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	afb_xreq_unhooked_addref(xreq);
 	return closure;
 }
 
 static void xreq_unref_cb(struct afb_request *closure)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	afb_xreq_unhooked_unref(xreq);
 }
 
 static void xreq_session_close_cb(struct afb_request *closure)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	afb_context_close(&xreq->context);
 }
 
 static int xreq_session_set_LOA_cb(struct afb_request *closure, unsigned level)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	return afb_context_change_loa(&xreq->context, level);
 }
 
@@ -429,14 +439,14 @@ static int xreq_subscribe_cb(struct afb_request *closure, struct afb_event event
 
 static int xreq_subscribe_eventid_cb(struct afb_request *closure, struct afb_eventid *eventid)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	return afb_xreq_subscribe(xreq, eventid);
 }
 
 int afb_xreq_subscribe(struct afb_xreq *xreq, struct afb_eventid *eventid)
 {
 	if (xreq->listener)
-		return afb_evt_add_watch(xreq->listener, eventid);
+		return afb_evt_eventid_add_watch(xreq->listener, eventid);
 	if (xreq->queryitf->subscribe)
 		return xreq->queryitf->subscribe(xreq, eventid);
 	ERROR("no event listener, subscription impossible");
@@ -452,14 +462,14 @@ static int xreq_unsubscribe_cb(struct afb_request *closure, struct afb_event eve
 
 static int xreq_unsubscribe_eventid_cb(struct afb_request *closure, struct afb_eventid *eventid)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	return afb_xreq_unsubscribe(xreq, eventid);
 }
 
 int afb_xreq_unsubscribe(struct afb_xreq *xreq, struct afb_eventid *eventid)
 {
 	if (xreq->listener)
-		return afb_evt_remove_watch(xreq->listener, eventid);
+		return afb_evt_eventid_remove_watch(xreq->listener, eventid);
 	if (xreq->queryitf->unsubscribe)
 		return xreq->queryitf->unsubscribe(xreq, eventid);
 	ERROR("no event listener, unsubscription impossible");
@@ -469,7 +479,7 @@ int afb_xreq_unsubscribe(struct afb_xreq *xreq, struct afb_eventid *eventid)
 
 static void xreq_subcall_cb(struct afb_request *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *cb_closure)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	struct subcall *sc;
 
 	sc = subcall_alloc(xreq, api, verb, args);
@@ -484,25 +494,40 @@ static void xreq_subcall_cb(struct afb_request *closure, const char *api, const
 
 static void xreq_subcall_req_cb(struct afb_request *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*, struct afb_req), void *cb_closure)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	struct subcall *sc;
 
 	sc = subcall_alloc(xreq, api, verb, args);
 	if (sc == NULL) {
 		if (callback)
-			callback(cb_closure, 1, afb_msg_json_internal_error(), to_req(xreq));
+			callback(cb_closure, 1, afb_msg_json_internal_error(), xreq_to_req(xreq));
 		json_object_put(args);
 	} else {
 		subcall_req(sc, callback, cb_closure);
 	}
 }
 
+static void xreq_subcall_request_cb(struct afb_request *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*, struct afb_request*), void *cb_closure)
+{
+	struct afb_xreq *xreq = xreq_from_request(closure);
+	struct subcall *sc;
+
+	sc = subcall_alloc(xreq, api, verb, args);
+	if (sc == NULL) {
+		if (callback)
+			callback(cb_closure, 1, afb_msg_json_internal_error(), xreq_to_request(xreq));
+		json_object_put(args);
+	} else {
+		subcall_request(sc, callback, cb_closure);
+	}
+}
+
 
 static int xreq_subcallsync_cb(struct afb_request *closure, const char *api, const char *verb, struct json_object *args, struct json_object **result)
 {
 	int rc;
 	struct subcall *sc;
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	struct json_object *resu;
 
 	sc = subcall_alloc(xreq, api, verb, args);
@@ -523,12 +548,12 @@ static int xreq_subcallsync_cb(struct afb_request *closure, const char *api, con
 static void xreq_vverbose_cb(struct afb_request *closure, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
 {
 	char *p;
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 
 	if (!fmt || vasprintf(&p, fmt, args) < 0)
 		vverbose(level, file, line, func, fmt, args);
 	else {
-		verbose(level, file, line, func, "[REQ/API %s] %s", xreq->api, p);
+		verbose(level, file, line, func, "[REQ/API %s] %s", xreq->request.api, p);
 		free(p);
 	}
 }
@@ -541,48 +566,54 @@ static struct afb_stored_req *xreq_store_cb(struct afb_request *closure)
 
 static int xreq_has_permission_cb(struct afb_request *closure, const char *permission)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	return afb_auth_has_permission(xreq, permission);
 }
 
 static char *xreq_get_application_id_cb(struct afb_request *closure)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	return xreq->cred && xreq->cred->id ? strdup(xreq->cred->id) : NULL;
 }
 
 static void *xreq_context_make_cb(struct afb_request *closure, int replace, void *(*create_value)(void*), void (*free_value)(void*), void *create_closure)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	return afb_context_make(&xreq->context, replace, create_value, free_value, create_closure);
 }
 
+static int xreq_get_uid_cb(struct afb_request *closure)
+{
+	struct afb_xreq *xreq = xreq_from_request(closure);
+	return xreq->cred && xreq->cred->id ? (int)xreq->cred->uid : -1;
+}
+
 /******************************************************************************/
 
 static struct json_object *xreq_hooked_json_cb(struct afb_request *closure)
 {
 	struct json_object *r = xreq_json_cb(closure);
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	return afb_hook_xreq_json(xreq, r);
 }
 
 static struct afb_arg xreq_hooked_get_cb(struct afb_request *closure, const char *name)
 {
 	struct afb_arg r = xreq_get_cb(closure, name);
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	return afb_hook_xreq_get(xreq, name, r);
 }
 
 static void xreq_hooked_success_cb(struct afb_request *closure, struct json_object *obj, const char *info)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	afb_hook_xreq_success(xreq, obj, info);
 	xreq_success_cb(closure, obj, info);
 }
 
 static void xreq_hooked_fail_cb(struct afb_request *closure, const char *status, const char *info)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	afb_hook_xreq_fail(xreq, status, info);
 	xreq_fail_cb(closure, status, info);
 }
@@ -600,34 +631,34 @@ static void xreq_hooked_vfail_cb(struct afb_request *closure, const char *status
 static void *xreq_hooked_context_get_cb(struct afb_request *closure)
 {
 	void *r = xreq_context_get_cb(closure);
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	return afb_hook_xreq_context_get(xreq, r);
 }
 
 static void xreq_hooked_context_set_cb(struct afb_request *closure, void *value, void (*free_value)(void*))
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	afb_hook_xreq_context_set(xreq, value, free_value);
 	xreq_context_set_cb(closure, value, free_value);
 }
 
 static struct afb_request *xreq_hooked_addref_cb(struct afb_request *closure)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	afb_hook_xreq_addref(xreq);
 	return xreq_addref_cb(closure);
 }
 
 static void xreq_hooked_unref_cb(struct afb_request *closure)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	afb_hook_xreq_unref(xreq);
 	xreq_unref_cb(closure);
 }
 
 static void xreq_hooked_session_close_cb(struct afb_request *closure)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	afb_hook_xreq_session_close(xreq);
 	xreq_session_close_cb(closure);
 }
@@ -635,7 +666,7 @@ static void xreq_hooked_session_close_cb(struct afb_request *closure)
 static int xreq_hooked_session_set_LOA_cb(struct afb_request *closure, unsigned level)
 {
 	int r = xreq_session_set_LOA_cb(closure, level);
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	return afb_hook_xreq_session_set_LOA(xreq, level, r);
 }
 
@@ -648,7 +679,7 @@ static int xreq_hooked_subscribe_cb(struct afb_request *closure, struct afb_even
 static int xreq_hooked_subscribe_eventid_cb(struct afb_request *closure, struct afb_eventid *eventid)
 {
 	int r = xreq_subscribe_eventid_cb(closure, eventid);
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	return afb_hook_xreq_subscribe(xreq, eventid, r);
 }
 
@@ -661,13 +692,13 @@ static int xreq_hooked_unsubscribe_cb(struct afb_request *closure, struct afb_ev
 static int xreq_hooked_unsubscribe_eventid_cb(struct afb_request *closure, struct afb_eventid *eventid)
 {
 	int r = xreq_unsubscribe_eventid_cb(closure, eventid);
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	return afb_hook_xreq_unsubscribe(xreq, eventid, r);
 }
 
 static void xreq_hooked_subcall_cb(struct afb_request *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *cb_closure)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	struct subcall *sc;
 
 	afb_hook_xreq_subcall(xreq, api, verb, args);
@@ -683,24 +714,40 @@ static void xreq_hooked_subcall_cb(struct afb_request *closure, const char *api,
 
 static void xreq_hooked_subcall_req_cb(struct afb_request *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*, struct afb_req), void *cb_closure)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	struct subcall *sc;
 
 	afb_hook_xreq_subcall_req(xreq, api, verb, args);
 	sc = subcall_alloc(xreq, api, verb, args);
 	if (sc == NULL) {
 		if (callback)
-			callback(cb_closure, 1, afb_msg_json_internal_error(), to_req(xreq));
+			callback(cb_closure, 1, afb_msg_json_internal_error(), xreq_to_req(xreq));
 		json_object_put(args);
 	} else {
 		subcall_req_hooked(sc, callback, cb_closure);
 	}
 }
 
+static void xreq_hooked_subcall_request_cb(struct afb_request *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*, struct afb_request *), void *cb_closure)
+{
+	struct afb_xreq *xreq = xreq_from_request(closure);
+	struct subcall *sc;
+
+	afb_hook_xreq_subcall(xreq, api, verb, args);
+	sc = subcall_alloc(xreq, api, verb, args);
+	if (sc == NULL) {
+		if (callback)
+			callback(cb_closure, 1, afb_msg_json_internal_error(), xreq_to_request(xreq));
+		json_object_put(args);
+	} else {
+		subcall_request_hooked(sc, callback, cb_closure);
+	}
+}
+
 static int xreq_hooked_subcallsync_cb(struct afb_request *closure, const char *api, const char *verb, struct json_object *args, struct json_object **result)
 {
 	int r;
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	afb_hook_xreq_subcallsync(xreq, api, verb, args);
 	r = xreq_subcallsync_cb(closure, api, verb, args, result);
 	return afb_hook_xreq_subcallsync_result(xreq, r, *result);
@@ -708,7 +755,7 @@ static int xreq_hooked_subcallsync_cb(struct afb_request *closure, const char *a
 
 static void xreq_hooked_vverbose_cb(struct afb_request *closure, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	va_list ap;
 	va_copy(ap, args);
 	xreq_vverbose_cb(closure, level, file, line, func, fmt, args);
@@ -718,7 +765,7 @@ static void xreq_hooked_vverbose_cb(struct afb_request *closure, int level, cons
 
 static struct afb_stored_req *xreq_hooked_store_cb(struct afb_request *closure)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	struct afb_stored_req *r = xreq_store_cb(closure);
 	afb_hook_xreq_store(xreq, r);
 	return r;
@@ -726,25 +773,32 @@ static struct afb_stored_req *xreq_hooked_store_cb(struct afb_request *closure)
 
 static int xreq_hooked_has_permission_cb(struct afb_request *closure, const char *permission)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	int r = xreq_has_permission_cb(closure, permission);
 	return afb_hook_xreq_has_permission(xreq, permission, r);
 }
 
 static char *xreq_hooked_get_application_id_cb(struct afb_request *closure)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	char *r = xreq_get_application_id_cb(closure);
 	return afb_hook_xreq_get_application_id(xreq, r);
 }
 
 static void *xreq_hooked_context_make_cb(struct afb_request *closure, int replace, void *(*create_value)(void*), void (*free_value)(void*), void *create_closure)
 {
-	struct afb_xreq *xreq = from_request(closure);
+	struct afb_xreq *xreq = xreq_from_request(closure);
 	void *result = xreq_context_make_cb(closure, replace, create_value, free_value, create_closure);
 	return afb_hook_xreq_context_make(xreq, replace, create_value, free_value, create_closure, result);
 }
 
+static int xreq_hooked_get_uid_cb(struct afb_request *closure)
+{
+	struct afb_xreq *xreq = xreq_from_request(closure);
+	int r = xreq_get_uid_cb(closure);
+	return afb_hook_xreq_get_uid(xreq, r);
+}
+
 /******************************************************************************/
 
 const struct afb_request_itf xreq_itf = {
@@ -772,6 +826,8 @@ const struct afb_request_itf xreq_itf = {
 	.context_make = xreq_context_make_cb,
 	.subscribe_eventid = xreq_subscribe_eventid_cb,
 	.unsubscribe_eventid = xreq_unsubscribe_eventid_cb,
+	.subcall_request = xreq_subcall_request_cb,
+	.get_uid = xreq_get_uid_cb,
 };
 
 const struct afb_request_itf xreq_hooked_itf = {
@@ -799,6 +855,8 @@ const struct afb_request_itf xreq_hooked_itf = {
 	.context_make = xreq_hooked_context_make_cb,
 	.subscribe_eventid = xreq_hooked_subscribe_eventid_cb,
 	.unsubscribe_eventid = xreq_hooked_unsubscribe_eventid_cb,
+	.subcall_request = xreq_hooked_subcall_request_cb,
+	.get_uid = xreq_hooked_get_uid_cb,
 };
 
 /******************************************************************************/
@@ -808,17 +866,17 @@ struct afb_req afb_xreq_unstore(struct afb_stored_req *sreq)
 	struct afb_xreq *xreq = (struct afb_xreq *)sreq;
 	if (xreq->hookflags)
 		afb_hook_xreq_unstore(xreq);
-	return to_req(xreq);
+	return xreq_to_req(xreq);
 }
 
 struct json_object *afb_xreq_json(struct afb_xreq *xreq)
 {
-	return afb_request_json(to_request(xreq));
+	return afb_request_json(xreq_to_request(xreq));
 }
 
 void afb_xreq_success(struct afb_xreq *xreq, struct json_object *obj, const char *info)
 {
-	afb_request_success(to_request(xreq), obj, info);
+	afb_request_success(xreq_to_request(xreq), obj, info);
 }
 
 void afb_xreq_success_f(struct afb_xreq *xreq, struct json_object *obj, const char *info, ...)
@@ -826,13 +884,13 @@ void afb_xreq_success_f(struct afb_xreq *xreq, struct json_object *obj, const ch
 	va_list args;
 
 	va_start(args, info);
-	afb_request_success_v(to_request(xreq), obj, info, args);
+	afb_request_success_v(xreq_to_request(xreq), obj, info, args);
 	va_end(args);
 }
 
 void afb_xreq_fail(struct afb_xreq *xreq, const char *status, const char *info)
 {
-	afb_request_fail(to_request(xreq), status, info);
+	afb_request_fail(xreq_to_request(xreq), status, info);
 }
 
 void afb_xreq_fail_f(struct afb_xreq *xreq, const char *status, const char *info, ...)
@@ -840,14 +898,14 @@ void afb_xreq_fail_f(struct afb_xreq *xreq, const char *status, const char *info
 	va_list args;
 
 	va_start(args, info);
-	afb_request_fail_v(to_request(xreq), status, info, args);
+	afb_request_fail_v(xreq_to_request(xreq), status, info, args);
 	va_end(args);
 
 }
 
 const char *afb_xreq_raw(struct afb_xreq *xreq, size_t *size)
 {
-	struct json_object *obj = xreq_json_cb(to_request(xreq));
+	struct json_object *obj = xreq_json_cb(xreq_to_request(xreq));
 	const char *result = json_object_to_json_string(obj);
 	if (size != NULL)
 		*size = strlen(result);
@@ -856,32 +914,32 @@ const char *afb_xreq_raw(struct afb_xreq *xreq, size_t *size)
 
 void afb_xreq_addref(struct afb_xreq *xreq)
 {
-	afb_request_addref(to_request(xreq));
+	afb_request_addref(xreq_to_request(xreq));
 }
 
 void afb_xreq_unref(struct afb_xreq *xreq)
 {
-	afb_request_unref(to_request(xreq));
+	afb_request_unref(xreq_to_request(xreq));
 }
 
-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 *cb_closure)
+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*, struct afb_request *), void *cb_closure)
 {
-	xreq_subcall_cb(to_request(xreq), api, verb, args, callback, cb_closure);
+	xreq_subcall_request_cb(xreq_to_request(xreq), api, verb, args, callback, cb_closure);
 }
 
-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 *cb_closure)
+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*, struct afb_request *), void *cb_closure)
 {
-	afb_request_subcall(to_request(xreq), api, verb, args, callback, cb_closure);
+	afb_request_subcall(xreq_to_request(xreq), api, verb, args, callback, cb_closure);
 }
 
 int afb_xreq_unhooked_subcall_sync(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, struct json_object **result)
 {
-	return xreq_subcallsync_cb(to_request(xreq), api, verb, args, result);
+	return xreq_subcallsync_cb(xreq_to_request(xreq), api, verb, args, result);
 }
 
 int afb_xreq_subcall_sync(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, struct json_object **result)
 {
-	return afb_request_subcall_sync(to_request(xreq), api, verb, args, result);
+	return afb_request_subcall_sync(xreq_to_request(xreq), api, verb, args, result);
 }
 
 static int xreq_session_check_apply_v1(struct afb_xreq *xreq, int sessionflags)
@@ -968,7 +1026,7 @@ void afb_xreq_call_verb_v1(struct afb_xreq *xreq, const struct afb_verb_desc_v1
 		afb_xreq_fail_unknown_verb(xreq);
 	else
 		if (!xreq_session_check_apply_v1(xreq, verb->session))
-			verb->callback(to_req(xreq));
+			verb->callback(xreq_to_req(xreq));
 }
 
 void afb_xreq_call_verb_v2(struct afb_xreq *xreq, const struct afb_verb_v2 *verb)
@@ -977,7 +1035,16 @@ void afb_xreq_call_verb_v2(struct afb_xreq *xreq, const struct afb_verb_v2 *verb
 		afb_xreq_fail_unknown_verb(xreq);
 	else
 		if (!xreq_session_check_apply_v2(xreq, verb->session, verb->auth))
-			verb->callback(to_req(xreq));
+			verb->callback(xreq_to_req(xreq));
+}
+
+void afb_xreq_call_verb_vdyn(struct afb_xreq *xreq, const struct afb_api_dyn_verb *verb)
+{
+	if (!verb)
+		afb_xreq_fail_unknown_verb(xreq);
+	else
+		if (xreq_session_check_apply_v2(xreq, verb->session, verb->auth) >= 0)
+			verb->callback(xreq_to_request(xreq));
 }
 
 void afb_xreq_init(struct afb_xreq *xreq, const struct afb_xreq_query_itf *queryitf)
@@ -990,12 +1057,12 @@ void afb_xreq_init(struct afb_xreq *xreq, const struct afb_xreq_query_itf *query
 
 void afb_xreq_fail_unknown_api(struct afb_xreq *xreq)
 {
-	afb_xreq_fail_f(xreq, "unknown-api", "api %s not found (for verb %s)", xreq->api, xreq->verb);
+	afb_xreq_fail_f(xreq, "unknown-api", "api %s not found (for verb %s)", xreq->request.api, xreq->request.verb);
 }
 
 void afb_xreq_fail_unknown_verb(struct afb_xreq *xreq)
 {
-	afb_xreq_fail_f(xreq, "unknown-verb", "verb %s unknown within api %s", xreq->verb, xreq->api);
+	afb_xreq_fail_f(xreq, "unknown-verb", "verb %s unknown within api %s", xreq->request.verb, xreq->request.api);
 }
 
 static void init_hooking(struct afb_xreq *xreq)
@@ -1044,7 +1111,7 @@ static void early_failure(struct afb_xreq *xreq, const char *status, const char
 
 	/* send error */
 	va_start(args, info);
-	afb_request_fail_v(to_request(xreq), status, info, args);
+	afb_request_fail_v(xreq_to_request(xreq), status, info, args);
 	va_end(args);
 }
 
@@ -1059,12 +1126,12 @@ void afb_xreq_process(struct afb_xreq *xreq, struct afb_apiset *apiset)
 
 	/* lookup at the api */
 	xreq->apiset = apiset;
-	api = afb_apiset_lookup_started(apiset, xreq->api, 1);
+	api = afb_apiset_lookup_started(apiset, xreq->request.api, 1);
 	if (!api) {
 		if (errno == ENOENT)
-			early_failure(xreq, "unknown-api", "api %s not found (for verb %s)", xreq->api, xreq->verb);
+			early_failure(xreq, "unknown-api", "api %s not found (for verb %s)", xreq->request.api, xreq->request.verb);
 		else
-			early_failure(xreq, "bad-api-state", "api %s not started correctly: %m", xreq->api);
+			early_failure(xreq, "bad-api-state", "api %s not started correctly: %m", xreq->request.api);
 		goto end;
 	}
 	xreq->context.api_key = api;
@@ -1075,8 +1142,8 @@ void afb_xreq_process(struct afb_xreq *xreq, struct afb_apiset *apiset)
 		while (caller) {
 			if (((const struct afb_api *)caller->context.api_key)->group == api->group) {
 				/* noconcurrency lock detected */
-				ERROR("self-lock detected in call stack for API %s", xreq->api);
-				early_failure(xreq, "self-locked", "recursive self lock, API %s", xreq->api);
+				ERROR("self-lock detected in call stack for API %s", xreq->request.api);
+				early_failure(xreq, "self-locked", "recursive self lock, API %s", xreq->request.api);
 				goto end;
 			}
 			caller = caller->caller;