Introduce object for tokens

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

diff --git a/src/afb-stub-ws.c b/src/afb-stub-ws.c
index 3c28871..3e9ede2 100644 (file)
--- a/src/afb-stub-ws.c
+++ b/src/afb-stub-ws.c
@@ -341,12 +341,12 @@ static void server_event_push_cb(void *closure, const char *event, int eventid,
        json_object_put(object);
 }
 
-static void server_event_broadcast_cb(void *closure, const char *event, int eventid, struct json_object *object)
+static void server_event_broadcast_cb(void *closure, const char *event, struct json_object *object, const uuid_binary_t uuid, uint8_t hop)
 {
        struct afb_stub_ws *stubws = closure;
 
        if (stubws->proto != NULL)
-               afb_proto_ws_server_event_broadcast(stubws->proto, event, object);
+               afb_proto_ws_server_event_broadcast(stubws->proto, event, object, uuid, hop);
        json_object_put(object);
 }
 
@@ -457,9 +457,9 @@ static void client_on_event_push_cb(void *closure, const char *event_name, int e
                ERROR("unreadable push event");
 }
 
-static void client_on_event_broadcast_cb(void *closure, const char *event_name, struct json_object *data)
+static void client_on_event_broadcast_cb(void *closure, const char *event_name, struct json_object *data, const uuid_binary_t uuid, uint8_t hop)
 {
-       afb_evt_broadcast(event_name, data);
+       afb_evt_rebroadcast(event_name, data, uuid, hop);
 }
 
 /*****************************************************/
@@ -523,9 +523,8 @@ static void server_on_call_cb(void *closure, struct afb_proto_ws_call *call, con
        wreq->call = call;
 
        /* init the context */
-       if (afb_context_connect(&wreq->xreq.context, sessionid, NULL) < 0)
+       if (afb_context_connect_validated(&wreq->xreq.context, sessionid) < 0)
                goto unconnected;
-       wreq->xreq.context.validated = 1;
        server_record_session(stubws, wreq->xreq.context.session);
        if (wreq->xreq.context.created)
                afb_session_set_autoclose(wreq->xreq.context.session, 1);
@@ -649,7 +648,7 @@ static void on_hangup(void *closure)
 
 static int enqueue_processing(struct afb_proto_ws *proto, void (*callback)(int signum, void* arg), void *arg)
 {
-       return jobs_queue(NULL /* proto */, 0, callback, arg);
+       return jobs_queue(proto, 0, callback, arg);
 }
 
 /*****************************************************/