X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-xreq.c;h=fe999afa1c32531b1ece97e31f7c80736ac3a954;hb=6120bbbd2cbd1f06904f887957d92ac740631c55;hp=c70e0006151509f16638a7b5209739830e73671d;hpb=bdff72f45e1d02f596595f6229d5bccf7c0827c2;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-xreq.c b/src/afb-xreq.c
index c70e0006..fe999afa 100644
--- a/src/afb-xreq.c
+++ b/src/afb-xreq.c
@@ -16,7 +16,6 @@
  */
 
 #define _GNU_SOURCE
-#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -49,6 +48,8 @@ static inline void xreq_addref(struct afb_xreq *xreq)
 static inline void xreq_unref(struct afb_xreq *xreq)
 {
 	if (!__atomic_sub_fetch(&xreq->refcount, 1, __ATOMIC_RELAXED)) {
+		if (!xreq->replied)
+			afb_xreq_fail(xreq, "error", "no reply");
 		if (xreq->hookflags)
 			afb_hook_xreq_end(xreq);
 		xreq->queryitf->unref(xreq);
@@ -436,8 +437,15 @@ static int xreq_subcallsync_cb(void *closure, const char *api, const char *verb,
 
 static void xreq_vverbose_cb(void*closure, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
 {
-	/* TODO: improves the implementation. example: on condition make a list of log messages that will be returned */
-	vverbose(level, file, line, func, fmt, args);
+	char *p;
+	struct afb_xreq *xreq = 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);
+		free(p);
+	}
 }
 
 static struct afb_stored_req *xreq_store_cb(void *closure)
@@ -446,6 +454,12 @@ static struct afb_stored_req *xreq_store_cb(void *closure)
 	return closure;
 }
 
+static int xreq_has_permission_cb(void*closure, const char *permission)
+{
+	struct afb_xreq *xreq = closure;
+	return afb_auth_has_permission(xreq, permission);
+}
+
 /******************************************************************************/
 
 static struct json_object *xreq_hooked_json_cb(void *closure)
@@ -625,6 +639,13 @@ static struct afb_stored_req *xreq_hooked_store_cb(void *closure)
 	return r;
 }
 
+static int xreq_hooked_has_permission_cb(void*closure, const char *permission)
+{
+	struct afb_xreq *xreq = closure;
+	int r = xreq_has_permission_cb(closure, permission);
+	return afb_hook_xreq_has_permission(xreq, permission, r);
+}
+
 /******************************************************************************/
 
 const struct afb_req_itf xreq_itf = {
@@ -646,7 +667,8 @@ const struct afb_req_itf xreq_itf = {
 	.subcallsync = xreq_subcallsync_cb,
 	.vverbose = xreq_vverbose_cb,
 	.store = xreq_store_cb,
-	.subcall_req = xreq_subcall_req_cb
+	.subcall_req = xreq_subcall_req_cb,
+	.has_permission = xreq_has_permission_cb
 };
 
 const struct afb_req_itf xreq_hooked_itf = {
@@ -668,7 +690,8 @@ const struct afb_req_itf xreq_hooked_itf = {
 	.subcallsync = xreq_hooked_subcallsync_cb,
 	.vverbose = xreq_hooked_vverbose_cb,
 	.store = xreq_hooked_store_cb,
-	.subcall_req = xreq_hooked_subcall_req_cb
+	.subcall_req = xreq_hooked_subcall_req_cb,
+	.has_permission = xreq_hooked_has_permission_cb
 };
 
 /******************************************************************************/
@@ -821,7 +844,7 @@ static int xreq_session_check_apply_v2(struct afb_xreq *xreq, uint32_t sessionfl
 		return -1;
 	}
 
-	if (auth && !afb_auth_check(auth, xreq)) {
+	if (auth && !afb_auth_check(xreq, auth)) {
 		afb_xreq_fail_f(xreq, "denied", "authorisation refused");
 		errno = EPERM;
 		return -1;
@@ -874,7 +897,7 @@ void afb_xreq_fail_unknown_verb(struct afb_xreq *xreq)
 
 static void process_sync(struct afb_xreq *xreq)
 {
-	struct afb_api api;
+	const struct afb_api *api;
 
 	/* init hooking */
 	afb_hook_init_xreq(xreq);
@@ -882,14 +905,15 @@ static void process_sync(struct afb_xreq *xreq)
 		afb_hook_xreq_begin(xreq);
 
 	/* search the api */
-	if (afb_apiset_get_started(xreq->apiset, xreq->api, &api) < 0) {
+	api = (const struct afb_api*)xreq->context.api_key;
+	if (api)
+		api->itf->call(api->closure, xreq);
+	else {
+		api = afb_apiset_lookup_started(xreq->apiset, xreq->api, 1);
 		if (errno == ENOENT)
 			afb_xreq_fail_f(xreq, "unknown-api", "api %s not found", xreq->api);
 		else
 			afb_xreq_fail_f(xreq, "bad-api-state", "api %s not started correctly: %m", xreq->api);
-	} else {
-		xreq->context.api_key = api.closure;
-		api.itf->call(api.closure, xreq);
 	}
 }
 
@@ -907,10 +931,14 @@ static void process_async(int signum, void *arg)
 
 void afb_xreq_process(struct afb_xreq *xreq, struct afb_apiset *apiset)
 {
+	const struct afb_api *api;
+
 	xreq->apiset = apiset;
+	api = afb_apiset_lookup_started(apiset, xreq->api, 1);
+	xreq->context.api_key = (void*)api;
 
 	xreq_addref(xreq);
-	if (jobs_queue(NULL, afb_apiset_timeout_get(apiset), process_async, xreq) < 0) {
+	if (jobs_queue(api && api->noconcurrency ? (void*)api : NULL, afb_apiset_timeout_get(apiset), process_async, xreq) < 0) {
 		/* TODO: allows or not to proccess it directly as when no threading? (see above) */
 		ERROR("can't process job with threads: %m");
 		afb_xreq_fail_f(xreq, "cancelled", "not able to create a job for the task");