Fix issue when JSON value is NULL in xreq

[src/app-framework-binder.git] / src / afb-xreq.c

diff --git a/src/afb-xreq.c b/src/afb-xreq.c
index 0b82827..fbed6ed 100644 (file)
--- 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,7 +55,9 @@ 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)
@@ -257,6 +260,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 +406,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 +434,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 +454,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 +666,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);