Update date of copyright notices

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

diff --git a/src/afb-hswitch.c b/src/afb-hswitch.c
index 909480a..77c67df 100644 (file)
--- a/src/afb-hswitch.c
+++ b/src/afb-hswitch.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016, 2017 "IoT.bzh"
+ * Copyright (C) 2015-2018 "IoT.bzh"
  * Author "Fulup Ar Foll"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
@@ -23,10 +23,9 @@
 
 #include <microhttpd.h>
 
-#include <afb/afb-req-itf.h>
 #include "afb-context.h"
 #include "afb-hreq.h"
-#include "afb-apis.h"
+#include "afb-apiset.h"
 #include "afb-session.h"
 #include "afb-websock.h"
 
@@ -34,6 +33,7 @@ int afb_hswitch_apis(struct afb_hreq *hreq, void *data)
 {
        const char *api, *verb;
        size_t lenapi, lenverb;
+       struct afb_apiset *apiset = data;
 
        api = &hreq->tail[strspn(hreq->tail, "/")];
        lenapi = strcspn(api, "/");
@@ -44,10 +44,7 @@ int afb_hswitch_apis(struct afb_hreq *hreq, void *data)
        if (!(*api && *verb && lenapi && lenverb))
                return 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, hreq->api, hreq->verb);
+       afb_hreq_call(hreq, apiset, api, lenapi, verb, lenverb);
        return 1;
 }
 
@@ -79,6 +76,8 @@ int afb_hswitch_one_page_api_redirect(struct afb_hreq *hreq, void *data)
 
 int afb_hswitch_websocket_switch(struct afb_hreq *hreq, void *data)
 {
+       struct afb_apiset *apiset = data;
+
        if (hreq->lentail != 0)
                return 0;
 
@@ -87,12 +86,12 @@ 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;
        }
 
-       return afb_websock_check_upgrade(hreq);
+       return afb_websock_check_upgrade(hreq, apiset);
 }