X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hswitch.c;h=9e55f29b6809fd6db49cd9c70a99d0613d5dd3ce;hb=65353dce81a629e042800bb7b86fcd869a76727e;hp=3fcd77de601d7d1db68ac8a2a4eedb5fcb8fcbc4;hpb=83ce3b29a598141f8f28afde655beb07ec78c312;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-hswitch.c b/src/afb-hswitch.c
index 3fcd77de..9e55f29b 100644
--- a/src/afb-hswitch.c
+++ b/src/afb-hswitch.c
@@ -1,5 +1,5 @@
-/* 
- * Copyright (C) 2015 "IoT.bzh"
+/*
+ * Copyright (C) 2015-2020 "IoT.bzh"
  * Author "Fulup Ar Foll"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
@@ -21,29 +21,45 @@
 #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;
+	const char *api, *verb, *i;
 	size_t lenapi, lenverb;
-	struct AFB_clientCtx *context;
+	struct afb_apiset *apiset = data;
 
-	api = &hreq->tail[strspn(hreq->tail, "/")];
-	lenapi = strcspn(api, "/");
-	verb = &api[lenapi];
-	verb = &verb[strspn(verb, "/")];
-	lenverb = strcspn(verb, "/");
+	/* api is the first hierarchical item */
+	i = hreq->tail;
+	while (*i == '/')
+		i++;
+	if (!*i)
+		return 0; /* no API */
+	api = i;
 
-	if (!(*api && *verb && lenapi && lenverb))
-		return 0;
+	/* 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);
 
-	context = afb_hreq_context(hreq);
-	afb_apis_call(afb_hreq_to_req(hreq), context, api, lenapi, verb, lenverb);
+	/* found api + verb so process the call */
+	afb_hreq_call(hreq, apiset, api, lenapi, verb, lenverb);
 	return 1;
 }
 
@@ -69,24 +85,23 @@ int afb_hswitch_one_page_api_redirect(struct afb_hreq *hreq, void *data)
 	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;
-}
 
+	return afb_websock_check_upgrade(hreq, apiset);
+}