X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hsrv.c;h=61e5c3c2e7a361315a387e5bd9d89dacb94f8d56;hb=65353dce81a629e042800bb7b86fcd869a76727e;hp=3bca5839c7caa6ef54fe837ded2ca479fc21624d;hpb=7bf0d9c6f807ffae6d9871c606afeccb9b478d3d;p=src%2Fapp-framework-binder.git diff --git a/src/afb-hsrv.c b/src/afb-hsrv.c index 3bca5839..61e5c3c2 100644 --- a/src/afb-hsrv.c +++ b/src/afb-hsrv.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017, 2018 "IoT.bzh" + * Copyright (C) 2015-2020 "IoT.bzh" * Author: José Bollo * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -25,10 +25,15 @@ #include #include #include +#include +#include #include #include #include +#if MHD_VERSION < 0x00095206 +# define MHD_ALLOW_SUSPEND_RESUME MHD_USE_SUSPEND_RESUME +#endif #include "afb-method.h" #include "afb-context.h" @@ -36,16 +41,23 @@ #include "afb-hreq.h" #include "afb-hsrv.h" #include "afb-fdev.h" +#include "afb-socket.h" + #include "fdev.h" #include "verbose.h" #include "locale-root.h" - -#include "afb-systemd.h" +#include "systemd.h" #include "jobs.h" #define JSON_CONTENT "application/json" #define FORM_CONTENT MHD_HTTP_POST_ENCODING_MULTIPART_FORMDATA +struct hsrv_itf { + struct hsrv_itf *next; + struct afb_hsrv *hsrv; + struct fdev *fdev; + char uri[]; +}; struct hsrv_handler { struct hsrv_handler *next; @@ -64,6 +76,7 @@ struct hsrv_alias { struct afb_hsrv { unsigned refcount; struct hsrv_handler *handlers; + struct hsrv_itf *interfaces; struct MHD_Daemon *httpd; struct fdev *fdev; char *cache_to; @@ -109,6 +122,7 @@ static int access_handler( struct afb_hsrv *hsrv; struct hsrv_handler *iter; const char *type; + enum json_tokener_error jerr; hsrv = cls; hreq = *recordreq; @@ -179,12 +193,13 @@ static int access_handler( } } else if (hreq->tokener) { hreq->json = json_tokener_parse_ex(hreq->tokener, upload_data, (int)*upload_data_size); - switch (json_tokener_get_error(hreq->tokener)) { - case json_tokener_success: - case json_tokener_continue: - break; - default: - ERROR("error in POST json: %s", json_tokener_error_desc(json_tokener_get_error(hreq->tokener))); + jerr = json_tokener_get_error(hreq->tokener); + if (jerr == json_tokener_continue) { + hreq->json = json_tokener_parse_ex(hreq->tokener, "", 1); + jerr = json_tokener_get_error(hreq->tokener); + } + if (jerr != json_tokener_success) { + ERROR("error in POST json: %s", json_tokener_error_desc(jerr)); afb_hreq_reply_error(hreq, MHD_HTTP_BAD_REQUEST); return MHD_YES; } @@ -235,7 +250,7 @@ static int access_handler( } /* no handler */ - WARNING("Unhandled request to %s", hreq->url); + NOTICE("Unhandled request to %s", hreq->url); afb_hreq_reply_error(hreq, MHD_HTTP_NOT_FOUND); return MHD_YES; } @@ -263,7 +278,7 @@ static void do_run(int signum, void *arg) fdev_set_events(hsrv->fdev, EPOLLIN); } -void run_micro_httpd(struct afb_hsrv *hsrv) +void afb_hsrv_run(struct afb_hsrv *hsrv) { fdev_set_events(hsrv->fdev, 0); if (jobs_queue(hsrv, 0, do_run, hsrv) < 0) @@ -272,7 +287,7 @@ void run_micro_httpd(struct afb_hsrv *hsrv) static void listen_callback(void *hsrv, uint32_t revents, struct fdev *fdev) { - run_micro_httpd(hsrv); + afb_hsrv_run(hsrv); } static int new_client_handler(void *cls, const struct sockaddr *addr, socklen_t addrlen) @@ -408,34 +423,39 @@ int afb_hsrv_set_cache_timeout(struct afb_hsrv *hsrv, int duration) return 1; } -int afb_hsrv_start(struct afb_hsrv *hsrv, uint16_t port, unsigned int connection_timeout) +int afb_hsrv_start(struct afb_hsrv *hsrv, unsigned int connection_timeout) { struct fdev *fdev; struct MHD_Daemon *httpd; const union MHD_DaemonInfo *info; httpd = MHD_start_daemon( - MHD_USE_EPOLL | MHD_ALLOW_UPGRADE | MHD_USE_TCP_FASTOPEN | MHD_USE_DEBUG | MHD_USE_SUSPEND_RESUME, - port, /* port */ - new_client_handler, NULL, /* Tcp Accept call back + extra attribute */ - access_handler, hsrv, /* Http Request Call back + extra attribute */ - MHD_OPTION_NOTIFY_COMPLETED, end_handler, hsrv, - MHD_OPTION_CONNECTION_TIMEOUT, connection_timeout, - MHD_OPTION_END); /* options-end */ + MHD_USE_EPOLL + | MHD_ALLOW_UPGRADE + | MHD_USE_TCP_FASTOPEN + | MHD_USE_NO_LISTEN_SOCKET + | MHD_USE_DEBUG + | MHD_ALLOW_SUSPEND_RESUME, + 0, /* port */ + new_client_handler, NULL, /* Tcp Accept call back + extra attribute */ + access_handler, hsrv, /* Http Request Call back + extra attribute */ + MHD_OPTION_NOTIFY_COMPLETED, end_handler, hsrv, + MHD_OPTION_CONNECTION_TIMEOUT, connection_timeout, + MHD_OPTION_END); /* options-end */ if (httpd == NULL) { - ERROR("httpStart invalid httpd port: %d", (int)port); + ERROR("httpStart invalid httpd"); return 0; } - info = MHD_get_daemon_info(httpd, MHD_DAEMON_INFO_EPOLL_FD_LINUX_ONLY); + info = MHD_get_daemon_info(httpd, MHD_DAEMON_INFO_EPOLL_FD); if (info == NULL) { MHD_stop_daemon(httpd); ERROR("httpStart no pollfd"); return 0; } - fdev = afb_fdev_create(info->listen_fd); + fdev = afb_fdev_create(info->epoll_fd); if (fdev == NULL) { MHD_stop_daemon(httpd); ERROR("connection to events for httpd failed"); @@ -478,3 +498,95 @@ void afb_hsrv_put(struct afb_hsrv *hsrv) } } +static int hsrv_itf_connect(struct hsrv_itf *itf); + +static void hsrv_itf_callback(void *closure, uint32_t revents, struct fdev *fdev) +{ + struct hsrv_itf *itf = closure; + int fd, sts; + struct sockaddr addr; + socklen_t lenaddr; + + if ((revents & EPOLLHUP) != 0) { + ERROR("disconnection for server %s: %m", itf->uri); + hsrv_itf_connect(itf); + fdev_unref(fdev); + } else if ((revents & EPOLLIN) != 0) { + lenaddr = (socklen_t)sizeof addr; + fd = accept(fdev_fd(fdev), &addr, &lenaddr); + if (fd < 0) + ERROR("can't accept connection to %s: %m", itf->uri); + else { + sts = MHD_add_connection(itf->hsrv->httpd, fd, &addr, lenaddr); + if (sts != MHD_YES) { + ERROR("can't add incoming connection to %s: %m", itf->uri); + close(fd); + } + } + } +} + +static int hsrv_itf_connect(struct hsrv_itf *itf) +{ + struct sockaddr addr; + socklen_t lenaddr; + char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV]; + int rgni; + + itf->fdev = afb_socket_open_fdev_scheme(itf->uri, 1, "tcp"); + if (!itf->fdev) { + ERROR("can't create socket %s", itf->uri); + return 0; + } + fdev_set_events(itf->fdev, EPOLLIN); + fdev_set_callback(itf->fdev, hsrv_itf_callback, itf); + memset(&addr, 0, sizeof addr); + lenaddr = (socklen_t)sizeof addr; + getsockname(fdev_fd(itf->fdev), &addr, &lenaddr); + if (addr.sa_family == AF_INET && !((struct sockaddr_in*)&addr)->sin_addr.s_addr) { + strncpy(hbuf, "*", NI_MAXHOST); + sprintf(sbuf, "%d", (int)ntohs(((struct sockaddr_in*)&addr)->sin_port)); + } else { + rgni = getnameinfo(&addr, lenaddr, hbuf, sizeof hbuf, sbuf, sizeof sbuf, NI_NUMERICSERV); + if (rgni != 0) { + ERROR("getnameinfo returned %d: %s", rgni, gai_strerror(rgni)); + hbuf[0] = sbuf[0] = '?'; + hbuf[1] = sbuf[1] = 0; + } + } + NOTICE("Listening interface %s:%s", hbuf, sbuf); + return 1; +} + +int afb_hsrv_add_interface(struct afb_hsrv *hsrv, const char *uri) +{ + struct hsrv_itf *itf; + + itf = malloc(sizeof *itf + 1 + strlen(uri)); + if (itf == NULL) + return -1; + + itf->hsrv = hsrv; + itf->fdev = NULL; + strcpy(itf->uri, uri); + itf->next = hsrv->interfaces; + hsrv->interfaces = itf; + return hsrv_itf_connect(itf); +} + +int afb_hsrv_add_interface_tcp(struct afb_hsrv *hsrv, const char *itf, uint16_t port) +{ + int rc; + char buffer[1024]; + + if (itf == NULL) { + itf = "*"; /* awaiting getifaddrs impl */ + } + rc = snprintf(buffer, sizeof buffer, "tcp:%s:%d", itf, (int)port); + if (rc < 0 || rc >= (int)sizeof buffer) { + if (rc > 0) + errno = EINVAL; + return 0; + } + return afb_hsrv_add_interface(hsrv, buffer); +}