/*
- * Copyright (C) 2016 "IoT.bzh"
+ * Copyright (C) 2016, 2017, 2018 "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 <errno.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 "fdev.h"
#include "verbose.h"
#include "locale-root.h"
-#include "afb-common.h"
-
-
+#include "afb-systemd.h"
+#include "jobs.h"
#define JSON_CONTENT "application/json"
#define FORM_CONTENT MHD_HTTP_POST_ENCODING_MULTIPART_FORMDATA
unsigned refcount;
struct hsrv_handler *handlers;
struct MHD_Daemon *httpd;
- sd_event_source *evsrc;
- int in_run;
+ struct fdev *fdev;
char *cache_to;
};
-static int global_reqids = 0;
-
static void reply_error(struct MHD_Connection *connection, unsigned int status)
{
struct MHD_Response *response = MHD_create_response_from_buffer(0, NULL, MHD_RESPMEM_PERSISTENT);
struct afb_hsrv *hsrv;
struct hsrv_handler *iter;
const char *type;
+ enum json_tokener_error jerr;
hsrv = cls;
hreq = *recordreq;
method = get_method(methodstr);
method &= afb_method_get | afb_method_post;
if (method == afb_method_none) {
+ WARNING("Unsupported HTTP operation %s", methodstr);
reply_error(connection, MHD_HTTP_BAD_REQUEST);
return MHD_YES;
}
/* create the request */
- hreq = calloc(1, sizeof *hreq);
+ hreq = afb_hreq_create();
if (hreq == NULL) {
+ ERROR("Can't allocate 'hreq'");
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->method = afb_method_get;
} else if (strcasestr(type, FORM_CONTENT) != NULL) {
hreq->postform = MHD_create_post_processor (connection, 65500, postproc, hreq);
- if (hreq->postform == NULL)
+ if (hreq->postform == NULL) {
+ ERROR("Can't create POST processor");
afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR);
+ }
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_UNSUPPORTED_MEDIA_TYPE);
return MHD_YES;
}
if (*upload_data_size) {
if (hreq->postform != NULL) {
if (!MHD_post_process (hreq->postform, upload_data, *upload_data_size)) {
+ ERROR("error in POST processor");
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;
}
}
rc = MHD_destroy_post_processor(hreq->postform);
hreq->postform = NULL;
if (rc == MHD_NO) {
+ ERROR("error detected in POST processing");
afb_hreq_reply_error(hreq, MHD_HTTP_BAD_REQUEST);
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 */
+ NOTICE("Unhandled request to %s", hreq->url);
afb_hreq_reply_error(hreq, MHD_HTTP_NOT_FOUND);
return MHD_YES;
}
struct afb_hreq *hreq;
hreq = *recordreq;
- if (hreq->upgrade)
- MHD_suspend_connection (connection);
- afb_hreq_unref(hreq);
+ if (hreq) {
+ afb_hreq_unref(hreq);
+ }
}
-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)
int afb_hsrv_start(struct afb_hsrv *hsrv, uint16_t port, 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_LINUX_ONLY | MHD_USE_TCP_FASTOPEN | MHD_USE_DEBUG | MHD_USE_SUSPEND_RESUME,
+ MHD_USE_EPOLL | MHD_ALLOW_UPGRADE | MHD_USE_TCP_FASTOPEN | MHD_USE_DEBUG | MHD_ALLOW_SUSPEND_RESUME,
port, /* port */
new_client_handler, NULL, /* Tcp Accept call back + extra attribute */
access_handler, hsrv, /* Http Request Call back + extra attribute */
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->listen_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);
Code Review / src / app-framework-binder.git / blobdiff