X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-ws-json1.c;h=95167b5fe58e87fa0c4a117c53e5c9aafbaab237;hb=refs%2Fheads%2Fsandbox%2FDDTLK%2Fpakage;hp=4e405715d2d4ea1a39a3063cadf2fa973061b0b2;hpb=a138fda9841c46e28de93e32aee62956e26556b1;p=src%2Fapp-framework-binder.git diff --git a/src/afb-ws-json1.c b/src/afb-ws-json1.c index 4e405715..95167b5f 100644 --- a/src/afb-ws-json1.c +++ b/src/afb-ws-json1.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 "IoT.bzh" + * Copyright (C) 2016, 2017, 2018 "IoT.bzh" * Author: José Bollo * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -25,20 +25,18 @@ #include -#include - #include "afb-wsj1.h" #include "afb-ws-json1.h" -#include "afb-common.h" +#include "afb-systemd.h" #include "afb-msg-json.h" #include "afb-session.h" #include "afb-cred.h" -#include "afb-apis.h" +#include "afb-apiset.h" #include "afb-xreq.h" #include "afb-context.h" #include "afb-evt.h" -#include "afb-subcall.h" #include "verbose.h" +#include "fdev.h" /* predeclaration of structures */ struct afb_ws_json1; @@ -51,7 +49,7 @@ static void aws_on_event(struct afb_ws_json1 *ws, const char *event, int eventid /* predeclaration of wsreq callbacks */ static void wsreq_destroy(struct afb_xreq *xreq); -static void wsreq_reply(struct afb_xreq *xreq, int iserror, json_object *obj); +static void wsreq_reply(struct afb_xreq *xreq, struct json_object *object, const char *error, const char *info); /* declaration of websocket structure */ struct afb_ws_json1 @@ -63,6 +61,7 @@ struct afb_ws_json1 struct afb_evt_listener *listener; struct afb_wsj1 *wsj1; struct afb_cred *cred; + struct afb_apiset *apiset; int new_session; }; @@ -101,11 +100,11 @@ static const struct afb_evt_itf evt_itf = { **************************************************************** ***************************************************************/ -struct afb_ws_json1 *afb_ws_json1_create(int fd, struct afb_context *context, void (*cleanup)(void*), void *cleanup_closure) +struct afb_ws_json1 *afb_ws_json1_create(struct fdev *fdev, struct afb_apiset *apiset, struct afb_context *context, void (*cleanup)(void*), void *cleanup_closure) { struct afb_ws_json1 *result; - assert(fd >= 0); + assert(fdev); assert(context != NULL); result = malloc(sizeof * result); @@ -120,7 +119,7 @@ struct afb_ws_json1 *afb_ws_json1_create(int fd, struct afb_context *context, vo if (result->session == NULL) goto error2; - result->wsj1 = afb_wsj1_create(afb_common_get_event_loop(), fd, &wsj1_itf, result); + result->wsj1 = afb_wsj1_create(fdev, &wsj1_itf, result); if (result->wsj1 == NULL) goto error3; @@ -128,7 +127,8 @@ struct afb_ws_json1 *afb_ws_json1_create(int fd, struct afb_context *context, vo if (result->listener == NULL) goto error4; - result->cred = afb_cred_create_for_socket(fd); + result->cred = afb_cred_create_for_socket(fdev_fd(fdev)); + result->apiset = afb_apiset_addref(apiset); return result; error4: @@ -138,32 +138,33 @@ error3: error2: free(result); error: - close(fd); + fdev_unref(fdev); return NULL; } -static struct afb_ws_json1 *aws_addref(struct afb_ws_json1 *ws) +struct afb_ws_json1 *afb_ws_json1_addref(struct afb_ws_json1 *ws) { - ws->refcount++; + __atomic_add_fetch(&ws->refcount, 1, __ATOMIC_RELAXED); return ws; } -static void aws_unref(struct afb_ws_json1 *ws) +void afb_ws_json1_unref(struct afb_ws_json1 *ws) { - if (--ws->refcount == 0) { + if (!__atomic_sub_fetch(&ws->refcount, 1, __ATOMIC_RELAXED)) { afb_evt_listener_unref(ws->listener); afb_wsj1_unref(ws->wsj1); if (ws->cleanup != NULL) ws->cleanup(ws->cleanup_closure); afb_session_unref(ws->session); afb_cred_unref(ws->cred); + afb_apiset_unref(ws->apiset); free(ws); } } static void aws_on_hangup(struct afb_ws_json1 *ws, struct afb_wsj1 *wsj1) { - aws_unref(ws); + afb_ws_json1_unref(ws); } static void aws_on_call(struct afb_ws_json1 *ws, const char *api, const char *verb, struct afb_wsj1_msg *msg) @@ -193,15 +194,14 @@ static void aws_on_call(struct afb_ws_json1 *ws, const char *api, const char *ve afb_wsj1_msg_addref(msg); wsreq->msgj1 = msg; wsreq->xreq.cred = afb_cred_addref(ws->cred); - wsreq->xreq.api = api; - wsreq->xreq.verb = verb; + wsreq->xreq.request.called_api = api; + wsreq->xreq.request.called_verb = verb; wsreq->xreq.json = afb_wsj1_msg_object_j(wsreq->msgj1); - wsreq->aws = aws_addref(ws); + wsreq->aws = afb_ws_json1_addref(ws); wsreq->xreq.listener = wsreq->aws->listener; /* emits the call */ - afb_apis_call(&wsreq->xreq); - afb_xreq_unref(&wsreq->xreq); + afb_xreq_process(&wsreq->xreq, ws->apiset); } static void aws_on_event(struct afb_ws_json1 *aws, const char *event, int eventid, struct json_object *object) @@ -224,17 +224,21 @@ static void wsreq_destroy(struct afb_xreq *xreq) afb_context_disconnect(&wsreq->xreq.context); afb_wsj1_msg_unref(wsreq->msgj1); afb_cred_unref(wsreq->xreq.cred); - aws_unref(wsreq->aws); + afb_ws_json1_unref(wsreq->aws); free(wsreq); } -static void wsreq_reply(struct afb_xreq *xreq, int iserror, json_object *obj) +static void wsreq_reply(struct afb_xreq *xreq, struct json_object *object, const char *error, const char *info) { struct afb_wsreq *wsreq = CONTAINER_OF_XREQ(struct afb_wsreq, xreq); int rc; + struct json_object *reply; + + /* create the reply */ + reply = afb_msg_json_reply(object, error, info, &xreq->context); - rc = (iserror ? afb_wsj1_reply_error_j : afb_wsj1_reply_ok_j)( - wsreq->msgj1, obj, afb_context_sent_token(&wsreq->xreq.context)); + rc = (error ? afb_wsj1_reply_error_j : afb_wsj1_reply_ok_j)( + wsreq->msgj1, reply, afb_context_sent_token(&wsreq->xreq.context)); if (rc) ERROR("Can't send reply: %m"); }