-/*
- * Copyright (C) 2015 "IoT.bzh"
+/*
+ * Copyright (C) 2015, 2016, 2017 "IoT.bzh"
* Author "Fulup Ar Foll"
* Author José Bollo <jose.bollo@iot.bzh>
*
#include <stdlib.h>
#include <string.h>
-#include "afb-req-itf.h"
+#include <microhttpd.h>
+
+#include "afb-context.h"
#include "afb-hreq.h"
-#include "afb-apis.h"
-#include "session.h"
+#include "afb-apiset.h"
+#include "afb-session.h"
#include "afb-websock.h"
int afb_hswitch_apis(struct afb_hreq *hreq, void *data)
{
const char *api, *verb;
size_t lenapi, lenverb;
- struct AFB_clientCtx *context;
+ struct afb_apiset *apiset = data;
api = &hreq->tail[strspn(hreq->tail, "/")];
lenapi = strcspn(api, "/");
if (!(*api && *verb && lenapi && lenverb))
return 0;
- context = afb_hreq_context(hreq);
- afb_apis_call(afb_hreq_to_req(hreq), context, api, lenapi, verb, lenverb);
+ afb_hreq_call(hreq, apiset, api, lenapi, verb, lenverb);
return 1;
}
url[plen++] = '#';
url[plen++] = '!';
memcpy(&url[plen], &hreq->tail[1], hreq->lentail);
- return afb_hreq_redirect_to(hreq, url);
+ afb_hreq_redirect_to(hreq, url, 1);
+ return 1;
}
int afb_hswitch_websocket_switch(struct afb_hreq *hreq, void *data)
{
- int later;
+ struct afb_apiset *apiset = data;
- afb_hreq_context(hreq);
- if (hreq->lentail != 0 || !afb_websock_check(hreq, &later))
+ if (hreq->lentail != 0)
return 0;
- if (!later) {
- struct afb_websock *ws = afb_websock_create(hreq);
- if (ws != NULL)
- hreq->upgrade = 1;
+ if (afb_hreq_init_context(hreq) < 0) {
+ afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR);
+ return 1;
}
- return 1;
-}
+ if (!hreq->xreq.context.validated) {
+ afb_hreq_reply_error(hreq, MHD_HTTP_UNAUTHORIZED);
+ return 1;
+ }
+
+ return afb_websock_check_upgrade(hreq, apiset);
+}