Optimisation of xreq

[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 29078e2..60a0a80 100644 (file)
--- a/src/afb-ws-json1.c
+++ b/src/afb-ws-json1.c
@@ -32,6 +32,7 @@
 #include "afb-common.h"
 #include "afb-msg-json.h"
 #include "afb-session.h"
+#include "afb-cred.h"
 #include "afb-apis.h"
 #include "afb-xreq.h"
 #include "afb-context.h"
@@ -49,9 +50,8 @@ static void aws_on_call(struct afb_ws_json1 *ws, const char *api, const char *ve
 static void aws_on_event(struct afb_ws_json1 *ws, const char *event, int eventid, 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, int iserror, json_object *obj);
 
 /* declaration of websocket structure */
 struct afb_ws_json1
@@ -62,6 +62,7 @@ struct afb_ws_json1
        struct afb_session *session;
        struct afb_evt_listener *listener;
        struct afb_wsj1 *wsj1;
+       struct afb_cred *cred;
        int new_session;
 };
 
@@ -82,9 +83,8 @@ static struct afb_wsj1_itf wsj1_itf = {
 
 /* 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 */
@@ -128,6 +128,7 @@ 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);
        return result;
 
 error4:
@@ -155,6 +156,7 @@ static void aws_unref(struct afb_ws_json1 *ws)
                if (ws->cleanup != NULL)
                        ws->cleanup(ws->cleanup_closure);
                afb_session_unref(ws->session);
+               afb_cred_unref(ws->cred);
                free(ws);
        }
 }
@@ -178,6 +180,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,11 +192,9 @@ 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->xreq.json = afb_wsj1_msg_object_j(wsreq->msgj1);
        wsreq->aws = aws_addref(ws);
        wsreq->xreq.listener = wsreq->aws->listener;
 
@@ -215,25 +216,24 @@ 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);
        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, int iserror, 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)(
                        wsreq->msgj1, obj, 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");
 }