Introduce object for tokens

[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 23160fc..d0cca2b 100644 (file)
--- a/src/afb-ws-json1.c
+++ b/src/afb-ws-json1.c
@@ -34,6 +34,7 @@
 #include "afb-xreq.h"
 #include "afb-context.h"
 #include "afb-evt.h"
+#include "afb-token.h"
 
 #include "systemd.h"
 #include "verbose.h"
@@ -52,6 +53,8 @@ static void aws_on_broadcast_cb(void *closure, const char *event, struct json_ob
 /* predeclaration of wsreq callbacks */
 static void wsreq_destroy(struct afb_xreq *xreq);
 static void wsreq_reply(struct afb_xreq *xreq, struct json_object *object, const char *error, const char *info);
+static int wsreq_subscribe(struct afb_xreq *xreq, struct afb_event_x2 *event);
+static int wsreq_unsubscribe(struct afb_xreq *xreq, struct afb_event_x2 *event);
 
 /* declaration of websocket structure */
 struct afb_ws_json1
@@ -60,6 +63,7 @@ struct afb_ws_json1
        void (*cleanup)(void*);
        void *cleanup_closure;
        struct afb_session *session;
+       struct afb_token *token;
        struct afb_evt_listener *listener;
        struct afb_wsj1 *wsj1;
        struct afb_cred *cred;
@@ -85,6 +89,8 @@ static struct afb_wsj1_itf wsj1_itf = {
 /* interface for xreq */
 const struct afb_xreq_query_itf afb_ws_json1_xreq_itf = {
        .reply = wsreq_reply,
+       .subscribe = wsreq_subscribe,
+       .unsubscribe = wsreq_unsubscribe,
        .unref = wsreq_destroy
 };
 
@@ -117,6 +123,7 @@ struct afb_ws_json1 *afb_ws_json1_create(struct fdev *fdev, struct afb_apiset *a
        result->cleanup = cleanup;
        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;
@@ -137,6 +144,7 @@ error4:
        afb_wsj1_unref(result->wsj1);
 error3:
        afb_session_unref(result->session);
+       afb_token_unref(result->token);
 error2:
        free(result);
 error:
@@ -157,6 +165,7 @@ void afb_ws_json1_unref(struct afb_ws_json1 *ws)
                afb_wsj1_unref(ws->wsj1);
                if (ws->cleanup != NULL)
                        ws->cleanup(ws->cleanup_closure);
+               afb_token_unref(ws->token);
                afb_session_unref(ws->session);
                afb_cred_unref(ws->cred);
                afb_apiset_unref(ws->apiset);
@@ -202,7 +211,6 @@ static void aws_on_call_cb(void *closure, const char *api, const char *verb, str
        wsreq->xreq.request.called_verb = verb;
        wsreq->xreq.json = afb_wsj1_msg_object_j(wsreq->msgj1);
        wsreq->aws = afb_ws_json1_addref(ws);
-       wsreq->xreq.listener = wsreq->aws->listener;
 
        /* emits the call */
        afb_xreq_process(&wsreq->xreq, ws->apiset);
@@ -257,3 +265,17 @@ static void wsreq_reply(struct afb_xreq *xreq, struct json_object *object, const
                ERROR("Can't send reply: %m");
 }
 
+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);
+}
+
+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);
+}
+