Add 'afb_service_call_sync' function

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

diff --git a/src/afb-ws-json1.c b/src/afb-ws-json1.c
index 60a0a80..3d1f29d 100644 (file)
--- a/src/afb-ws-json1.c
+++ b/src/afb-ws-json1.c
@@ -33,11 +33,10 @@
 #include "afb-msg-json.h"
 #include "afb-session.h"
 #include "afb-cred.h"
-#include "afb-apis.h"
+#include "afb-apiset.h"
 #include "afb-xreq.h"
 #include "afb-context.h"
 #include "afb-evt.h"
-#include "afb-subcall.h"
 #include "verbose.h"
 
 /* predeclaration of structures */
@@ -63,6 +62,7 @@ struct afb_ws_json1
        struct afb_evt_listener *listener;
        struct afb_wsj1 *wsj1;
        struct afb_cred *cred;
+       struct afb_apiset *apiset;
        int new_session;
 };
 
@@ -101,7 +101,7 @@ static const struct afb_evt_itf evt_itf = {
 ****************************************************************
 ***************************************************************/
 
-struct afb_ws_json1 *afb_ws_json1_create(int fd, struct afb_context *context, void (*cleanup)(void*), void *cleanup_closure)
+struct afb_ws_json1 *afb_ws_json1_create(int fd, struct afb_apiset *apiset, struct afb_context *context, void (*cleanup)(void*), void *cleanup_closure)
 {
        struct afb_ws_json1 *result;
 
@@ -129,6 +129,9 @@ struct afb_ws_json1 *afb_ws_json1_create(int fd, struct afb_context *context, vo
                goto error4;
 
        result->cred = afb_cred_create_for_socket(fd);
+       if (!result->cred)
+               result->cred = afb_cred_current();
+       result->apiset = afb_apiset_addref(apiset);
        return result;
 
 error4:
@@ -157,6 +160,7 @@ static void aws_unref(struct afb_ws_json1 *ws)
                        ws->cleanup(ws->cleanup_closure);
                afb_session_unref(ws->session);
                afb_cred_unref(ws->cred);
+               afb_apiset_unref(ws->apiset);
                free(ws);
        }
 }
@@ -192,6 +196,7 @@ static void aws_on_call(struct afb_ws_json1 *ws, const char *api, const char *ve
        /* fill and record the request */
        afb_wsj1_msg_addref(msg);
        wsreq->msgj1 = msg;
+       wsreq->xreq.cred = afb_cred_addref(ws->cred);
        wsreq->xreq.api = api;
        wsreq->xreq.verb = verb;
        wsreq->xreq.json = afb_wsj1_msg_object_j(wsreq->msgj1);
@@ -199,8 +204,7 @@ static void aws_on_call(struct afb_ws_json1 *ws, const char *api, const char *ve
        wsreq->xreq.listener = wsreq->aws->listener;
 
        /* emits the call */
-       afb_apis_call(&wsreq->xreq);
-       afb_xreq_unref(&wsreq->xreq);
+       afb_xreq_process(&wsreq->xreq, ws->apiset);
 }
 
 static void aws_on_event(struct afb_ws_json1 *aws, const char *event, int eventid, struct json_object *object)
@@ -222,6 +226,7 @@ static void wsreq_destroy(struct afb_xreq *xreq)
 
        afb_context_disconnect(&wsreq->xreq.context);
        afb_wsj1_msg_unref(wsreq->msgj1);
+       afb_cred_unref(wsreq->xreq.cred);
        aws_unref(wsreq->aws);
        free(wsreq);
 }