X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hreq.h;h=b511f230fb6abee241a3636a87b89cfdf7edca1c;hb=65353dce81a629e042800bb7b86fcd869a76727e;hp=8e12b62d54351501a0a1726db7ff8712de72282a;hpb=ece754d98ecf9f5b81f5a6e002ee7ea2289a75bb;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-hreq.h b/src/afb-hreq.h
index 8e12b62d..b511f230 100644
--- a/src/afb-hreq.h
+++ b/src/afb-hreq.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 "IoT.bzh"
+ * Copyright (C) 2015-2020 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,18 +17,18 @@
 
 #pragma once
 
-struct AFB_clientCtx;
+#include "afb-xreq.h"
+
 struct json_object;
+struct json_tokener;
+
+struct afb_session;
 struct hreq_data;
 struct afb_hsrv;
+struct locale_search;
 
 struct afb_hreq {
-	/*
-	 * CAUTION: 'context' field should be the first because there
-	 * is an implicit convertion to struct afb_context
-	 */
-	struct afb_context context;
-	int refcount;
+	struct afb_xreq xreq;
 	struct afb_hsrv *hsrv;
 	const char *cacheTimeout;
 	struct MHD_Connection *connection;
@@ -38,6 +38,7 @@ struct afb_hreq {
 	int suspended;
 	int replied;
 	const char *version;
+	const char *lang;
 	const char *url;
 	size_t lenurl;
 	const char *tail;
@@ -45,7 +46,7 @@ struct afb_hreq {
 	struct MHD_PostProcessor *postform;
 	struct hreq_data *data;
 	struct json_object *json;
-	int upgrade;
+	struct json_tokener *tokener;
 };
 
 extern int afb_hreq_unprefix(struct afb_hreq *request, const char *prefix, size_t length);
@@ -58,7 +59,13 @@ extern int afb_hreq_reply_file_if_exist(struct afb_hreq *request, int dirfd, con
 
 extern int afb_hreq_reply_file(struct afb_hreq *request, int dirfd, const char *filename);
 
-extern int afb_hreq_redirect_to(struct afb_hreq *request, const char *url);
+extern int afb_hreq_reply_locale_file_if_exist(struct afb_hreq *hreq, struct locale_search *search, const char *filename);
+
+extern int afb_hreq_reply_locale_file(struct afb_hreq *hreq, struct locale_search *search, const char *filename);
+
+extern void afb_hreq_redirect_to(struct afb_hreq *request, const char *url, int add_query_part);
+
+extern int afb_hreq_redirect_to_ending_slash_if_needed(struct afb_hreq *hreq);
 
 extern const char *afb_hreq_get_cookie(struct afb_hreq *hreq, const char *name);
 
@@ -70,7 +77,7 @@ extern int afb_hreq_post_add_file(struct afb_hreq *hreq, const char *name, const
 
 extern int afb_hreq_post_add(struct afb_hreq *hreq, const char *name, const char *data, size_t size);
 
-extern struct afb_req afb_hreq_to_req(struct afb_hreq *hreq);
+extern void afb_hreq_call(struct afb_hreq *hreq, struct afb_apiset *apiset, const char *api, size_t lenapi, const char *verb, size_t lenverb);
 
 extern int afb_hreq_init_context(struct afb_hreq *hreq);
 
@@ -90,3 +97,4 @@ extern void afb_hreq_addref(struct afb_hreq *hreq);
 
 extern void afb_hreq_unref(struct afb_hreq *hreq);
 
+extern struct afb_hreq *afb_hreq_create();