X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fhttp-svc.c;h=71e0a08f95c4823f4485c359552ebbdb6cb69e83;hb=c2560bd51498fb38e645b60ae638e2e888c74b65;hp=839fc2ffc9620d13270b69d697841fab3b0391dc;hpb=c4ec16f3868b099f2904b54be78bcd09d3760a24;p=src%2Fapp-framework-binder.git

diff --git a/src/http-svc.c b/src/http-svc.c
index 839fc2ff..71e0a08f 100644
--- a/src/http-svc.c
+++ b/src/http-svc.c
@@ -29,22 +29,18 @@
    POST https://www.gnu.org/software/libmicrohttpd/manual/html_node/microhttpd_002dpost.html#microhttpd_002dpost
  */
 
+#define _GNU_SOURCE
 
 #include <microhttpd.h>
 
+#include <poll.h>
 #include <sys/stat.h>
 #include "../include/local-def.h"
 
 // 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;
+static size_t apiUrlLen=0;
+static size_t baseUrlLen=0;
+static size_t rootUrlLen=0;
 
 // try to open libmagic to handle mime types
 static AFB_error initLibMagic (AFB_session *session) {
@@ -78,18 +74,17 @@ static void endRequest (void *cls, struct MHD_Connection *connection, void **con
 
 
 // Create check etag value
-STATIC void computeEtag(char *etag, int maxlen, struct stat *sbuf) {
-    int time;
+STATIC void computeEtag(char *etag, size_t maxlen, struct stat *sbuf) {
+    long time;
     time = sbuf->st_mtim.tv_sec;
-    snprintf(etag, maxlen, "%d", time);
+    snprintf(etag, maxlen, "%ld", time);
 }
 
 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 MHD_Response *response = NULL;
     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));
@@ -167,8 +162,6 @@ abortRequest:
 // 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) {
 
-    int fd;
-    int ret;
     struct MHD_Response *response;
     AFB_staticfile staticfile;
 
@@ -186,7 +179,7 @@ STATIC int redirectHTML5(struct MHD_Connection *connection, AFB_session *session
 
 // 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;
+    int ret, idx;
     AFB_staticfile staticfile;
     char *requestdir, *requesturl;
    
@@ -262,7 +255,7 @@ STATIC int newClient(void *cls, const struct sockaddr * addr, socklen_t addrlen)
 
 
 PUBLIC AFB_error httpdStart(AFB_session *session) {
-    
+
     // compute fixed URL length at startup time
     apiUrlLen = strlen (session->config->rootapi);
     baseUrlLen= strlen (session->config->rootbase);
@@ -281,12 +274,16 @@ PUBLIC AFB_error httpdStart(AFB_session *session) {
     }
 
     session->httpd = (void*) MHD_start_daemon(
-            MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG, // use request and not threads
-            session->config->httpdPort, // port
+                MHD_USE_EPOLL_LINUX_ONLY
+                | MHD_USE_TCP_FASTOPEN
+                | MHD_USE_DEBUG
+              ,
+            (uint16_t)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
+            MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 15, // 15 seconds
+            MHD_OPTION_END); // options-end
     // TBD: MHD_OPTION_SOCK_ADDR
 
     if (session->httpd == NULL) {
@@ -299,12 +296,26 @@ PUBLIC AFB_error httpdStart(AFB_session *session) {
 // infinite loop
 PUBLIC 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) {
-        sleep(3600);
         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;
 }