X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-xreq.c;h=9c4cab8fdae8af88f07aa4bc15da591022d46ab8;hb=d3c80685ed6067f4899635c0328bbd8b70a2ed90;hp=0b828277ac26f40e10f87ccc831f4e4ee494cdab;hpb=db01090e1f869965c07b12d9480fa6f3d2e7b1b0;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-xreq.c b/src/afb-xreq.c
index 0b828277..9c4cab8f 100644
--- a/src/afb-xreq.c
+++ b/src/afb-xreq.c
@@ -24,7 +24,8 @@
 #include <errno.h>
 
 #include <json-c/json.h>
-#include <afb/afb-binding.h>
+#include <afb/afb-binding-v1.h>
+#include <afb/afb-binding-v2.h>
 
 #include "afb-context.h"
 #include "afb-xreq.h"
@@ -54,16 +55,31 @@ static void vinfo(void *first, void *second, const char *fmt, va_list args, void
 static struct json_object *xreq_json_cb(void *closure)
 {
 	struct afb_xreq *xreq = closure;
-	return xreq->json ? : (xreq->json = xreq->queryitf->json(xreq));
+	if (!xreq->json && xreq->queryitf->json)
+		xreq->json = xreq->queryitf->json(xreq);
+	return xreq->json;
 }
 
 static struct afb_arg xreq_get_cb(void *closure, const char *name)
 {
 	struct afb_xreq *xreq = closure;
+	struct afb_arg arg;
+	struct json_object *object, *value;
+
 	if (xreq->queryitf->get)
-		return xreq->queryitf->get(xreq, name);
-	else
-		return afb_msg_json_get_arg(xreq_json_cb(closure), name);
+		arg = xreq->queryitf->get(xreq, name);
+	else {
+		object = xreq_json_cb(closure);
+		if (json_object_object_get_ex(object, name, &value)) {
+			arg.name = name;
+			arg.value = json_object_get_string(value);
+		} else {
+			arg.name = NULL;
+			arg.value = NULL;
+		}
+		arg.path = NULL;
+	}
+	return arg;
 }
 
 static void xreq_success_cb(void *closure, struct json_object *obj, const char *info)
@@ -257,6 +273,12 @@ static int xreq_subcallsync_cb(void *closure, const char *api, const char *verb,
 	return 1;
 }
 
+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);
+}
+
 /******************************************************************************/
 
 static struct json_object *xreq_hooked_json_cb(void *closure)
@@ -397,6 +419,16 @@ static int xreq_hooked_subcallsync_cb(void *closure, const char *api, const char
 	return afb_hook_xreq_subcallsync_result(xreq, r, *result);
 }
 
+static void xreq_hooked_vverbose_cb(void*closure, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
+{
+	struct afb_xreq *xreq = closure;
+	va_list ap;
+	va_copy(ap, args);
+	xreq_vverbose_cb(closure, level, file, line, func, fmt, args);
+	afb_hook_xreq_vverbose(xreq, level, file, line, func, fmt, ap);
+	va_end(ap);
+}
+
 /******************************************************************************/
 
 const struct afb_req_itf xreq_itf = {
@@ -415,7 +447,8 @@ const struct afb_req_itf xreq_itf = {
 	.subscribe = xreq_subscribe_cb,
 	.unsubscribe = xreq_unsubscribe_cb,
 	.subcall = xreq_subcall_cb,
-	.subcallsync = xreq_subcallsync_cb
+	.subcallsync = xreq_subcallsync_cb,
+	.vverbose = xreq_vverbose_cb
 };
 
 const struct afb_req_itf xreq_hooked_itf = {
@@ -434,7 +467,8 @@ const struct afb_req_itf xreq_hooked_itf = {
 	.subscribe = xreq_hooked_subscribe_cb,
 	.unsubscribe = xreq_hooked_unsubscribe_cb,
 	.subcall = xreq_hooked_subcall_cb,
-	.subcallsync = xreq_hooked_subcallsync_cb
+	.subcallsync = xreq_hooked_subcallsync_cb,
+	.vverbose = xreq_hooked_vverbose_cb
 };
 
 static inline struct afb_req to_req(struct afb_xreq *xreq)
@@ -645,8 +679,11 @@ static void process_sync(struct afb_xreq *xreq)
 		afb_hook_xreq_begin(xreq);
 
 	/* search the api */
-	if (afb_apiset_get(xreq->apiset, xreq->api, &api) < 0) {
-		afb_xreq_fail_f(xreq, "unknown-api", "api %s not found", xreq->api);
+	if (afb_apiset_get_started(xreq->apiset, xreq->api, &api) < 0) {
+		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);