X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-ws-json1.c;h=c7991934ce4c379208652e396d221175fbf9f78d;hb=6f13ad1989875b5a0ce50b24211fd1fba093735f;hp=9d6bfc3ccd897d3a2e68cc45802d48e56a945137;hpb=5b5968815dc672467f40ed6b49f05a590bdb8b4d;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-ws-json1.c b/src/afb-ws-json1.c
index 9d6bfc3c..c7991934 100644
--- a/src/afb-ws-json1.c
+++ b/src/afb-ws-json1.c
@@ -47,11 +47,13 @@ struct afb_wsreq;
 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_broadcast_cb(void *closure, const char *event, 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 */
 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
@@ -85,6 +87,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
 };
 
@@ -202,21 +206,24 @@ 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);
 }
 
+static void aws_on_event(struct afb_ws_json1 *aws, const char *event, struct json_object *object)
+{
+	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)
 {
-	aws_on_broadcast_cb(closure, event, object);
+	aws_on_event(closure, event, object);
 }
 
-static void aws_on_broadcast_cb(void *closure, const char *event, 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)
 {
-	struct afb_ws_json1 *aws = closure;
-	afb_wsj1_send_event_j(aws->wsj1, event, afb_msg_json_event(event, object));
+	aws_on_event(closure, event, afb_msg_json_event(event, object));
 }
 
 /***************************************************************
@@ -253,3 +260,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);
+}
+