X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hsrv.c;h=4577948350f3dccc8b1868061ddf0339fac99886;hb=540ece2baf7de59565b42d427e206769ec4da56a;hp=a83382519a502502c6e60d4ab0f2e0893f592849;hpb=f262b0f726ac0577f40525038b779185f144873f;p=src%2Fapp-framework-binder.git diff --git a/src/afb-hsrv.c b/src/afb-hsrv.c index a8338251..45779483 100644 --- a/src/afb-hsrv.c +++ b/src/afb-hsrv.c @@ -1,5 +1,5 @@ /* - * Copyright 2016 IoT.bzh + * Copyright (C) 2016 "IoT.bzh" * Author: José Bollo * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -17,21 +17,28 @@ #define _GNU_SOURCE +#include #include #include #include #include #include +#include #include #include +#include #include "afb-method.h" +#include "afb-context.h" #include "afb-hreq.h" #include "afb-hsrv.h" -#include "afb-req-itf.h" +#include #include "verbose.h" -#include "utils-upoll.h" +#include "locale-root.h" + +#include "afb-common.h" + #define JSON_CONTENT "application/json" @@ -48,17 +55,15 @@ struct hsrv_handler { }; struct hsrv_alias { - const char *alias; - const char *directory; - size_t lendir; - int dirfd; + struct locale_root *root; + int relax; }; struct afb_hsrv { unsigned refcount; struct hsrv_handler *handlers; struct MHD_Daemon *httpd; - struct upoll *upoll; + sd_event_source *evsrc; int in_run; char *cache_to; }; @@ -125,6 +130,7 @@ static int access_handler( } /* init the request */ + hreq->refcount = 1; hreq->hsrv = hsrv; hreq->cacheTimeout = hsrv->cache_to; hreq->reqid = ++global_reqids; @@ -134,6 +140,7 @@ static int access_handler( hreq->connection = connection; hreq->method = method; hreq->version = version; + 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; @@ -149,7 +156,9 @@ static int access_handler( if (hreq->postform == NULL) afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR); return MHD_YES; - } else if (strcasestr(type, JSON_CONTENT) == NULL) { + } else if (strcasestr(type, JSON_CONTENT) != NULL) { + return MHD_YES; + } else { afb_hreq_reply_error(hreq, MHD_HTTP_UNSUPPORTED_MEDIA_TYPE); return MHD_YES; } @@ -223,7 +232,7 @@ static void end_handler(void *cls, struct MHD_Connection *connection, void **rec hreq = *recordreq; if (hreq->upgrade) MHD_suspend_connection (connection); - afb_hreq_free(hreq); + afb_hreq_unref(hreq); } void run_micro_httpd(struct afb_hsrv *hsrv) @@ -231,15 +240,21 @@ void run_micro_httpd(struct afb_hsrv *hsrv) if (hsrv->in_run != 0) hsrv->in_run = 2; else { - upoll_on_readable(hsrv->upoll, NULL); + sd_event_source_set_io_events(hsrv->evsrc, 0); do { hsrv->in_run = 1; MHD_run(hsrv->httpd); } while(hsrv->in_run == 2); hsrv->in_run = 0; - upoll_on_readable(hsrv->upoll, (void*)run_micro_httpd); + sd_event_source_set_io_events(hsrv->evsrc, EPOLLIN); } -}; +} + +static int io_event_callback(sd_event_source *src, int fd, uint32_t revents, void *hsrv) +{ + run_micro_httpd(hsrv); + return 0; +} static int new_client_handler(void *cls, const struct sockaddr *addr, socklen_t addrlen) { @@ -289,19 +304,26 @@ static struct hsrv_handler *new_handler( 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) + return 0; afb_hreq_reply_error(hreq, MHD_HTTP_METHOD_NOT_ALLOWED); return 1; } - if (!afb_hreq_valid_tail(hreq)) { - afb_hreq_reply_error(hreq, MHD_HTTP_FORBIDDEN); - return 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; + afb_hreq_reply_error(hreq, MHD_HTTP_NOT_FOUND); } - - return afb_hreq_reply_file(hreq, da->dirfd, &hreq->tail[1]); + return 1; } int afb_hsrv_add_handler( @@ -320,30 +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 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; - if (afb_hsrv_add_handler(hsrv, prefix, handle_alias, da, priority)) + da->root = root; + da->relax = relax; + 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; @@ -360,7 +391,8 @@ int afb_hsrv_set_cache_timeout(struct afb_hsrv *hsrv, int duration) int afb_hsrv_start(struct afb_hsrv *hsrv, uint16_t port, unsigned int connection_timeout) { - struct upoll *upoll; + sd_event_source *evsrc; + int rc; struct MHD_Daemon *httpd; const union MHD_DaemonInfo *info; @@ -374,35 +406,36 @@ int afb_hsrv_start(struct afb_hsrv *hsrv, uint16_t port, unsigned int connection MHD_OPTION_END); /* options-end */ if (httpd == NULL) { - fprintf(stderr, "Error: httpStart invalid httpd port: %d", (int)port); + ERROR("httpStart invalid httpd port: %d", (int)port); return 0; } info = MHD_get_daemon_info(httpd, MHD_DAEMON_INFO_EPOLL_FD_LINUX_ONLY); if (info == NULL) { MHD_stop_daemon(httpd); - fprintf(stderr, "Error: httpStart no pollfd"); + ERROR("httpStart no pollfd"); return 0; } - upoll = upoll_open(info->listen_fd, hsrv); - if (upoll == NULL) { + rc = sd_event_add_io(afb_common_get_event_loop(), &evsrc, info->listen_fd, EPOLLIN, io_event_callback, hsrv); + if (rc < 0) { MHD_stop_daemon(httpd); - fprintf(stderr, "Error: connection to upoll of httpd failed"); + errno = -rc; + ERROR("connection to events for httpd failed"); return 0; } - upoll_on_readable(upoll, (void*)run_micro_httpd); hsrv->httpd = httpd; - hsrv->upoll = upoll; + hsrv->evsrc = evsrc; return 1; } void afb_hsrv_stop(struct afb_hsrv *hsrv) { - if (hsrv->upoll) - upoll_close(hsrv->upoll); - hsrv->upoll = NULL; + if (hsrv->evsrc != NULL) { + sd_event_source_unref(hsrv->evsrc); + hsrv->evsrc = NULL; + } if (hsrv->httpd != NULL) MHD_stop_daemon(hsrv->httpd); hsrv->httpd = NULL;