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

diff --git a/src/afb-hreq.h b/src/afb-hreq.h
index cf236380..b511f230 100644
--- a/src/afb-hreq.h
+++ b/src/afb-hreq.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 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");
@@ -15,25 +15,40 @@
  * limitations under the License.
  */
 
-struct AFB_session;
-struct AFB_clientCtx;
+#pragma once
+
+#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 {
-	struct AFB_session *session;
+	struct afb_xreq xreq;
+	struct afb_hsrv *hsrv;
+	const char *cacheTimeout;
 	struct MHD_Connection *connection;
-	enum afb_method method;
+	int method;
+	int reqid;
+	int scanned;
+	int suspended;
+	int replied;
 	const char *version;
+	const char *lang;
 	const char *url;
 	size_t lenurl;
 	const char *tail;
 	size_t lentail;
 	struct MHD_PostProcessor *postform;
-	struct AFB_clientCtx *context;
 	struct hreq_data *data;
+	struct json_object *json;
+	struct json_tokener *tokener;
 };
 
-extern void afb_hreq_free(struct afb_hreq *request);
-
 extern int afb_hreq_unprefix(struct afb_hreq *request, const char *prefix, size_t length);
 
 extern int afb_hreq_valid_tail(struct afb_hreq *request);
@@ -44,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);
 
@@ -52,14 +73,28 @@ extern const char *afb_hreq_get_header(struct afb_hreq *hreq, const char *name);
 
 extern const char *afb_hreq_get_argument(struct afb_hreq *hreq, const char *name);
 
-extern int afb_hreq_is_argument_a_file(struct afb_hreq *hreq, const char *name);
-
 extern int afb_hreq_post_add_file(struct afb_hreq *hreq, const char *name, const char *file, const char *data, size_t size);
 
 extern int afb_hreq_post_add(struct afb_hreq *hreq, const char *name, const char *data, size_t size);
 
-extern void afb_hreq_post_end(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);
+
+extern int afb_hreq_init_cookie(int port, const char *path, int maxage);
+
+extern void afb_hreq_reply_static(struct afb_hreq *hreq, unsigned status, size_t size, const char *buffer, ...);
+
+extern void afb_hreq_reply_copy(struct afb_hreq *hreq, unsigned status, size_t size, const char *buffer, ...);
+
+extern void afb_hreq_reply_free(struct afb_hreq *hreq, unsigned status, size_t size, char *buffer, ...);
+
+extern void afb_hreq_reply_empty(struct afb_hreq *hreq, unsigned status, ...);
+
+extern int afb_hreq_init_download_path(const char *directory);
+
+extern void afb_hreq_addref(struct afb_hreq *hreq);
 
-extern struct afb_req afb_hreq_to_req(struct afb_hreq *hreq);
+extern void afb_hreq_unref(struct afb_hreq *hreq);
 
-extern struct AFB_clientCtx *afb_hreq_context(struct afb_hreq *hreq);
+extern struct afb_hreq *afb_hreq_create();