/*
- * Copyright (C) 2015, 2016, 2017 "IoT.bzh"
+ * Copyright (C) 2015-2018 "IoT.bzh"
* Author "Fulup Ar Foll"
* Author José Bollo <jose.bollo@iot.bzh>
*
#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"
int afb_hswitch_apis(struct afb_hreq *hreq, void *data)
{
- const char *api, *verb;
+ const char *api, *verb, *i;
size_t lenapi, lenverb;
-
- api = &hreq->tail[strspn(hreq->tail, "/")];
- lenapi = strcspn(api, "/");
- verb = &api[lenapi];
- verb = &verb[strspn(verb, "/")];
- lenverb = strcspn(verb, "/");
-
- if (!(*api && *verb && lenapi && lenverb))
- return 0;
-
- if (afb_hreq_init_context(hreq) < 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);
+ struct afb_apiset *apiset = data;
+
+ /* api is the first hierarchical item */
+ i = hreq->tail;
+ while (*i == '/')
+ i++;
+ if (!*i)
+ return 0; /* no API */
+ api = i;
+
+ /* search end of the api and get its length */
+ while (*++i && *i != '/');
+ lenapi = (size_t)(i - api);
+
+ /* search the verb */
+ while (*i == '/')
+ i++;
+ if (!*i)
+ return 0; /* no verb */
+ verb = i;
+
+ /* get the verb length */
+ while (*++i);
+ lenverb = (size_t)(i - verb);
+
+ /* found api + verb so process the call */
+ afb_hreq_call(hreq, apiset, api, lenapi, verb, lenverb);
return 1;
}
int afb_hswitch_websocket_switch(struct afb_hreq *hreq, void *data)
{
+ struct afb_apiset *apiset = data;
+
if (hreq->lentail != 0)
return 0;
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);
}