From f40979c718fa6fe6b571e133e1bf19fc90957298 Mon Sep 17 00:00:00 2001 From: Jose Bollo Date: Tue, 17 Dec 2019 08:22:00 +0100 Subject: afb-proto-ws: Add message for unexpected event This new message allows to revoke an event no more expected or listened. Bug-AGL: SPEC-3069 Change-Id: I71945e322276f29b01b628bdf43d75599b521fc3 Signed-off-by: Jose Bollo --- src/afb-stub-ws.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src/afb-stub-ws.c') diff --git a/src/afb-stub-ws.c b/src/afb-stub-ws.c index b3b2e58a..b7e3c946 100644 --- a/src/afb-stub-ws.c +++ b/src/afb-stub-ws.c @@ -414,9 +414,11 @@ static void client_on_event_push_cb(void *closure, uint16_t event_id, struct jso rc = u16id2ptr_get(stubws->event_proxies, event_id, (void**)&event); if (rc >= 0 && event) - afb_evt_event_x2_push(event, data); + rc = afb_evt_event_x2_push(event, data); else ERROR("unreadable push event"); + if (rc <= 0) + afb_proto_ws_client_event_unexpected(stubws->proto, event_id); } static void client_on_event_broadcast_cb(void *closure, const char *event_name, struct json_object *data, const uuid_binary_t uuid, uint8_t hop) @@ -493,6 +495,13 @@ static void server_on_token_remove_cb(void *closure, uint16_t tokenid) afb_token_unref(token); } +static void server_on_event_unexpected_cb(void *closure, uint16_t eventid) +{ + struct afb_stub_ws *stubws = closure; + + afb_evt_watch_sub_eventid(stubws->listener, eventid); +} + static void server_on_call_cb(void *closure, struct afb_proto_ws_call *call, const char *verb, struct json_object *args, uint16_t sessionid, uint16_t tokenid, const char *user_creds) { struct afb_stub_ws *stubws = closure; @@ -583,7 +592,8 @@ static const struct afb_proto_ws_server_itf server_itf = .on_token_create = server_on_token_create_cb, .on_token_remove = server_on_token_remove_cb, .on_call = server_on_call_cb, - .on_describe = server_on_describe_cb + .on_describe = server_on_describe_cb, + .on_event_unexpected = server_on_event_unexpected_cb }; /* the interface for events pushing */ -- cgit 1.2.3-korg