diff options
| author |   Jose Bollo <jose.bollo@iot.bzh> | 2019-03-27 17:16:06 +0100 |
|---|---|---|
| committer | José Bollo <jose.bollo@iot.bzh> | 2019-07-23 14:17:24 +0200 |
| commit | 6bb714ca16b246eda78cd6b099e3a841e3d54ebe (patch) | |
| tree | caaa5f34e27d45bea199d2cebf3c39ef46c6e996 /src/afb-ws-json1.c | |
| parent | 51ab7c2f95d6d459302423a57cc617021ef6126d (diff) | |
afb-xreq: Remove field 'listener'
This simplifies the flow that now has only one
case: the callbacks subscribe/unsubscribe of
struct afb_xreq_query_itf.
Bug-AGL: SPEC-2658
Signed-off-by: Jose Bollo <jose.bollo@iot.bzh>
Change-Id: Ia49f3ce7aaa4d8603014fe163f311eadfcbf68e4
Diffstat (limited to 'src/afb-ws-json1.c')
| -rw-r--r-- | src/afb-ws-json1.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/afb-ws-json1.c b/src/afb-ws-json1.c index 23160fc2..c7991934 100644 --- a/src/afb-ws-json1.c +++ b/src/afb-ws-json1.c @@ -52,6 +52,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 @@ -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,7 +206,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 +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); +} + |