X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hreq.h;h=f07f2fa60fcba6b8270e08d7f37c1e9e5baa2f0b;hb=a758d774aa5dacc07d2840f1b7ccef793863389f;hp=fd2a2a3d7bb65d5f41d2f47e388bfc056cb7e6c4;hpb=e18643b7ac16dd5663753fb6ddbc49c7deb06e78;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-hreq.h b/src/afb-hreq.h
index fd2a2a3d..f07f2fa6 100644
--- a/src/afb-hreq.h
+++ b/src/afb-hreq.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 IoT.bzh
+ * Copyright (C) 2016, 2017 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,27 +15,42 @@
  * limitations under the License.
  */
 
+#pragma once
 
+struct afb_session;
+struct json_object;
+struct hreq_data;
+struct afb_hsrv;
 struct afb_req_itf;
+struct locale_search;
 
-
-struct afb_hreq_post {
-	const char *upload_data;
-	size_t *upload_data_size;
-};
+extern const struct afb_req_itf afb_hreq_req_itf;
 
 struct afb_hreq {
-	AFB_session *session;
+	/*
+	 * 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_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 afb_hreq **recorder;
-	int (*post_handler) (struct afb_hreq *, struct afb_hreq_post *);
-	int (*post_completed) (struct afb_hreq *, struct afb_hreq_post *);
-	void *post_data;
+	struct MHD_PostProcessor *postform;
+	struct hreq_data *data;
+	struct json_object *json;
+	int upgrade;
 };
 
 extern int afb_hreq_unprefix(struct afb_hreq *request, const char *prefix, size_t length);
@@ -48,6 +63,41 @@ 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);
+
+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_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 struct afb_req afb_hreq_to_req(struct afb_hreq *hreq);
+
+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 void afb_hreq_unref(struct afb_hreq *hreq);
 
-extern struct afb_req_itf afb_hreq_itf;