/*
- * Copyright 2016 IoT.bzh
+ * Copyright (C) 2016 "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 <stdio.h>
#include <string.h>
#include <assert.h>
#include <poll.h>
#include <fcntl.h>
+#include <errno.h>
#include <sys/stat.h>
#include <microhttpd.h>
+#include <systemd/sd-event.h>
-#include "local-def.h"
#include "afb-method.h"
+#include "afb-context.h"
#include "afb-hreq.h"
#include "afb-hsrv.h"
-#include "afb-websock.h"
-#include "afb-apis.h"
#include "afb-req-itf.h"
#include "verbose.h"
-#include "utils-upoll.h"
+
+#include "afb-common.h"
+
+
#define JSON_CONTENT "application/json"
#define FORM_CONTENT MHD_HTTP_POST_ENCODING_MULTIPART_FORMDATA
-struct afb_hsrv_handler {
- struct afb_hsrv_handler *next;
+struct hsrv_handler {
+ struct hsrv_handler *next;
const char *prefix;
size_t length;
int (*handler) (struct afb_hreq *, void *);
int priority;
};
-struct afb_diralias {
+struct hsrv_alias {
const char *alias;
const char *directory;
size_t lendir;
struct afb_hsrv {
unsigned refcount;
- struct afb_hsrv_handler *handlers;
+ struct hsrv_handler *handlers;
struct MHD_Daemon *httpd;
- struct upoll *upoll;
+ sd_event_source *evsrc;
+ int in_run;
char *cache_to;
};
-
-
-static struct afb_hsrv_handler *new_handler(
- struct afb_hsrv_handler *head,
- const char *prefix,
- int (*handler) (struct afb_hreq *, void *),
- void *data,
- int priority)
-{
- struct afb_hsrv_handler *link, *iter, *previous;
- size_t length;
-
- /* get the length of the prefix without its leading / */
- length = strlen(prefix);
- while (length && prefix[length - 1] == '/')
- length--;
-
- /* allocates the new link */
- link = malloc(sizeof *link);
- if (link == NULL)
- return NULL;
-
- /* initialize it */
- link->prefix = prefix;
- link->length = length;
- link->handler = handler;
- link->data = data;
- link->priority = priority;
-
- /* adds it */
- previous = NULL;
- iter = head;
- while (iter && (priority < iter->priority || (priority == iter->priority && length <= iter->length))) {
- previous = iter;
- iter = iter->next;
- }
- link->next = iter;
- if (previous == NULL)
- return link;
- previous->next = link;
- return head;
-}
-
-int afb_hsrv_add_handler(
- struct afb_hsrv *hsrv,
- const char *prefix,
- int (*handler) (struct afb_hreq *, void *),
- void *data,
- int priority)
-{
- struct afb_hsrv_handler *head;
-
- head = new_handler(hsrv->handlers, prefix, handler, data, priority);
- if (head == NULL)
- return 0;
- hsrv->handlers = head;
- return 1;
-}
-
-int afb_hreq_one_page_api_redirect(
- struct afb_hreq *hreq,
- void *data)
-{
- size_t plen;
- char *url;
-
- if (hreq->lentail >= 2 && hreq->tail[1] == '#')
- return 0;
- /*
- * Here we have for example:
- * url = "/pre/dir/page" lenurl = 13
- * tail = "/dir/page" lentail = 9
- *
- * We will produce "/pre/#!dir/page"
- *
- * Let compute plen that include the / at end (for "/pre/")
- */
- plen = hreq->lenurl - hreq->lentail + 1;
- url = alloca(hreq->lenurl + 3);
- memcpy(url, hreq->url, plen);
- url[plen++] = '#';
- url[plen++] = '!';
- memcpy(&url[plen], &hreq->tail[1], hreq->lentail);
- return afb_hreq_redirect_to(hreq, url);
-}
-
-static int afb_hreq_websocket_switch(struct afb_hreq *hreq, void *data)
-{
- int later;
-
- afb_hreq_context(hreq);
- if (hreq->lentail != 0 || !afb_websock_check(hreq, &later))
- return 0;
-
- if (!later) {
- struct afb_websock *ws = afb_websock_create(hreq);
- if (ws != NULL)
- hreq->upgrade = 1;
- }
- return 1;
-}
-
-static int afb_hreq_rest_api(struct afb_hreq *hreq, void *data)
-{
- const char *api, *verb;
- size_t lenapi, lenverb;
- struct AFB_clientCtx *context;
-
- api = &hreq->tail[strspn(hreq->tail, "/")];
- lenapi = strcspn(api, "/");
- verb = &api[lenapi];
- verb = &verb[strspn(verb, "/")];
- lenverb = strcspn(verb, "/");
-
- if (!(*api && *verb && lenapi && lenverb))
- return 0;
-
- context = afb_hreq_context(hreq);
- return afb_apis_handle(afb_hreq_to_req(hreq), context, api, lenapi, verb, lenverb);
-}
-
-static int handle_alias(struct afb_hreq *hreq, void *data)
-{
- struct afb_diralias *da = data;
-
- if (hreq->method != afb_method_get) {
- 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;
- }
-
- return afb_hreq_reply_file(hreq, da->dirfd, &hreq->tail[1]);
-}
-
-int afb_hsrv_add_alias(struct afb_hsrv *hsrv, const char *prefix, const char *alias, int priority)
-{
- struct afb_diralias *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))
- return 1;
- free(da);
- }
- close(dirfd);
- return 0;
-}
+static int global_reqids = 0;
static void reply_error(struct MHD_Connection *connection, unsigned int status)
{
- char *buffer;
- int length;
- struct MHD_Response *response;
-
- length = asprintf(&buffer, "<html><body>error %u</body></html>", status);
- if (length > 0)
- response = MHD_create_response_from_buffer((unsigned)length, buffer, MHD_RESPMEM_MUST_FREE);
- else {
- buffer = "<html><body>error</body></html>";
- response = MHD_create_response_from_buffer(strlen(buffer), buffer, MHD_RESPMEM_PERSISTENT);
- }
- if (!MHD_queue_response(connection, status, response))
- fprintf(stderr, "Failed to reply error code %u", status);
+ struct MHD_Response *response = MHD_create_response_from_buffer(0, NULL, MHD_RESPMEM_PERSISTENT);
+ MHD_queue_response(connection, status, response);
MHD_destroy_response(response);
}
struct afb_hreq *hreq;
enum afb_method method;
struct afb_hsrv *hsrv;
- struct afb_hsrv_handler *iter;
+ struct hsrv_handler *iter;
const char *type;
hsrv = cls;
hreq = *recordreq;
if (hreq == NULL) {
- /* create the request */
- hreq = calloc(1, sizeof *hreq);
- if (hreq == NULL)
- goto internal_error;
- *recordreq = hreq;
-
/* get the method */
method = get_method(methodstr);
method &= afb_method_get | afb_method_post;
- if (method == afb_method_none)
- goto bad_request;
+ if (method == afb_method_none) {
+ reply_error(connection, MHD_HTTP_BAD_REQUEST);
+ return MHD_YES;
+ }
+
+ /* create the request */
+ hreq = calloc(1, sizeof *hreq);
+ if (hreq == NULL) {
+ reply_error(connection, MHD_HTTP_INTERNAL_SERVER_ERROR);
+ return MHD_YES;
+ }
/* init the request */
+ hreq->refcount = 1;
+ hreq->hsrv = hsrv;
hreq->cacheTimeout = hsrv->cache_to;
+ hreq->reqid = ++global_reqids;
+ hreq->scanned = 0;
+ hreq->suspended = 0;
+ hreq->replied = 0;
hreq->connection = connection;
hreq->method = method;
hreq->version = version;
hreq->tail = hreq->url = url;
hreq->lentail = hreq->lenurl = strlen(url);
+ *recordreq = hreq;
/* init the post processing */
if (method == afb_method_post) {
} else if (strcasestr(type, FORM_CONTENT) != NULL) {
hreq->postform = MHD_create_post_processor (connection, 65500, postproc, hreq);
if (hreq->postform == NULL)
- goto internal_error;
+ afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR);
return MHD_YES;
} else if (strcasestr(type, JSON_CONTENT) == NULL) {
- reply_error(connection, MHD_HTTP_UNSUPPORTED_MEDIA_TYPE);
+ afb_hreq_reply_error(hreq, MHD_HTTP_UNSUPPORTED_MEDIA_TYPE);
return MHD_YES;
}
}
/* process further data */
if (*upload_data_size) {
if (hreq->postform != NULL) {
- if (!MHD_post_process (hreq->postform, upload_data, *upload_data_size))
- goto internal_error;
+ if (!MHD_post_process (hreq->postform, upload_data, *upload_data_size)) {
+ afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR);
+ return MHD_YES;
+ }
} else {
- if (!afb_hreq_post_add(hreq, NULL, upload_data, *upload_data_size))
- goto internal_error;
+ if (!afb_hreq_post_add(hreq, "", upload_data, *upload_data_size)) {
+ afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR);
+ return MHD_YES;
+ }
}
*upload_data_size = 0;
- return MHD_YES;
+ return MHD_YES;
}
/* flush the data */
if (hreq->postform != NULL) {
rc = MHD_destroy_post_processor(hreq->postform);
hreq->postform = NULL;
- if (rc == MHD_NO)
- goto bad_request;
+ if (rc == MHD_NO) {
+ afb_hreq_reply_error(hreq, MHD_HTTP_BAD_REQUEST);
+ return MHD_YES;
+ }
+ }
+
+ if (hreq->scanned != 0) {
+ if (hreq->replied == 0 && hreq->suspended == 0) {
+ MHD_suspend_connection (connection);
+ hreq->suspended = 1;
+ }
+ return MHD_YES;
}
/* search an handler for the request */
+ hreq->scanned = 1;
iter = hsrv->handlers;
while (iter) {
if (afb_hreq_unprefix(hreq, iter->prefix, iter->length)) {
- if (iter->handler(hreq, iter->data))
+ if (iter->handler(hreq, iter->data)) {
+ if (hreq->replied == 0 && hreq->suspended == 0) {
+ MHD_suspend_connection (connection);
+ hreq->suspended = 1;
+ }
return MHD_YES;
+ }
hreq->tail = hreq->url;
hreq->lentail = hreq->lenurl;
}
/* no handler */
afb_hreq_reply_error(hreq, MHD_HTTP_NOT_FOUND);
return MHD_YES;
-
-bad_request:
- reply_error(connection, MHD_HTTP_BAD_REQUEST);
- return MHD_YES;
-
-internal_error:
- reply_error(connection, MHD_HTTP_INTERNAL_SERVER_ERROR);
- return MHD_YES;
}
/* Because of POST call multiple time requestApi we need to free POST handle here */
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)
+{
+ 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);
+ }
+}
+
+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)
return MHD_YES;
}
-/* infinite loop */
-static void hsrv_handle_event(struct MHD_Daemon *httpd)
+static struct hsrv_handler *new_handler(
+ struct hsrv_handler *head,
+ const char *prefix,
+ int (*handler) (struct afb_hreq *, void *),
+ void *data,
+ int priority)
+{
+ struct hsrv_handler *link, *iter, *previous;
+ size_t length;
+
+ /* get the length of the prefix without its leading / */
+ length = strlen(prefix);
+ while (length && prefix[length - 1] == '/')
+ length--;
+
+ /* allocates the new link */
+ link = malloc(sizeof *link);
+ if (link == NULL)
+ return NULL;
+
+ /* initialize it */
+ link->prefix = prefix;
+ link->length = length;
+ link->handler = handler;
+ link->data = data;
+ link->priority = priority;
+
+ /* adds it */
+ previous = NULL;
+ iter = head;
+ while (iter && (priority < iter->priority || (priority == iter->priority && length <= iter->length))) {
+ previous = iter;
+ iter = iter->next;
+ }
+ link->next = iter;
+ if (previous == NULL)
+ return link;
+ previous->next = link;
+ return head;
+}
+
+static int handle_alias(struct afb_hreq *hreq, void *data)
+{
+ struct hsrv_alias *da = data;
+
+ if (hreq->method != afb_method_get) {
+ 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;
+ }
+
+ return afb_hreq_reply_file(hreq, da->dirfd, &hreq->tail[1]);
+}
+
+int afb_hsrv_add_handler(
+ struct afb_hsrv *hsrv,
+ const char *prefix,
+ int (*handler) (struct afb_hreq *, void *),
+ void *data,
+ int priority)
+{
+ struct hsrv_handler *head;
+
+ head = new_handler(hsrv->handlers, prefix, handler, data, priority);
+ if (head == NULL)
+ return 0;
+ hsrv->handlers = head;
+ return 1;
+}
+
+int afb_hsrv_add_alias(struct afb_hsrv *hsrv, const char *prefix, const char *alias, int priority)
{
- MHD_run(httpd);
+ 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))
+ return 1;
+ free(da);
+ }
+ close(dirfd);
+ return 0;
}
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, 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;
MHD_OPTION_END); /* options-end */
if (httpd == NULL) {
- printf("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, httpd);
- 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*)hsrv_handle_event);
hsrv->httpd = httpd;
- hsrv->upoll = upoll;
+ hsrv->evsrc = evsrc;
return 1;
}
-void _afb_hsrv_stop(struct afb_hsrv *hsrv)
+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;
{
assert(hsrv->refcount != 0);
if (!--hsrv->refcount) {
- _afb_hsrv_stop(hsrv);
+ afb_hsrv_stop(hsrv);
free(hsrv);
}
}
-static int my_default_init(struct afb_hsrv *hsrv, AFB_session * session)
-{
- int idx;
-
- if (!afb_hsrv_add_handler(hsrv, session->config->rootapi, afb_hreq_websocket_switch, NULL, 20))
- return 0;
-
- if (!afb_hsrv_add_handler(hsrv, session->config->rootapi, afb_hreq_rest_api, NULL, 10))
- return 0;
-
- for (idx = 0; session->config->aliasdir[idx].url != NULL; idx++)
- if (!afb_hsrv_add_alias (hsrv, session->config->aliasdir[idx].url, session->config->aliasdir[idx].path, 0))
- return 0;
-
- if (!afb_hsrv_add_alias(hsrv, "", session->config->rootdir, -10))
- return 0;
-
- if (!afb_hsrv_add_handler(hsrv, session->config->rootbase, afb_hreq_one_page_api_redirect, NULL, -20))
- return 0;
-
- return 1;
-}
-
-int afb_hsrv_start(AFB_session * session)
-{
- int rc;
- struct afb_hsrv *hsrv;
-
- hsrv = afb_hsrv_create();
- if (hsrv == NULL) {
- fprintf(stderr, "memory allocation failure\n");
- return 0;
- }
-
- if (!afb_hsrv_set_cache_timeout(hsrv, session->config->cacheTimeout)
- || !my_default_init(hsrv, session)) {
- printf("Error: initialisation of httpd failed");
- afb_hsrv_put(hsrv);
- return 0;
- }
-
- if (verbosity) {
- printf("AFB:notice Waiting port=%d rootdir=%s\n", session->config->httpdPort, session->config->rootdir);
- printf("AFB:notice Browser URL= http:/*localhost:%d\n", session->config->httpdPort);
- }
-
- rc = _afb_hsrv_start(hsrv, (uint16_t) session->config->httpdPort, 15);
- if (!rc)
- return 0;
-
- session->hsrv = hsrv;
- return 1;
-}
-
-void afb_hsrv_stop(AFB_session * session)
-{
- _afb_hsrv_stop(session->hsrv);
-}
-
Code Review / src / app-framework-binder.git / blobdiff