/*
- * Copyright (C) 2016, 2017 "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");
#define _GNU_SOURCE
#include <stdint.h>
+#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <assert.h>
#include <poll.h>
#include <fcntl.h>
#include <errno.h>
+#include <netdb.h>
+#include <sys/socket.h>
#include <sys/stat.h>
+#include <json-c/json.h>
#include <microhttpd.h>
-#include <systemd/sd-event.h>
+#if MHD_VERSION < 0x00095206
+# define MHD_ALLOW_SUSPEND_RESUME MHD_USE_SUSPEND_RESUME
+#endif
#include "afb-method.h"
#include "afb-context.h"
#include "afb-xreq.h"
#include "afb-hreq.h"
#include "afb-hsrv.h"
-#include <afb/afb-req-itf.h>
+#include "afb-fdev.h"
+#include "afb-socket.h"
+
+#include "fdev.h"
#include "verbose.h"
#include "locale-root.h"
-
-#include "afb-common.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;
struct afb_hsrv {
unsigned refcount;
struct hsrv_handler *handlers;
+ struct hsrv_itf *interfaces;
struct MHD_Daemon *httpd;
- sd_event_source *evsrc;
- int in_run;
+ struct fdev *fdev;
char *cache_to;
};
struct afb_hsrv *hsrv;
struct hsrv_handler *iter;
const char *type;
+ enum json_tokener_error jerr;
hsrv = cls;
hreq = *recordreq;
}
return MHD_YES;
} else if (strcasestr(type, JSON_CONTENT) != NULL) {
+ hreq->tokener = json_tokener_new();
+ if (hreq->tokener == NULL) {
+ ERROR("Can't create tokener for POST");
+ afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR);
+ }
return MHD_YES;
} else {
WARNING("Unsupported media type %s", type);
afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR);
return MHD_YES;
}
- } else {
- if (!afb_hreq_post_add(hreq, "", upload_data, *upload_data_size)) {
- afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR);
+ } else if (hreq->tokener) {
+ hreq->json = json_tokener_parse_ex(hreq->tokener, upload_data, (int)*upload_data_size);
+ 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;
}
}
return MHD_YES;
}
}
+ if (hreq->tokener != NULL) {
+ json_tokener_free(hreq->tokener);
+ hreq->tokener = NULL;
+ }
if (hreq->scanned != 0) {
if (hreq->replied == 0 && hreq->suspended == 0) {
}
/* 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;
}
}
}
-void run_micro_httpd(struct afb_hsrv *hsrv)
+static void do_run(int signum, void *arg)
{
- if (hsrv->in_run != 0)
- hsrv->in_run = 2;
- else {
- 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;
- sd_event_source_set_io_events(hsrv->evsrc, EPOLLIN);
+ MHD_UNSIGNED_LONG_LONG to;
+ struct afb_hsrv *hsrv = arg;
+
+ if (!signum) {
+ do { MHD_run(hsrv->httpd); } while(MHD_get_timeout(hsrv->httpd, &to) == MHD_YES && !to);
}
+ fdev_set_events(hsrv->fdev, EPOLLIN);
}
-static int io_event_callback(sd_event_source *src, int fd, uint32_t revents, void *hsrv)
+void afb_hsrv_run(struct afb_hsrv *hsrv)
{
- run_micro_httpd(hsrv);
- return 0;
+ fdev_set_events(hsrv->fdev, 0);
+ if (jobs_queue(hsrv, 0, do_run, hsrv) < 0)
+ do_run(0, hsrv);
+}
+
+static void listen_callback(void *hsrv, uint32_t revents, struct fdev *fdev)
+{
+ afb_hsrv_run(hsrv);
}
static int new_client_handler(void *cls, const struct sockaddr *addr, socklen_t addrlen)
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)
{
- sd_event_source *evsrc;
- int rc;
+ 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;
}
- rc = sd_event_add_io(afb_common_get_event_loop(), &evsrc, info->listen_fd, EPOLLIN, io_event_callback, hsrv);
- if (rc < 0) {
+ fdev = afb_fdev_create(info->epoll_fd);
+ if (fdev == NULL) {
MHD_stop_daemon(httpd);
- errno = -rc;
ERROR("connection to events for httpd failed");
return 0;
}
+ fdev_set_autoclose(fdev, 0);
+ fdev_set_events(fdev, EPOLLIN);
+ fdev_set_callback(fdev, listen_callback, hsrv);
hsrv->httpd = httpd;
- hsrv->evsrc = evsrc;
+ hsrv->fdev = fdev;
return 1;
}
void afb_hsrv_stop(struct afb_hsrv *hsrv)
{
- if (hsrv->evsrc != NULL) {
- sd_event_source_unref(hsrv->evsrc);
- hsrv->evsrc = NULL;
+ if (hsrv->fdev != NULL) {
+ fdev_unref(hsrv->fdev);
+ hsrv->fdev = NULL;
}
if (hsrv->httpd != NULL)
MHD_stop_daemon(hsrv->httpd);
}
}
+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);
+}
Code Review / src / app-framework-binder.git / blobdiff