afb-evt: Use 16 bits for ids

[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 6a52f6f..2a48745 100644 (file)
--- a/src/afb-stub-ws.c
+++ b/src/afb-stub-ws.c
@@ -316,7 +316,7 @@ static struct json_object *client_api_describe_cb(void * closure)
 
 /******************* server part: manage events **********************************/
 
-static void server_event_add_cb(void *closure, const char *event, int eventid)
+static void server_event_add_cb(void *closure, const char *event, uint16_t eventid)
 {
        struct afb_stub_ws *stubws = closure;
 
@@ -324,7 +324,7 @@ static void server_event_add_cb(void *closure, const char *event, int eventid)
                afb_proto_ws_server_event_create(stubws->proto, event, eventid);
 }
 
-static void server_event_remove_cb(void *closure, const char *event, int eventid)
+static void server_event_remove_cb(void *closure, const char *event, uint16_t eventid)
 {
        struct afb_stub_ws *stubws = closure;
 
@@ -332,7 +332,7 @@ static void server_event_remove_cb(void *closure, const char *event, int eventid
                afb_proto_ws_server_event_remove(stubws->proto, event, eventid);
 }
 
-static void server_event_push_cb(void *closure, const char *event, int eventid, struct json_object *object)
+static void server_event_push_cb(void *closure, const char *event, uint16_t eventid, struct json_object *object)
 {
        struct afb_stub_ws *stubws = closure;
 
@@ -523,15 +523,14 @@ 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);
 
        /* makes the call */
-       wreq->xreq.cred = afb_cred_mixed_on_behalf_import(stubws->cred, sessionid, user_creds);
+       wreq->xreq.cred = afb_cred_mixed_on_behalf_import(stubws->cred, &wreq->xreq.context, user_creds);
        wreq->xreq.request.called_api = stubws->apiname;
        wreq->xreq.request.called_verb = verb;
        wreq->xreq.json = args;