X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fafb-ws-json1.c;h=88fd1c113c4ae2d03ce181ac6686efaa3dd533ff;hb=65353dce81a629e042800bb7b86fcd869a76727e;hp=a8461707eb77f9231ee8c1ce2d7747bba0743b1e;hpb=b4da3b7f3db2211e7ecca74301e26b3089fda5a2;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-ws-json1.c b/src/afb-ws-json1.c
index a8461707..88fd1c11 100644
--- 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 */
@@ -213,14 +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, ws->token);
-	if (!wsreq->xreq.context.invalidated)
-		wsreq->xreq.context.validated = 1;
+	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);
@@ -235,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);
 }
@@ -259,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);
 }
@@ -283,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);
 }