Provide API and VERB name of requests

[src/app-framework-binder.git] / src / afb-ws-json1.c

diff --git a/src/afb-ws-json1.c b/src/afb-ws-json1.c
index 45e1cdb..6215a68 100644 (file)
--- a/src/afb-ws-json1.c
+++ b/src/afb-ws-json1.c
@@ -25,8 +25,6 @@
 
 #include <json-c/json.h>
 
-#include <afb/afb-event-itf.h>
-
 #include "afb-wsj1.h"
 #include "afb-ws-json1.h"
 #include "afb-common.h"
@@ -50,7 +48,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, int status, json_object *obj);
 
 /* declaration of websocket structure */
 struct afb_ws_json1
@@ -143,15 +141,15 @@ error:
        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)
@@ -165,7 +163,7 @@ static void aws_unref(struct afb_ws_json1 *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)
@@ -195,10 +193,10 @@ 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.api = api;
+       wsreq->xreq.request.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 */
@@ -225,16 +223,16 @@ 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, int status, json_object *obj)
 {
        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)(
+       rc = (status < 0 ? afb_wsj1_reply_error_j : afb_wsj1_reply_ok_j)(
                        wsreq->msgj1, obj, afb_context_sent_token(&wsreq->xreq.context));
        if (rc)
                ERROR("Can't send reply: %m");