X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-ws-json.c;h=4393d093687e7d4c93c54ab0cc910b88aa063073;hb=4256f76f127ff982415e875567da08408087f326;hp=9387f8d781b5301fda53b7aadb1d3eda8232d9da;hpb=289017821655e0d9750eb7d5ae82c23790422a50;p=src%2Fapp-framework-binder.git diff --git a/src/afb-ws-json.c b/src/afb-ws-json.c index 9387f8d7..4393d093 100644 --- a/src/afb-ws-json.c +++ b/src/afb-ws-json.c @@ -54,7 +54,7 @@ struct afb_ws_json static void aws_send_event(struct afb_ws_json *ws, const char *event, struct json_object *object); -static const struct afb_event_sender_itf event_sender_itf = { +static const struct afb_event_listener_itf event_listener_itf = { .send = (void*)aws_send_event }; @@ -84,7 +84,7 @@ struct afb_ws_json *afb_ws_json_create(int fd, struct AFB_clientCtx *context, vo if (result->ws == NULL) goto error4; - if (0 > ctxClientEventSenderAdd(result->context, (struct afb_event_sender){ .itf = &event_sender_itf, .closure = result })) + if (0 > ctxClientEventListenerAdd(result->context, (struct afb_event_listener){ .itf = &event_listener_itf, .closure = result })) goto error5; return result; @@ -104,7 +104,7 @@ error: static void aws_on_hangup(struct afb_ws_json *ws) { - ctxClientEventSenderRemove(ws->context, (struct afb_event_sender){ .itf = &event_sender_itf, .closure = ws }); + ctxClientEventListenerRemove(ws->context, (struct afb_event_listener){ .itf = &event_listener_itf, .closure = ws }); afb_ws_destroy(ws->ws); json_tokener_free(ws->tokener); if (ws->cleanup != NULL) @@ -142,7 +142,7 @@ static struct afb_arg wsreq_get(struct afb_wsreq *wsreq, const char *name); static void wsreq_fail(struct afb_wsreq *wsreq, const char *status, const char *info); static void wsreq_success(struct afb_wsreq *wsreq, struct json_object *obj, const char *info); static const char *wsreq_raw(struct afb_wsreq *wsreq, size_t *size); -static void wsreq_send(struct afb_wsreq *wsreq, char *buffer, size_t size); +static void wsreq_send(struct afb_wsreq *wsreq, const char *buffer, size_t size); static int wsreq_session_create(struct afb_wsreq *wsreq); static int wsreq_session_check(struct afb_wsreq *wsreq, int refresh); static void wsreq_session_close(struct afb_wsreq *wsreq); @@ -160,7 +160,6 @@ static const struct afb_req_itf wsreq_itf = { .session_close = (void*)wsreq_session_close, .context_get = (void*)afb_context_get, .context_set = (void*)afb_context_set - }; static int aws_wsreq_parse(struct afb_wsreq *r, char *text, size_t size) @@ -427,7 +426,7 @@ static const char *wsreq_raw(struct afb_wsreq *wsreq, size_t *size) return wsreq->obj; } -static void wsreq_send(struct afb_wsreq *wsreq, char *buffer, size_t size) +static void wsreq_send(struct afb_wsreq *wsreq, const char *buffer, size_t size) { afb_ws_text(wsreq->aws->ws, buffer, size); }