X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hsrv.c;h=4577948350f3dccc8b1868061ddf0339fac99886;hb=540ece2baf7de59565b42d427e206769ec4da56a;hp=9d8383811ee4a8f57e69e8611a363aaf4260494a;hpb=15c3a8b1ef47127d30d8b5f26f9d7622a0b72656;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-hsrv.c b/src/afb-hsrv.c
index 9d838381..45779483 100644
--- a/src/afb-hsrv.c
+++ b/src/afb-hsrv.c
@@ -35,6 +35,7 @@
 #include "afb-hsrv.h"
 #include <afb/afb-req-itf.h>
 #include "verbose.h"
+#include "locale-root.h"
 
 #include "afb-common.h"
 
@@ -54,10 +55,7 @@ struct hsrv_handler {
 };
 
 struct hsrv_alias {
-	const char *alias;
-	const char *directory;
-	size_t lendir;
-	int dirfd;
+	struct locale_root *root;
 	int relax;
 };
 
@@ -142,7 +140,7 @@ static int access_handler(
 		hreq->connection = connection;
 		hreq->method = method;
 		hreq->version = version;
-		hreq->lang = afb_hreq_get_header(hreq, MHD_HTTP_HEADER_ACCEPT_LANGUAGE);
+		hreq->lang = MHD_lookup_connection_value(connection, MHD_HEADER_KIND, MHD_HTTP_HEADER_ACCEPT_LANGUAGE);
 		hreq->tail = hreq->url = url;
 		hreq->lentail = hreq->lenurl = strlen(url);
 		*recordreq = hreq;
@@ -308,6 +306,7 @@ static int handle_alias(struct afb_hreq *hreq, void *data)
 {
 	int rc;
 	struct hsrv_alias *da = data;
+	struct locale_search *search;
 
 	if (hreq->method != afb_method_get) {
 		if (da->relax)
@@ -316,14 +315,9 @@ static int handle_alias(struct afb_hreq *hreq, void *data)
 		return 1;
 	}
 
-	if (!afb_hreq_valid_tail(hreq)) {
-		if (da->relax)
-			return 0;
-		afb_hreq_reply_error(hreq, MHD_HTTP_FORBIDDEN);
-		return 1;
-	}
-
-	rc = afb_hreq_reply_file_if_exist(hreq, da->dirfd, &hreq->tail[1]);
+	search = locale_root_search(da->root, hreq->lang, 0);
+	rc = afb_hreq_reply_locale_file_if_exist(hreq, search, &hreq->tail[1]);
+	locale_search_unref(search);
 	if (rc == 0) {
 		if (da->relax)
 			return 0;
@@ -348,31 +342,39 @@ int afb_hsrv_add_handler(
 	return 1;
 }
 
-int afb_hsrv_add_alias(struct afb_hsrv *hsrv, const char *prefix, const char *alias, int priority, int relax)
+int afb_hsrv_add_alias_root(struct afb_hsrv *hsrv, const char *prefix, struct locale_root *root, int priority, int relax)
 {
 	struct hsrv_alias *da;
-	int dirfd;
 
-	dirfd = open(alias, O_PATH|O_DIRECTORY);
-	if (dirfd < 0) {
-		/* TODO message */
-		return 0;
-	}
 	da = malloc(sizeof *da);
 	if (da != NULL) {
-		da->alias = prefix;
-		da->directory = alias;
-		da->lendir = strlen(da->directory);
-		da->dirfd = dirfd;
+		da->root = root;
 		da->relax = relax;
-		if (afb_hsrv_add_handler(hsrv, prefix, handle_alias, da, priority))
+		if (afb_hsrv_add_handler(hsrv, prefix, handle_alias, da, priority)) {
+			locale_root_addref(root);
 			return 1;
+		}
 		free(da);
 	}
-	close(dirfd);
 	return 0;
 }
 
+int afb_hsrv_add_alias(struct afb_hsrv *hsrv, const char *prefix, const char *alias, int priority, int relax)
+{
+	struct locale_root *root;
+	int rc;
+
+	root = locale_root_create(AT_FDCWD, alias);
+	if (root == NULL) {
+		/* TODO message */
+		rc = 0;
+	} else {
+		rc = afb_hsrv_add_alias_root(hsrv, prefix, root, priority, relax);
+		locale_root_unref(root);
+	}
+	return rc;
+}
+
 int afb_hsrv_set_cache_timeout(struct afb_hsrv *hsrv, int duration)
 {
 	int rc;