X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-ws-json1.c;h=9d6bfc3ccd897d3a2e68cc45802d48e56a945137;hb=5b5968815dc672467f40ed6b49f05a590bdb8b4d;hp=29078e26193ad06cfd66b18265e5c2af370159df;hpb=0b838a6101edc810098ee0645d3bfd966096ae07;p=src%2Fapp-framework-binder.git diff --git a/src/afb-ws-json1.c b/src/afb-ws-json1.c index 29078e26..9d6bfc3c 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-2019 "IoT.bzh" * Author: José Bollo * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -25,33 +25,33 @@ #include -#include - #include "afb-wsj1.h" #include "afb-ws-json1.h" -#include "afb-common.h" #include "afb-msg-json.h" #include "afb-session.h" -#include "afb-apis.h" +#include "afb-cred.h" +#include "afb-apiset.h" #include "afb-xreq.h" #include "afb-context.h" #include "afb-evt.h" -#include "afb-subcall.h" + +#include "systemd.h" #include "verbose.h" +#include "fdev.h" /* predeclaration of structures */ struct afb_ws_json1; struct afb_wsreq; /* predeclaration of websocket callbacks */ -static void aws_on_hangup(struct afb_ws_json1 *ws, struct afb_wsj1 *wsj1); -static void aws_on_call(struct afb_ws_json1 *ws, const char *api, const char *verb, struct afb_wsj1_msg *msg); -static void aws_on_event(struct afb_ws_json1 *ws, const char *event, int eventid, struct json_object *object); +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); /* predeclaration of wsreq callbacks */ -static void wsreq_destroy(struct afb_wsreq *wsreq); -static struct json_object *wsreq_json(struct afb_wsreq *wsreq); -static void wsreq_reply(struct afb_wsreq *wsreq, int iserror, json_object *obj); +static void wsreq_destroy(struct afb_xreq *xreq); +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 @@ -62,6 +62,8 @@ struct afb_ws_json1 struct afb_session *session; struct afb_evt_listener *listener; struct afb_wsj1 *wsj1; + struct afb_cred *cred; + struct afb_apiset *apiset; int new_session; }; @@ -76,21 +78,20 @@ struct afb_wsreq /* interface for afb_ws_json1 / afb_wsj1 */ static struct afb_wsj1_itf wsj1_itf = { - .on_hangup = (void*)aws_on_hangup, - .on_call = (void*)aws_on_call + .on_hangup = aws_on_hangup_cb, + .on_call = aws_on_call_cb }; /* interface for xreq */ const struct afb_xreq_query_itf afb_ws_json1_xreq_itf = { - .json = (void*)wsreq_json, - .reply = (void*)wsreq_reply, - .unref = (void*)wsreq_destroy + .reply = wsreq_reply, + .unref = wsreq_destroy }; /* the interface for events */ static const struct afb_evt_itf evt_itf = { - .broadcast = (void*)aws_on_event, - .push = (void*)aws_on_event + .broadcast = aws_on_broadcast_cb, + .push = aws_on_push_cb }; /*************************************************************** @@ -101,11 +102,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 +121,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,6 +129,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(fdev_fd(fdev)); + result->apiset = afb_apiset_addref(apiset); return result; error4: @@ -137,35 +140,39 @@ 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) +static void aws_on_hangup_cb(void *closure, struct afb_wsj1 *wsj1) { - aws_unref(ws); + struct afb_ws_json1 *ws = closure; + 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) +static void aws_on_call_cb(void *closure, const char *api, const char *verb, struct afb_wsj1_msg *msg) { + struct afb_ws_json1 *ws = closure; struct afb_wsreq *wsreq; DEBUG("received websocket request for %s/%s: %s", api, verb, afb_wsj1_msg_object_s(msg)); @@ -178,6 +185,7 @@ static void aws_on_call(struct afb_ws_json1 *ws, const char *api, const char *ve } /* init the context */ + afb_xreq_init(&wsreq->xreq, &afb_ws_json1_xreq_itf); afb_context_init(&wsreq->xreq.context, ws->session, afb_wsj1_msg_token(msg)); if (!wsreq->xreq.context.invalidated) wsreq->xreq.context.validated = 1; @@ -189,21 +197,25 @@ static void aws_on_call(struct afb_ws_json1 *ws, const char *api, const char *ve /* fill and record the request */ afb_wsj1_msg_addref(msg); wsreq->msgj1 = msg; - wsreq->xreq.refcount = 1; - wsreq->xreq.query = wsreq; - wsreq->xreq.queryitf = &afb_ws_json1_xreq_itf; - wsreq->xreq.api = api; - wsreq->xreq.verb = verb; - wsreq->aws = aws_addref(ws); + wsreq->xreq.cred = afb_cred_addref(ws->cred); + wsreq->xreq.request.called_api = api; + wsreq->xreq.request.called_verb = verb; + wsreq->xreq.json = afb_wsj1_msg_object_j(wsreq->msgj1); + 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_push_cb(void *closure, const char *event, int eventid, struct json_object *object) +{ + aws_on_broadcast_cb(closure, event, object); } -static void aws_on_event(struct afb_ws_json1 *aws, const char *event, int eventid, struct json_object *object) +static void aws_on_broadcast_cb(void *closure, const char *event, struct json_object *object) { + struct afb_ws_json1 *aws = closure; afb_wsj1_send_event_j(aws->wsj1, event, afb_msg_json_event(event, object)); } @@ -215,25 +227,29 @@ static void aws_on_event(struct afb_ws_json1 *aws, const char *event, int eventi **************************************************************** ***************************************************************/ -static void wsreq_destroy(struct afb_wsreq *wsreq) +static void wsreq_destroy(struct afb_xreq *xreq) { + struct afb_wsreq *wsreq = CONTAINER_OF_XREQ(struct afb_wsreq, xreq); + afb_context_disconnect(&wsreq->xreq.context); afb_wsj1_msg_unref(wsreq->msgj1); - aws_unref(wsreq->aws); + afb_cred_unref(wsreq->xreq.cred); + afb_ws_json1_unref(wsreq->aws); free(wsreq); } -static struct json_object *wsreq_json(struct afb_wsreq *wsreq) -{ - return afb_wsj1_msg_object_j(wsreq->msgj1); -} - -static void wsreq_reply(struct afb_wsreq *wsreq, 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; - rc = (iserror ? afb_wsj1_reply_error_j : afb_wsj1_reply_ok_j)( - wsreq->msgj1, obj, afb_context_sent_token(&wsreq->xreq.context)); + struct json_object *reply; + + /* create the reply */ + reply = afb_msg_json_reply(object, error, info, &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 (was %s)", json_object_get_string(obj)); + ERROR("Can't send reply: %m"); }