/*
- * Copyright (C) 2015-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");
int rc;
struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
- rc = afb_evt_event_x2_add_watch(wreq->stubws->listener, event);
+ rc = afb_evt_listener_watch_x2(wreq->stubws->listener, event);
if (rc >= 0)
rc = afb_proto_ws_call_subscribe(wreq->call, afb_evt_event_x2_id(event));
if (rc < 0)
static int server_req_unsubscribe_cb(struct afb_xreq *xreq, struct afb_event_x2 *event)
{
- int rc, rc2;
+ int rc;
struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
rc = afb_proto_ws_call_unsubscribe(wreq->call, afb_evt_event_x2_id(event));
- rc2 = afb_evt_event_x2_remove_watch(wreq->stubws->listener, event);
- if (rc >= 0 && rc2 < 0)
- rc = rc2;
if (rc < 0)
ERROR("error while unsubscribing event");
return rc;
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)
afb_token_unref(token);
}
+static void server_on_event_unexpected_cb(void *closure, uint16_t eventid)
+{
+ struct afb_stub_ws *stubws = closure;
+
+ afb_evt_listener_unwatch_id(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;
.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 */