X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hswitch.c;h=0eae18f7effd6b72fbf11a0df7d436538fcead89;hb=0b838a6101edc810098ee0645d3bfd966096ae07;hp=fea30c595bb0d913707e2720440bef5fbe295b67;hpb=a4487d8a46d3e4400bf73ce817fa1a34cde31a6f;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-hswitch.c b/src/afb-hswitch.c
index fea30c59..0eae18f7 100644
--- a/src/afb-hswitch.c
+++ b/src/afb-hswitch.c
@@ -1,5 +1,5 @@
-/* 
- * Copyright (C) 2015, 2016 "IoT.bzh"
+/*
+ * Copyright (C) 2015, 2016, 2017 "IoT.bzh"
  * Author "Fulup Ar Foll"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
@@ -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_call(&hreq->xreq);
 	return 1;
 }
 
@@ -73,7 +73,8 @@ 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, 1);
+	afb_hreq_redirect_to(hreq, url, 1);
+	return 1;
 }
 
 int afb_hswitch_websocket_switch(struct afb_hreq *hreq, void *data)
@@ -86,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;
 	}