Factorize common code for handling requests

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

diff --git a/src/afb-hswitch.c b/src/afb-hswitch.c
index 90dc2ff..eab5b9b 100644 (file)
--- a/src/afb-hswitch.c
+++ b/src/afb-hswitch.c
@@ -27,7 +27,7 @@
 #include "afb-context.h"
 #include "afb-hreq.h"
 #include "afb-apis.h"
-#include "session.h"
+#include "afb-session.h"
 #include "afb-websock.h"
 
 int afb_hswitch_apis(struct afb_hreq *hreq, void *data)
@@ -44,10 +44,10 @@ int afb_hswitch_apis(struct afb_hreq *hreq, void *data)
        if (!(*api && *verb && lenapi && lenverb))
                return 0;
 
-       if (afb_hreq_init_context(hreq) < 0)
+       if (afb_hreq_init_req_call(hreq, api, lenapi, verb, lenverb) < 0)
                afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR);
        else
-               afb_apis_call(afb_hreq_to_req(hreq), &hreq->context, api, lenapi, verb, lenverb);
+               afb_apis_xcall(&hreq->xreq);
        return 1;
 }
 
@@ -87,7 +87,7 @@ int afb_hswitch_websocket_switch(struct afb_hreq *hreq, void *data)
                return 1;
        }
 
-       if (!hreq->context.validated) {
+       if (!hreq->xreq.context.validated) {
                afb_hreq_reply_error(hreq, MHD_HTTP_UNAUTHORIZED);
                return 1;
        }