Ensure that subcall_sync use subcall

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

diff --git a/src/afb-xreq.c b/src/afb-xreq.c
index c8fd94e..b64cefb 100644 (file)
--- a/src/afb-xreq.c
+++ b/src/afb-xreq.c
@@ -62,6 +62,13 @@ static void xreq_subcall_cb(
                void (*callback)(void*, int, struct json_object*),
                void *cb_closure);
 
+static int xreq_subcallsync_cb(
+               void *closure,
+               const char *api,
+               const char *verb,
+               struct json_object *args,
+               struct json_object **result);
+
 const struct afb_req_itf xreq_itf = {
        .json = xreq_json_cb,
        .get = xreq_get_cb,
@@ -77,7 +84,8 @@ const struct afb_req_itf xreq_itf = {
        .session_set_LOA = xreq_session_set_LOA_cb,
        .subscribe = xreq_subscribe_cb,
        .unsubscribe = xreq_unsubscribe_cb,
-       .subcall = xreq_subcall_cb
+       .subcall = xreq_subcall_cb,
+       .subcallsync = xreq_subcallsync_cb
 };
 
 static struct json_object *xreq_json_cb(void *closure)
@@ -242,12 +250,24 @@ int afb_xreq_unsubscribe(struct afb_xreq *xreq, struct afb_event event)
 static void xreq_subcall_cb(void *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 = closure;
+
+       afb_xreq_subcall(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)
+{
        if (xreq->queryitf->subcall)
                xreq->queryitf->subcall(xreq->query, api, verb, args, callback, cb_closure);
        else
                afb_subcall(xreq, api, verb, args, callback, cb_closure);
 }
 
+static int xreq_subcallsync_cb(void *closure, const char *api, const char *verb, struct json_object *args, struct json_object **result)
+{
+       struct afb_xreq *xreq = closure;
+       return afb_subcall_sync(xreq, api, verb, args, result);
+}
+
 void afb_xreq_success_f(struct afb_xreq *xreq, struct json_object *obj, const char *info, ...)
 {
        char *message;
@@ -272,10 +292,8 @@ void afb_xreq_fail_f(struct afb_xreq *xreq, const char *status, const char *info
        free(message);
 }
 
-static int xcheck(struct afb_xreq *xreq)
+static int xcheck(struct afb_xreq *xreq, int stag)
 {
-       int stag = xreq->sessionflags;
-
        if ((stag & (AFB_SESSION_CREATE|AFB_SESSION_CLOSE|AFB_SESSION_RENEW|AFB_SESSION_CHECK|AFB_SESSION_LOA_EQ)) != 0) {
                if (!afb_context_check(&xreq->context)) {
                        afb_context_close(&xreq->context);
@@ -319,9 +337,9 @@ static int xcheck(struct afb_xreq *xreq)
        return 1;
 }
 
-void afb_xreq_call(struct afb_xreq *xreq)
+void afb_xreq_call(struct afb_xreq *xreq, int sessionflags, void (*callback)(struct afb_req req))
 {
-       if (xcheck(xreq))
-               xreq->callback((struct afb_req){ .itf = &xreq_itf, .closure = xreq });
+       if (xcheck(xreq, sessionflags))
+               callback((struct afb_req){ .itf = &xreq_itf, .closure = xreq });
 }