X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-ws-json.c;h=4bdda7ef8263e4fdffef5b17ff4acf33b5025c0d;hb=bd68881a7977d2fe63d4ca85b757ed9c127ec21d;hp=471831e73a8bff590b4e484e76b6a79ebf8aa859;hpb=9e3afb8aa598f3e69e2c3723335507c12b4cd1f1;p=src%2Fapp-framework-binder.git diff --git a/src/afb-ws-json.c b/src/afb-ws-json.c index 471831e7..4bdda7ef 100644 --- a/src/afb-ws-json.c +++ b/src/afb-ws-json.c @@ -27,17 +27,17 @@ #include "afb-ws.h" #include "afb-ws-json.h" +#include "afb-msg-json.h" #include "session.h" #include "afb-req-itf.h" #include "afb-apis.h" -static void aws_on_close(struct afb_ws_json *ws, uint16_t code, char *text, size_t size); +static void aws_on_hangup(struct afb_ws_json *ws); static void aws_on_text(struct afb_ws_json *ws, char *text, size_t size); static struct afb_ws_itf aws_itf = { - .on_close = (void*)aws_on_close, - .on_text = (void*)aws_on_text, - .on_binary = NULL, + .on_hangup = (void*)aws_on_hangup, + .on_text = (void*)aws_on_text }; struct afb_wsreq; @@ -52,10 +52,9 @@ struct afb_ws_json struct afb_ws *ws; }; - 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 }; @@ -85,13 +84,13 @@ 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; error5: - /* TODO */ + afb_ws_destroy(result->ws); error4: json_tokener_free(result->tokener); error3: @@ -103,10 +102,14 @@ error: return NULL; } -static void aws_on_close(struct afb_ws_json *ws, uint16_t code, char *text, size_t size) +static void aws_on_hangup(struct afb_ws_json *ws) { - /* do nothing but free the text */ - free(text); + 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) + ws->cleanup(ws->cleanup_closure); + free(ws); } #define CALL 2 @@ -139,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); @@ -157,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) @@ -280,14 +282,6 @@ static int aws_wsreq_parse(struct afb_wsreq *r, char *text, size_t size) /* done */ r->text = text; r->size = size; -fprintf(stderr, "\n\nONTEXT([%d, %.*s, %.*s/%.*s, %.*s, %.*s])\n\n", - r->code, - (int)r->idlen, r->id, - (int)r->apilen, r->api, - (int)r->verblen, r->verb, - (int)r->objlen, r->obj, - (int)r->toklen, r->tok -); return 1; bad_header: @@ -322,7 +316,7 @@ bad_header: free(wsreq); alloc_error: free(text); - afb_ws_close(ws->ws, 1008); + afb_ws_close(ws->ws, 1008, NULL); return; } @@ -389,35 +383,30 @@ static void wsreq_session_close(struct afb_wsreq *wsreq) ctxClientClose(context); } - -static void wsreq_reply(struct afb_wsreq *wsreq, int retcode, const char *status, const char *info, json_object *resp) +static void aws_emit(struct afb_ws_json *aws, int code, const char *id, size_t idlen, struct json_object *data) { - json_object *root, *request, *reply; - const char *message; - - /* builds the answering structure */ - root = json_object_new_object(); - json_object_object_add(root, "jtype", json_object_new_string("afb-reply")); - request = json_object_new_object(); - json_object_object_add(root, "request", request); - json_object_object_add(request, "status", json_object_new_string(status)); - if (info) - json_object_object_add(request, "info", json_object_new_string(info)); - if (resp) - json_object_object_add(root, "response", resp); - - /* make the reply */ - reply = json_object_new_array(); - json_object_array_add(reply, json_object_new_int(retcode)); - json_object_array_add(reply, json_object_new_string_len(wsreq->id, (int)wsreq->idlen)); - json_object_array_add(reply, root); - json_object_array_add(reply, json_object_new_string(wsreq->aws->context->token)); + json_object *msg; + const char *token; + const char *txt; + + /* pack the message */ + msg = json_object_new_array(); + json_object_array_add(msg, json_object_new_int(code)); + json_object_array_add(msg, json_object_new_string_len(id, (int)idlen)); + json_object_array_add(msg, data); + token = aws->context->token; + if (token) + json_object_array_add(msg, json_object_new_string(token)); /* emits the reply */ - message = json_object_to_json_string(reply); - afb_ws_text(wsreq->aws->ws, message, strlen(message)); - json_object_put(reply); + txt = json_object_to_json_string(msg); + afb_ws_text(aws->ws, txt, strlen(txt)); + json_object_put(msg); +} +static void wsreq_reply(struct afb_wsreq *wsreq, int retcode, const char *status, const char *info, json_object *resp) +{ + aws_emit(wsreq->aws, retcode, wsreq->id, wsreq->idlen, afb_msg_json_reply(status, info, resp, NULL, NULL)); /* TODO eliminates the wsreq */ } @@ -437,33 +426,13 @@ 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); } static void aws_send_event(struct afb_ws_json *aws, const char *event, struct json_object *object) { - json_object *root, *reply; - const char *message; - - /* builds the answering structure */ - root = json_object_new_object(); - json_object_object_add(root, "jtype", json_object_new_string("afb-event")); - json_object_object_add(root, "event", json_object_new_string(event)); - if (object) - json_object_object_add(root, "data", object); - - /* make the reply */ - reply = json_object_new_array(); - json_object_array_add(reply, json_object_new_int(EVENT)); - json_object_array_add(reply, json_object_new_string(event)); - json_object_array_add(reply, root); - json_object_array_add(reply, json_object_new_string(aws->context->token)); - - /* emits the reply */ - message = json_object_to_json_string(reply); - afb_ws_text(aws->ws, message, strlen(message)); - json_object_put(reply); + aws_emit(aws, EVENT, event, strlen(event), afb_msg_json_event(event, object)); }