first add of asynchonous handling

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

diff --git a/src/afb-hreq.c b/src/afb-hreq.c
index d1ba0c1..6b7d64b 100644 (file)
--- a/src/afb-hreq.c
+++ b/src/afb-hreq.c
@@ -39,7 +39,7 @@
 #include "session.h"
 #include "verbose.h"
 
-#define SIZE_RESPONSE_BUFFER   8000
+#define SIZE_RESPONSE_BUFFER   8192
 
 static char empty_string[] = "";
 
@@ -152,6 +152,10 @@ static void afb_hreq_reply_v(struct afb_hreq *hreq, unsigned status, struct MHD_
 {
        char *cookie;
        const char *k, *v;
+
+       if (hreq->replied != 0)
+               return;
+
        k = va_arg(args, const char *);
        while (k != NULL) {
                v = va_arg(args, const char *);
@@ -164,6 +168,14 @@ static void afb_hreq_reply_v(struct afb_hreq *hreq, unsigned status, struct MHD_
        }
        MHD_queue_response(hreq->connection, status, response);
        MHD_destroy_response(response);
+
+       hreq->replied = 1;
+       if (hreq->suspended != 0) {
+               extern void run_micro_httpd(struct afb_hsrv *hsrv);
+               MHD_resume_connection (hreq->connection);
+               hreq->suspended = 0;
+               run_micro_httpd(hreq->hsrv);
+       }
 }
 
 void afb_hreq_reply(struct afb_hreq *hreq, unsigned status, struct MHD_Response *response, ...)
@@ -657,7 +669,7 @@ static void req_send(struct afb_hreq *hreq, char *buffer, size_t size)
 static ssize_t send_json_cb(json_object *obj, uint64_t pos, char *buf, size_t max)
 {
        ssize_t len = stpncpy(buf, json_object_to_json_string(obj)+pos, max) - buf;
-       return len ? : -1;
+       return len ? : (ssize_t)MHD_CONTENT_READER_END_OF_STREAM;
 }
 
 static void req_reply(struct afb_hreq *hreq, unsigned retcode, const char *status, const char *info, json_object *resp)
@@ -673,8 +685,7 @@ static void req_reply(struct afb_hreq *hreq, unsigned retcode, const char *statu
                uuid = hreq->context->uuid;
        }
        reply = afb_msg_json_reply(status, info, resp, token, uuid);
-
-       response = MHD_create_response_from_callback(MHD_SIZE_UNKNOWN, SIZE_RESPONSE_BUFFER, (void*)send_json_cb, reply, (void*)json_object_put);
+       response = MHD_create_response_from_callback((uint64_t)strlen(json_object_to_json_string(reply)), SIZE_RESPONSE_BUFFER, (void*)send_json_cb, reply, (void*)json_object_put);
        afb_hreq_reply(hreq, retcode, response, NULL);
 }