Use upgrade abitlity of libmicrohttpd

[src/app-framework-binder.git] / src / afb-hsrv.c

diff --git a/src/afb-hsrv.c b/src/afb-hsrv.c
index 56509c3..87895a7 100644 (file)
--- a/src/afb-hsrv.c
+++ b/src/afb-hsrv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 "IoT.bzh"
+ * Copyright (C) 2016, 2017 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,6 +31,7 @@
 
 #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>
@@ -39,8 +40,6 @@
 
 #include "afb-common.h"
 
-
-
 #define JSON_CONTENT  "application/json"
 #define FORM_CONTENT  MHD_HTTP_POST_ENCODING_MULTIPART_FORMDATA
 
@@ -68,8 +67,6 @@ struct afb_hsrv {
        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);
@@ -118,25 +115,22 @@ static int access_handler(
                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;
@@ -153,12 +147,15 @@ static int access_handler(
                                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) {
                                return MHD_YES;
                         } else {
+                               WARNING("Unsupported media type %s", type);
                                afb_hreq_reply_error(hreq, MHD_HTTP_UNSUPPORTED_MEDIA_TYPE);
                                return MHD_YES;
                        }
@@ -169,6 +166,7 @@ static int access_handler(
        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;
                        }
@@ -187,6 +185,7 @@ static int access_handler(
                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;
                }
@@ -219,6 +218,7 @@ static int access_handler(
        }
 
        /* no handler */
+       WARNING("Unhandled request to %s", hreq->url);
        afb_hreq_reply_error(hreq, MHD_HTTP_NOT_FOUND);
        return MHD_YES;
 }
@@ -230,9 +230,9 @@ static void end_handler(void *cls, struct MHD_Connection *connection, void **rec
        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)
@@ -397,7 +397,7 @@ int afb_hsrv_start(struct afb_hsrv *hsrv, uint16_t port, unsigned int connection
        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_USE_SUSPEND_RESUME,
                port,                           /* port */
                new_client_handler, NULL,       /* Tcp Accept call back + extra attribute */
                access_handler, hsrv,   /* Http Request Call back + extra attribute */