/*
- * Copyright (C) 2015 "IoT.bzh"
- * Author "Fulup Ar Foll"
+ * Copyright 2016 IoT.bzh
+ * Author: José Bollo <jose.bollo@iot.bzh>
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Handle standard HTTP request
- * Features/Restriction:
- - handle ETAG to limit upload to modified/new files [cache default 3600s]
- - handles redirect to index.htlm when path is a directory [code 301]
- - only support GET method
- - does not follow link.
-
- References: https://www.gnu.org/software/libmicrohttpd/manual/html_node/index.html#Top
- http://libmicrohttpd.sourcearchive.com/documentation/0.4.2/microhttpd_8h.html
- https://gnunet.org/svn/libmicrohttpd/src/examples/fileserver_example_external_select.c
- https://github.com/json-c/json-c
- POST https://www.gnu.org/software/libmicrohttpd/manual/html_node/microhttpd_002dpost.html#microhttpd_002dpost
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
-
+#define _GNU_SOURCE
#include <microhttpd.h>
-
+#include <assert.h>
+#include <poll.h>
#include <sys/stat.h>
+
#include "../include/local-def.h"
+#include "afb-method.h"
+#include "afb-hreq.h"
+#include "afb-websock.h"
+
+
+struct afb_hsrv_handler {
+ struct afb_hsrv_handler *next;
+ const char *prefix;
+ size_t length;
+ int (*handler) (struct afb_hreq *, struct afb_hreq_post *, void *);
+ void *data;
+ int priority;
+};
+
+struct afb_diralias {
+ const char *alias;
+ const char *directory;
+ size_t lendir;
+ int dirfd;
+};
+
+int afb_hreq_one_page_api_redirect(
+ struct afb_hreq *hreq,
+ struct afb_hreq_post *post,
+ 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);
+}
-// let's compute fixed URL length only once
-static apiUrlLen=0;
-static baseUrlLen=0;
-static rootUrlLen=0;
-
-// proto missing from GCC
-char *strcasestr(const char *haystack, const char *needle);
-
-static int rqtcount = 0; // dummy request rqtcount to make each message be different
-static int postcount = 0;
-
-// try to open libmagic to handle mime types
-static AFB_error initLibMagic (AFB_session *session) {
-
- /*MAGIC_MIME tells magic to return a mime of the file, but you can specify different things*/
- if (verbose) printf("Loading mimetype default magic database\n");
-
- session->magic = magic_open(MAGIC_MIME_TYPE);
- if (session->magic == NULL) {
- fprintf(stderr,"ERROR: unable to initialize magic library\n");
- return AFB_FAIL;
- }
-
- // Warning: should not use NULL for DB [libmagic bug wont pass efence check]
- if (magic_load(session->magic, MAGIC_DB) != 0) {
- fprintf(stderr,"cannot load magic database - %s\n", magic_error(session->magic));
- magic_close(session->magic);
- return AFB_FAIL;
- }
-
- return AFB_SUCCESS;
+struct afb_hsrv_handler *afb_hsrv_handler_new(
+ struct afb_hsrv_handler *head,
+ const char *prefix,
+ int (*handler) (struct afb_hreq *, struct afb_hreq_post *, 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;
}
-// Because of POST call multiple time requestApi we need to free POST handle here
-static void endRequest (void *cls, struct MHD_Connection *connection, void **con_cls, enum MHD_RequestTerminationCode toe) {
- AFB_PostHandle *posthandle = *con_cls;
+int afb_req_add_handler(
+ AFB_session * session,
+ const char *prefix,
+ int (*handler) (struct afb_hreq *, struct afb_hreq_post *, void *),
+ void *data,
+ int priority)
+{
+ struct afb_hsrv_handler *head;
+
+ head = afb_hsrv_handler_new(session->handlers, prefix, handler, data, priority);
+ if (head == NULL)
+ return 0;
+ session->handlers = head;
+ return 1;
+}
- // if post handle was used let's free everything
- if (posthandle != NULL) endPostRequest (posthandle);
+static int relay_to_doRestApi(struct afb_hreq *hreq, struct afb_hreq_post *post, void *data)
+{
+ int later;
+ if (afb_websock_check(hreq, &later)) {
+ if (!later) {
+ struct afb_websock *ws = afb_websock_create(hreq->connection);
+ }
+ return 1;
+ }
+
+ return doRestApi(hreq->connection, hreq->session, &hreq->tail[1], get_method_name(hreq->method),
+ post->upload_data, post->upload_data_size, (void **)hreq->recorder);
}
+static int handle_alias(struct afb_hreq *hreq, struct afb_hreq_post *post, void *data)
+{
+ struct afb_diralias *da = data;
-// Create check etag value
-STATIC void computeEtag(char *etag, int maxlen, struct stat *sbuf) {
- int time;
- time = sbuf->st_mtim.tv_sec;
- snprintf(etag, maxlen, "%d", time);
+ 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]);
}
-STATIC int servFile (struct MHD_Connection *connection, AFB_session *session, const char *url, AFB_staticfile *staticfile) {
- const char *etagCache, *mimetype;
- char etagValue[15];
- struct MHD_Response *response;
- struct stat sbuf;
- int ret;
-
- if (fstat (staticfile->fd, &sbuf) != 0) {
- fprintf(stderr, "Fail to stat file: [%s] error:%s\n", staticfile->path, strerror(errno));
- goto abortRequest;
- }
-
- // if url is a directory let's add index.html and redirect client
- if (S_ISDIR (sbuf.st_mode)) {
- close (staticfile->fd); // close directory check for Index
-
- // No trailing '/'. Let's add one and redirect for relative paths to work
- if (url [strlen (url) -1] != '/') {
- response = MHD_create_response_from_buffer(0,"", MHD_RESPMEM_PERSISTENT);
- strncpy(staticfile->path, url, sizeof (staticfile->path));
- strncat(staticfile->path, "/", sizeof (staticfile->path));
- MHD_add_response_header (response, "Location", staticfile->path);
- MHD_queue_response (connection, MHD_HTTP_MOVED_PERMANENTLY, response);
- if (verbose) fprintf (stderr,"Adding trailing '/' [%s]\n",staticfile->path);
- goto sendRequest;
- }
-
- strncat (staticfile->path, OPA_INDEX, sizeof (staticfile->path));
- if (-1 == (staticfile->fd = open(staticfile->path, O_RDONLY)) || (fstat (staticfile->fd, &sbuf) != 0)) {
- fprintf(stderr, "No Index.html in direcory [%s]\n", staticfile->path);
- goto abortRequest;
- }
- } else if (! S_ISREG (sbuf.st_mode)) { // only standard file any other one including symbolic links are refused.
- close (staticfile->fd); // nothing useful to do with this file
- fprintf (stderr, "Fail file: [%s] is not a regular file\n", staticfile->path);
- const char *errorstr = "<html><body>Application Framework Binder Invalid file type</body></html>";
- response = MHD_create_response_from_buffer (strlen (errorstr),
- (void *) errorstr, MHD_RESPMEM_PERSISTENT);
- MHD_queue_response (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, response);
- goto sendRequest;
- }
-
- // https://developers.google.com/web/fundamentals/performance/optimizing-content-efficiency/http-caching?hl=fr
- // ftp://ftp.heanet.ie/disk1/www.gnu.org/software/libmicrohttpd/doxygen/dc/d0c/microhttpd_8h.html
-
- // Check etag value and load file only when modification date changes
- etagCache = MHD_lookup_connection_value(connection, MHD_HEADER_KIND, MHD_HTTP_HEADER_IF_NONE_MATCH);
- computeEtag(etagValue, sizeof (etagValue), &sbuf);
-
- if (etagCache != NULL && strcmp(etagValue, etagCache) == 0) {
- close(staticfile->fd); // file did not change since last upload
- if (verbose) fprintf(stderr, "Not Modify: [%s]\n", staticfile->path);
- response = MHD_create_response_from_buffer(0, "", MHD_RESPMEM_PERSISTENT);
- MHD_add_response_header(response, MHD_HTTP_HEADER_CACHE_CONTROL, session->cacheTimeout); // default one hour cache
- MHD_add_response_header(response, MHD_HTTP_HEADER_ETAG, etagValue);
- MHD_queue_response(connection, MHD_HTTP_NOT_MODIFIED, response);
-
- } else { // it's a new file, we need to upload it to client
- // if we have magic let's try to guest mime type
- if (session->magic) {
- mimetype= magic_descriptor(session->magic, staticfile->fd);
- if (mimetype != NULL) MHD_add_response_header (response, MHD_HTTP_HEADER_CONTENT_TYPE, mimetype);
- } else mimetype="application/unknown";
-
- if (verbose) fprintf(stderr, "Serving: [%s] mime=%s\n", staticfile->path, mimetype);
- response = MHD_create_response_from_fd(sbuf.st_size, staticfile->fd);
- MHD_add_response_header(response, MHD_HTTP_HEADER_CACHE_CONTROL, session->cacheTimeout); // default one hour cache
- MHD_add_response_header(response, MHD_HTTP_HEADER_ETAG, etagValue);
- MHD_queue_response(connection, MHD_HTTP_OK, response);
- }
-
-sendRequest:
- MHD_destroy_response(response);
- return (MHD_YES);
-
-abortRequest:
- return (FAILED);
+int afb_req_add_alias(AFB_session * session, 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_req_add_handler(session, prefix, handle_alias, da, priority))
+ return 1;
+ free(da);
+ }
+ close(dirfd);
+ return 0;
}
+static int my_default_init(AFB_session * session)
+{
+ int idx;
-// this function return either Index.htlm or a redirect to /#!route to make angular happy
-STATIC int redirectHTML5(struct MHD_Connection *connection, AFB_session *session, const char* url) {
+ if (!afb_req_add_handler(session, session->config->rootapi, relay_to_doRestApi, NULL, 1))
+ return 0;
- int fd;
- int ret;
- struct MHD_Response *response;
- AFB_staticfile staticfile;
+ for (idx = 0; session->config->aliasdir[idx].url != NULL; idx++)
+ if (!afb_req_add_alias
+ (session, session->config->aliasdir[idx].url, session->config->aliasdir[idx].path, 0))
+ return 0;
- // Url match /opa/xxxx should redirect to "/opa/#!page" to force index.html reload
- strncpy(staticfile.path, session->config->rootbase, sizeof (staticfile.path));
- strncat(staticfile.path, "/#!", sizeof (staticfile.path));
- strncat(staticfile.path, &url[1], sizeof (staticfile.path));
- response = MHD_create_response_from_buffer(0,"", MHD_RESPMEM_PERSISTENT);
- MHD_add_response_header (response, "Location", staticfile.path);
- MHD_queue_response (connection, MHD_HTTP_MOVED_PERMANENTLY, response);
- if (verbose) fprintf (stderr,"checkHTML5 redirect to [%s]\n",staticfile.path);
- return (MHD_YES);
-}
+ if (!afb_req_add_alias(session, "", session->config->rootdir, -10))
+ return 0;
+
+ if (!afb_req_add_handler(session, session->config->rootbase, afb_hreq_one_page_api_redirect, NULL, -20))
+ return 0;
+ return 1;
+}
-// minimal httpd file server for static HTML,JS,CSS,etc...
-STATIC int requestFile(struct MHD_Connection *connection, AFB_session *session, const char* url) {
- int fd, ret, idx;
- AFB_staticfile staticfile;
- char *requestdir, *requesturl;
-
- // default search for file is rootdir base
- requestdir= session->config->rootdir;
- requesturl=(char*)url;
-
- // Check for optional aliases
- for (idx=0; session->config->aliasdir[idx].url != NULL; idx++) {
- if (0 == strncmp(url, session->config->aliasdir[idx].url, session->config->aliasdir[idx].len)) {
- requestdir = session->config->aliasdir[idx].path;
- requesturl=(char*)&url[session->config->aliasdir[idx].len];
- break;
- }
- }
-
- // build full path from rootdir + url
- strncpy(staticfile.path, requestdir, sizeof (staticfile.path));
- strncat(staticfile.path, requesturl, sizeof (staticfile.path));
-
- // try to open file and get its size
- if (-1 == (staticfile.fd = open(staticfile.path, O_RDONLY))) {
- fprintf(stderr, "Fail to open file: [%s] error:%s\n", staticfile.path, strerror(errno));
- return (FAILED);
- }
- // open file is OK let use it
- ret = servFile (connection, session, url, &staticfile);
- return ret;
+static int access_handler(
+ void *cls,
+ struct MHD_Connection *connection,
+ const char *url,
+ const char *methodstr,
+ const char *version,
+ const char *upload_data,
+ size_t * upload_data_size,
+ void **recorder)
+{
+ struct afb_hreq_post post;
+ struct afb_hreq hreq;
+ enum afb_method method;
+ AFB_session *session;
+ struct afb_hsrv_handler *iter;
+
+ session = cls;
+ post.upload_data = upload_data;
+ post.upload_data_size = upload_data_size;
+
+#if 0
+ struct afb_hreq *previous;
+
+ previous = *recorder;
+ if (previous) {
+ assert((void **)previous->recorder == recorder);
+ assert(previous->session == session);
+ assert(previous->connection == connection);
+ assert(previous->method == get_method(methodstr));
+ assert(previous->url == url);
+
+ /* TODO */
+/*
+ assert(previous->post_handler != NULL);
+ previous->post_handler(previous, &post);
+ return MHD_NO;
+*/
+ }
+#endif
+
+ method = get_method(methodstr);
+ if (method == afb_method_none) {
+ afb_hreq_reply_error(&hreq, MHD_HTTP_BAD_REQUEST);
+ return MHD_YES;
+ }
+
+ /* init the request */
+ hreq.session = cls;
+ hreq.connection = connection;
+ hreq.method = method;
+ hreq.version = version;
+ hreq.tail = hreq.url = url;
+ hreq.lentail = hreq.lenurl = strlen(url);
+ hreq.recorder = (struct afb_hreq **)recorder;
+ hreq.post_handler = NULL;
+ hreq.post_completed = NULL;
+ hreq.post_data = NULL;
+
+ /* search an handler for the request */
+ iter = session->handlers;
+ while (iter) {
+ if (afb_hreq_unprefix(&hreq, iter->prefix, iter->length)) {
+ if (iter->handler(&hreq, &post, iter->data))
+ return MHD_YES;
+ hreq.tail = hreq.url;
+ hreq.lentail = hreq.lenurl;
+ }
+ iter = iter->next;
+ }
+
+ /* no handler */
+ afb_hreq_reply_error(&hreq, method != afb_method_get ? MHD_HTTP_BAD_REQUEST : MHD_HTTP_NOT_FOUND);
+ return MHD_YES;
}
-// Check and Dispatch HTTP request
-STATIC int newRequest(void *cls,
- struct MHD_Connection *connection,
- const char *url,
- const char *method,
- const char *version,
- const char *upload_data, size_t *upload_data_size, void **con_cls) {
-
- AFB_session *session = cls;
- struct MHD_Response *response;
- int ret;
-
- // this is a REST API let's check for plugins
- if (0 == strncmp(url, session->config->rootapi, apiUrlLen)) {
- ret = doRestApi(connection, session, &url[apiUrlLen+1], method, upload_data, upload_data_size, con_cls);
- return ret;
- }
-
- // From here only accept get request
- if (0 != strcmp(method, MHD_HTTP_METHOD_GET)) return MHD_NO; /* unexpected method */
-
- // If a static file exist serve it now
- ret = requestFile(connection, session, url);
- if (ret != FAILED) return ret;
-
- // no static was served let's try HTML5 OPA redirect
- if (0 == strncmp(url, session->config->rootbase, baseUrlLen)) {
- ret = redirectHTML5(connection, session, &url[baseUrlLen]);
- return ret;
- }
-
- // Nothing respond to this request Files, API, Angular Base
- const char *errorstr = "<html><body>Alsa-Json-Gateway Unknown or Not readable file</body></html>";
- response = MHD_create_response_from_buffer(strlen(errorstr), (void*)errorstr, MHD_RESPMEM_PERSISTENT);
- ret = MHD_queue_response(connection, MHD_HTTP_INTERNAL_SERVER_ERROR, response);
- return (MHD_YES);
+/* Because of POST call multiple time requestApi we need to free POST handle here */
+static void end_handler(void *cls, struct MHD_Connection *connection, void **con_cls,
+ enum MHD_RequestTerminationCode toe)
+{
+ AFB_PostHandle *posthandle = *con_cls;
+
+ /* if post handle was used let's free everything */
+ if (posthandle != NULL)
+ endPostRequest(posthandle);
}
-STATIC int newClient(void *cls, const struct sockaddr * addr, socklen_t addrlen) {
- // check if client is coming from an acceptable IP
- return (MHD_YES); // MHD_NO
+static int new_client_handler(void *cls, const struct sockaddr *addr, socklen_t addrlen)
+{
+ return MHD_YES;
}
+#if defined(USE_MAGIC_MIME_TYPE)
+
+#if !defined(MAGIC_DB)
+#define MAGIC_DB "/usr/share/misc/magic.mgc"
+#endif
+
+static int init_lib_magic (AFB_session *session)
+{
+ /* MAGIC_MIME tells magic to return a mime of the file, but you can specify different things */
+ if (verbose)
+ printf("Loading mimetype default magic database\n");
-PUBLIC AFB_error httpdStart(AFB_session *session) {
-
- // compute fixed URL length at startup time
- apiUrlLen = strlen (session->config->rootapi);
- baseUrlLen= strlen (session->config->rootbase);
- rootUrlLen= strlen (session->config->rootdir);
-
- // Initialise Client Session Hash Table
- ctxStoreInit (CTX_NBCLIENTS);
-
- // TBD open libmagic cache [fail to pass EFENCE check]
- // initLibMagic (session);
-
-
- if (verbose) {
- 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);
- }
-
- session->httpd = (void*) MHD_start_daemon(
- MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, // use request and not threads
- session->config->httpdPort, // port
- &newClient, NULL, // Tcp Accept call back + extra attribute
- &newRequest, session, // Http Request Call back + extra attribute
- MHD_OPTION_NOTIFY_COMPLETED, &endRequest, NULL,
- MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 15, MHD_OPTION_END); // 15s + options-end
- // TBD: MHD_OPTION_SOCK_ADDR
-
- if (session->httpd == NULL) {
- printf("Error: httpStart invalid httpd port: %d", session->config->httpdPort);
- return AFB_FATAL;
- }
- return AFB_SUCCESS;
+ session->magic = magic_open(MAGIC_MIME_TYPE);
+ if (session->magic == NULL) {
+ fprintf(stderr,"ERROR: unable to initialize magic library\n");
+ return 0;
+ }
+
+ /* Warning: should not use NULL for DB [libmagic bug wont pass efence check] */
+ if (magic_load(session->magic, MAGIC_DB) != 0) {
+ fprintf(stderr,"cannot load magic database - %s\n", magic_error(session->magic));
+/*
+ magic_close(session->magic);
+ session->magic = NULL;
+ return 0;
+*/
+ }
+
+ return 1;
+}
+#endif
+
+AFB_error httpdStart(AFB_session * session)
+{
+
+ if (!my_default_init(session)) {
+ printf("Error: initialisation of httpd failed");
+ return AFB_FATAL;
+ }
+
+#if defined(USE_MAGIC_MIME_TYPE)
+ /*TBD open libmagic cache [fail to pass EFENCE check (allocating 0 bytes)] */
+ init_lib_magic (session);
+#endif
+
+ if (verbose) {
+ 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);
+ }
+
+ session->httpd = MHD_start_daemon(
+ MHD_USE_EPOLL_LINUX_ONLY | MHD_USE_TCP_FASTOPEN | MHD_USE_DEBUG | MHD_USE_SUSPEND_RESUME,
+ (uint16_t) session->config->httpdPort, /* port */
+ new_client_handler, NULL, /* Tcp Accept call back + extra attribute */
+ access_handler, session, /* Http Request Call back + extra attribute */
+ MHD_OPTION_NOTIFY_COMPLETED, end_handler, session,
+ MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int)15, /* 15 seconds */
+ MHD_OPTION_END); /* options-end */
+
+ if (session->httpd == NULL) {
+ printf("Error: httpStart invalid httpd port: %d", session->config->httpdPort);
+ return AFB_FATAL;
+ }
+ return AFB_SUCCESS;
}
-// infinite loop
-PUBLIC AFB_error httpdLoop(AFB_session *session) {
- static int count = 0;
-
- if (verbose) fprintf(stderr, "AFB:notice entering httpd waiting loop\n");
- if (session->foreground) {
-
- while (TRUE) {
- fprintf(stderr, "AFB:notice Use Ctrl-C to quit\n");
- (void) getc(stdin);
- }
- } else {
- while (TRUE) {
- sleep(3600);
- if (verbose) fprintf(stderr, "AFB:notice httpd alive [%d]\n", count++);
- }
- }
-
- // should never return from here
- return AFB_FATAL;
+/* infinite loop */
+AFB_error httpdLoop(AFB_session * session)
+{
+ int count = 0;
+ const union MHD_DaemonInfo *info;
+ struct pollfd pfd;
+
+ info = MHD_get_daemon_info(session->httpd, MHD_DAEMON_INFO_EPOLL_FD_LINUX_ONLY);
+ if (info == NULL) {
+ printf("Error: httpLoop no pollfd");
+ goto error;
+ }
+ pfd.fd = info->listen_fd;
+ pfd.events = POLLIN;
+
+ if (verbose)
+ fprintf(stderr, "AFB:notice entering httpd waiting loop\n");
+ while (TRUE) {
+ if (verbose)
+ fprintf(stderr, "AFB:notice httpd alive [%d]\n", count++);
+ poll(&pfd, 1, 15000); /* 15 seconds (as above timeout when starting) */
+ MHD_run(session->httpd);
+ }
+
+ error:
+ /* should never return from here */
+ return AFB_FATAL;
}
-PUBLIC int httpdStatus(AFB_session *session) {
- return (MHD_run(session->httpd));
+int httpdStatus(AFB_session * session)
+{
+ return MHD_run(session->httpd);
}
-PUBLIC void httpdStop(AFB_session *session) {
- MHD_stop_daemon(session->httpd);
+void httpdStop(AFB_session * session)
+{
+ MHD_stop_daemon(session->httpd);
}