X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-ws-json1.c;h=5e71ff1f079319f91759db11c02c2148119f382b;hb=037157919df0a7ee90837037748a6456431e6469;hp=4f5cb868eba3aa779944f6d42d1d66773d98afc4;hpb=a445694bda8773cb80566808b5dcb56f033dee58;p=src%2Fapp-framework-binder.git diff --git a/src/afb-ws-json1.c b/src/afb-ws-json1.c index 4f5cb868..5e71ff1f 100644 --- a/src/afb-ws-json1.c +++ b/src/afb-ws-json1.c @@ -46,7 +46,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); @@ -207,15 +207,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)); } /***************************************************************