Update copyright dates

[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 d0cca2b..88fd1c1 100644 (file)
--- a/src/afb-ws-json1.c
+++ b/src/afb-ws-json1.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019 "IoT.bzh"
+ * Copyright (C) 2015-2020 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -47,7 +47,7 @@ struct afb_wsreq;
 /* predeclaration of websocket callbacks */
 static void aws_on_hangup_cb(void *closure, struct afb_wsj1 *wsj1);
 static void aws_on_call_cb(void *closure, const char *api, const char *verb, struct afb_wsj1_msg *msg);
-static void aws_on_push_cb(void *closure, const char *event, int eventid, struct json_object *object);
+static void aws_on_push_cb(void *closure, const char *event, uint16_t eventid, struct json_object *object);
 static void aws_on_broadcast_cb(void *closure, const char *event, struct json_object *object, const uuid_binary_t uuid, uint8_t hop);
 
 /* predeclaration of wsreq callbacks */
@@ -68,7 +68,6 @@ struct afb_ws_json1
        struct afb_wsj1 *wsj1;
        struct afb_cred *cred;
        struct afb_apiset *apiset;
-       int new_session;
 };
 
 /* declaration of wsreq structure */
@@ -124,7 +123,6 @@ struct afb_ws_json1 *afb_ws_json1_create(struct fdev *fdev, struct afb_apiset *a
        result->cleanup_closure = cleanup_closure;
        result->session = afb_session_addref(context->session);
        result->token = afb_token_addref(context->token);
-       result->new_session = context->created != 0;
        if (result->session == NULL)
                goto error2;
 
@@ -179,13 +177,33 @@ static void aws_on_hangup_cb(void *closure, struct afb_wsj1 *wsj1)
        afb_ws_json1_unref(ws);
 }
 
+static int aws_new_token(struct afb_ws_json1 *ws, const char *new_token_string)
+{
+       int rc;
+       struct afb_token *newtok, *oldtok;
+
+       rc = afb_token_get(&newtok, new_token_string);
+       if (rc >= 0) {
+               oldtok = ws->token;
+               ws->token = newtok;
+               afb_token_unref(oldtok);
+       }
+       return rc;
+}
+
 static void aws_on_call_cb(void *closure, const char *api, const char *verb, struct afb_wsj1_msg *msg)
 {
        struct afb_ws_json1 *ws = closure;
        struct afb_wsreq *wsreq;
+       const char *tok;
 
        DEBUG("received websocket request for %s/%s: %s", api, verb, afb_wsj1_msg_object_s(msg));
 
+       /* handle new tokens */
+       tok = afb_wsj1_msg_token(msg);
+       if (tok)
+               aws_new_token(ws, tok);
+
        /* allocate */
        wsreq = calloc(1, sizeof *wsreq);
        if (wsreq == NULL) {
@@ -195,18 +213,11 @@ static void aws_on_call_cb(void *closure, const char *api, const char *verb, str
 
        /* init the context */
        afb_xreq_init(&wsreq->xreq, &afb_ws_json1_xreq_itf);
-       afb_context_init(&wsreq->xreq.context, ws->session, afb_wsj1_msg_token(msg));
-       if (!wsreq->xreq.context.invalidated)
-               wsreq->xreq.context.validated = 1;
-       if (ws->new_session != 0) {
-               wsreq->xreq.context.created = 1;
-               ws->new_session = 0;
-       }
+       afb_context_init(&wsreq->xreq.context, ws->session, ws->token, ws->cred);
 
        /* fill and record the request */
        afb_wsj1_msg_addref(msg);
        wsreq->msgj1 = msg;
-       wsreq->xreq.cred = afb_cred_addref(ws->cred);
        wsreq->xreq.request.called_api = api;
        wsreq->xreq.request.called_verb = verb;
        wsreq->xreq.json = afb_wsj1_msg_object_j(wsreq->msgj1);
@@ -221,7 +232,7 @@ static void aws_on_event(struct afb_ws_json1 *aws, const char *event, struct jso
        afb_wsj1_send_event_j(aws->wsj1, event, afb_msg_json_event(event, object));
 }
 
-static void aws_on_push_cb(void *closure, const char *event, int eventid, struct json_object *object)
+static void aws_on_push_cb(void *closure, const char *event, uint16_t eventid, struct json_object *object)
 {
        aws_on_event(closure, event, object);
 }
@@ -245,7 +256,6 @@ 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);
        afb_ws_json1_unref(wsreq->aws);
        free(wsreq);
 }
@@ -260,7 +270,7 @@ static void wsreq_reply(struct afb_xreq *xreq, struct json_object *object, const
        reply = afb_msg_json_reply(object, error, info, &xreq->context);
 
        rc = (error ? afb_wsj1_reply_error_j : afb_wsj1_reply_ok_j)(
-                       wsreq->msgj1, reply, afb_context_sent_token(&wsreq->xreq.context));
+                       wsreq->msgj1, reply, NULL);
        if (rc)
                ERROR("Can't send reply: %m");
 }
@@ -269,13 +279,13 @@ static int wsreq_subscribe(struct afb_xreq *xreq, struct afb_event_x2 *event)
 {
        struct afb_wsreq *wsreq = CONTAINER_OF_XREQ(struct afb_wsreq, xreq);
 
-       return afb_evt_event_x2_add_watch(wsreq->aws->listener, event);
+       return afb_evt_listener_watch_x2(wsreq->aws->listener, event);
 }
 
 static int wsreq_unsubscribe(struct afb_xreq *xreq, struct afb_event_x2 *event)
 {
        struct afb_wsreq *wsreq = CONTAINER_OF_XREQ(struct afb_wsreq, xreq);
 
-       return afb_evt_event_x2_remove_watch(wsreq->aws->listener, event);
+       return afb_evt_listener_unwatch_x2(wsreq->aws->listener, event);
 }