X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-xreq.c;h=80fa9636c416be3aaec36e8b4f7dd64dcbbd58c8;hb=5e0e2b32c2d97b12280026841489ee8057854689;hp=9478f154f25709cc74cb808ca19a7711fa4d1ed6;hpb=090379fdaf6ed1860dcff21424135ad71ead0cd2;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-xreq.c b/src/afb-xreq.c
index 9478f154..80fa9636 100644
--- a/src/afb-xreq.c
+++ b/src/afb-xreq.c
@@ -19,11 +19,13 @@
 #define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
 
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #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"
@@ -39,19 +41,45 @@
 
 /******************************************************************************/
 
+static void vinfo(void *first, void *second, const char *fmt, va_list args, void (*fun)(void*,void*,const char*))
+{
+	char *info;
+	if (fmt == NULL || vasprintf(&info, fmt, args) < 0)
+		info = NULL;
+	fun(first, second, info);
+	free(info);
+}
+
+/******************************************************************************/
+
 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)
@@ -85,22 +113,14 @@ static void xreq_fail_cb(void *closure, const char *status, const char *info)
 	}
 }
 
-static const char *xreq_raw_cb(void *closure, size_t *size)
+static void xreq_vsuccess_cb(void *closure, struct json_object *obj, const char *fmt, va_list args)
 {
-	struct afb_xreq *xreq = closure;
-	const char *result = json_object_to_json_string(xreq_json_cb(xreq));
-	if (size != NULL)
-		*size = strlen(result);
-	return result;
+	vinfo(closure, obj, fmt, args, (void*)xreq_success_cb);
 }
 
-static void xreq_send_cb(void *closure, const char *buffer, size_t size)
+static void xreq_vfail_cb(void *closure, const char *status, const char *fmt, va_list args)
 {
-	struct json_object *obj = json_tokener_parse(buffer);
-	if (!obj == !buffer)
-		xreq_success_cb(closure, obj, "fake send");
-	else
-		xreq_fail_cb(closure, "fake-send-failed", "fake send");
+	vinfo(closure, (void*)status, fmt, args, (void*)xreq_fail_cb);
 }
 
 static void *xreq_context_get_cb(void *closure)
@@ -253,6 +273,18 @@ 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 afb_stored_req *xreq_store_cb(void *closure)
+{
+	xreq_addref_cb(closure);
+	return closure;
+}
+
 /******************************************************************************/
 
 static struct json_object *xreq_hooked_json_cb(void *closure)
@@ -283,19 +315,14 @@ static void xreq_hooked_fail_cb(void *closure, const char *status, const char *i
 	xreq_fail_cb(closure, status, info);
 }
 
-static const char *xreq_hooked_raw_cb(void *closure, size_t *size)
+static void xreq_hooked_vsuccess_cb(void *closure, struct json_object *obj, const char *fmt, va_list args)
 {
-	size_t s;
-	const char *r = xreq_raw_cb(closure, size ? : &s);
-	struct afb_xreq *xreq = closure;
-	return afb_hook_xreq_raw(xreq, r, *(size ? : &s));
+	vinfo(closure, obj, fmt, args, (void*)xreq_hooked_success_cb);
 }
 
-static void xreq_hooked_send_cb(void *closure, const char *buffer, size_t size)
+static void xreq_hooked_vfail_cb(void *closure, const char *status, const char *fmt, va_list args)
 {
-	struct afb_xreq *xreq = closure;
-	afb_hook_xreq_send(xreq, buffer, size);
-	xreq_send_cb(closure, buffer, size);
+	vinfo(closure, (void*)status, fmt, args, (void*)xreq_hooked_fail_cb);
 }
 
 static void *xreq_hooked_context_get_cb(void *closure)
@@ -398,6 +425,24 @@ 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);
+}
+
+static struct afb_stored_req *xreq_hooked_store_cb(void *closure)
+{
+	struct afb_xreq *xreq = closure;
+	struct afb_stored_req *r = xreq_store_cb(closure);
+	afb_hook_xreq_store(xreq, r);
+	return r;
+}
+
 /******************************************************************************/
 
 const struct afb_req_itf xreq_itf = {
@@ -405,8 +450,8 @@ const struct afb_req_itf xreq_itf = {
 	.get = xreq_get_cb,
 	.success = xreq_success_cb,
 	.fail = xreq_fail_cb,
-	.raw = xreq_raw_cb,
-	.send = xreq_send_cb,
+	.vsuccess = xreq_vsuccess_cb,
+	.vfail = xreq_vfail_cb,
 	.context_get = xreq_context_get_cb,
 	.context_set = xreq_context_set_cb,
 	.addref = xreq_addref_cb,
@@ -416,7 +461,9 @@ 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,
+	.store = xreq_store_cb
 };
 
 const struct afb_req_itf xreq_hooked_itf = {
@@ -424,8 +471,8 @@ const struct afb_req_itf xreq_hooked_itf = {
 	.get = xreq_hooked_get_cb,
 	.success = xreq_hooked_success_cb,
 	.fail = xreq_hooked_fail_cb,
-	.raw = xreq_hooked_raw_cb,
-	.send = xreq_hooked_send_cb,
+	.vsuccess = xreq_hooked_vsuccess_cb,
+	.vfail = xreq_hooked_vfail_cb,
 	.context_get = xreq_hooked_context_get_cb,
 	.context_set = xreq_hooked_context_set_cb,
 	.addref = xreq_hooked_addref_cb,
@@ -435,7 +482,9 @@ 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,
+	.store = xreq_hooked_store_cb
 };
 
 static inline struct afb_req to_req(struct afb_xreq *xreq)
@@ -445,6 +494,14 @@ static inline struct afb_req to_req(struct afb_xreq *xreq)
 
 /******************************************************************************/
 
+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);
+}
+
 struct json_object *afb_xreq_json(struct afb_xreq *xreq)
 {
 	return afb_req_json(to_req(xreq));
@@ -486,7 +543,11 @@ void afb_xreq_fail_f(struct afb_xreq *xreq, const char *status, const char *info
 
 const char *afb_xreq_raw(struct afb_xreq *xreq, size_t *size)
 {
-	return afb_req_raw(to_req(xreq), size);
+	struct json_object *obj = xreq_json_cb(xreq);
+	const char *result = json_object_to_json_string(obj);
+	if (size != NULL)
+		*size = strlen(result);
+	return result;
 }
 
 void afb_xreq_addref(struct afb_xreq *xreq)
@@ -642,8 +703,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);