aboutsummaryrefslogtreecommitdiffstats
path: root/src/afb-ws-json1.c
diff options
context:
space:
mode:
authorJosé Bollo <jose.bollo@iot.bzh>2019-07-16 23:39:27 +0200
committerJose Bollo <jose.bollo@iot.bzh>2019-07-18 15:38:02 +0200
commit6dfeafe7e4fa582b3db3f950136bc97f8611fc6d (patch)
tree62386661fe495dd8992260c89e09757326450edc /src/afb-ws-json1.c
parent5b5968815dc672467f40ed6b49f05a590bdb8b4d (diff)
Tag broadcasted events with UUID and hop
When API have mutual dependencies, leading to loops in dependecies, broadcasting an event never ends because of the loop (see SPEC-2625). To avoid that weird flood of events, a unic identifier (UUID) is attached to broadcasted event and a tiny memory records previously broadcasted events to avoid re-sending an already sent event. The size of the memory can be set using the macro variable EVENT_BROADCAST_MEMORY_COUNT whose default value is 8. It can be reduced to 0. An other mecanism is added to limit the count of hops that a broadcasted event can do. That count can be set using the macro variable EVENT_BROADCAST_HOP_MAX whose default value is 10. Bug-AGL: SPEC-2625 Change-Id: I29550a8a5c8f5e2ffb20edc3330357a1e870c0e2 Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'src/afb-ws-json1.c')
-rw-r--r--src/afb-ws-json1.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/afb-ws-json1.c b/src/afb-ws-json1.c
index 9d6bfc3c..23160fc2 100644
--- a/src/afb-ws-json1.c
+++ b/src/afb-ws-json1.c
@@ -47,7 +47,7 @@ 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);
@@ -208,15 +208,19 @@ static void aws_on_call_cb(void *closure, const char *api, const char *verb, str
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));
}
/***************************************************************