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 8a0b280..6b7d64b 100644 (file)
--- a/src/afb-hreq.c
+++ b/src/afb-hreq.c
@@ -34,11 +34,12 @@
 
 #include "afb-method.h"
 #include "afb-req-itf.h"
+#include "afb-msg-json.h"
 #include "afb-hreq.h"
 #include "session.h"
 #include "verbose.h"
 
-#define SIZE_RESPONSE_BUFFER   8000
+#define SIZE_RESPONSE_BUFFER   8192
 
 static char empty_string[] = "";
 
@@ -52,6 +53,7 @@ static const char token_cookie[] = "token";
 
 static char *cookie_name = NULL;
 static char *cookie_setter = NULL;
+static char *tmp_pattern = NULL;
 
 struct hreq_data {
        struct hreq_data *next;
@@ -80,7 +82,9 @@ static const struct afb_req_itf afb_hreq_itf = {
        .send = (void*)req_send,
        .session_create = (void*)req_session_create,
        .session_check = (void*)req_session_check,
-       .session_close = (void*)req_session_close
+       .session_close = (void*)req_session_close,
+       .context_get = (void*)afb_context_get,
+       .context_set = (void*)afb_context_set
 };
 
 static struct hreq_data *get_data(struct afb_hreq *hreq, const char *key, int create)
@@ -148,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 *);
@@ -160,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, ...)
@@ -492,12 +508,53 @@ int afb_hreq_post_add(struct afb_hreq *hreq, const char *key, const char *data,
        return 1;
 }
 
+int afb_hreq_init_download_path(const char *directory)
+{
+       struct stat st;
+       size_t n;
+       char *p;
+
+       if (access(directory, R_OK|W_OK)) {
+               /* no read/write access */
+               return -1;
+       }
+       if (stat(directory, &st)) {
+               /* can't get info */
+               return -1;
+       }
+       if (!S_ISDIR(st.st_mode)) {
+               /* not a directory */
+               errno = ENOTDIR;
+               return -1;
+       }
+       n = strlen(directory);
+       while(n > 1 && directory[n-1] == '/') n--;
+       p = malloc(n + 8);
+       if (p == NULL) {
+               /* can't allocate memory */
+               errno = ENOMEM;
+               return -1;
+       }
+       memcpy(p, directory, n);
+       p[n++] = '/';
+       p[n++] = 'X';
+       p[n++] = 'X';
+       p[n++] = 'X';
+       p[n++] = 'X';
+       p[n++] = 'X';
+       p[n++] = 'X';
+       p[n] = 0;
+       free(tmp_pattern);
+       tmp_pattern = p;
+       return 0;
+}
+
 static int opentempfile(char **path)
 {
        int fd;
        char *fname;
 
-       fname = strdup("XXXXXX"); /* TODO improve the path */
+       fname = strdup(tmp_pattern ? : "XXXXXX"); /* TODO improve the path */
        if (fname == NULL)
                return -1;
 
@@ -542,7 +599,7 @@ int afb_hreq_post_add_file(struct afb_hreq *hreq, const char *key, const char *f
 
 struct afb_req afb_hreq_to_req(struct afb_hreq *hreq)
 {
-       return (struct afb_req){ .itf = &afb_hreq_itf, .data = hreq };
+       return (struct afb_req){ .itf = &afb_hreq_itf, .req_closure = hreq };
 }
 
 static struct afb_arg req_get(struct afb_hreq *hreq, const char *name)
@@ -612,29 +669,23 @@ 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)
 {
-       json_object *root, *request;
+       struct json_object *reply;
+       const char *token, *uuid;
        struct MHD_Response *response;
 
-       root = json_object_new_object();
-       json_object_object_add(root, "jtype", json_object_new_string("afb-reply"));
-       request = json_object_new_object();
-       json_object_object_add(root, "request", request);
-       json_object_object_add(request, "status", json_object_new_string(status));
-       if (info)
-               json_object_object_add(request, "info", json_object_new_string(info));
-       if (resp)
-               json_object_object_add(root, "response", resp);
-       if (hreq->context) {
-               json_object_object_add(request, uuid_arg, json_object_new_string(hreq->context->uuid));
-               json_object_object_add(request, token_arg, json_object_new_string(hreq->context->token));
+       if (hreq->context == NULL) {
+               token = uuid = NULL;
+       } else {
+               token = hreq->context->token;
+               uuid = hreq->context->uuid;
        }
-
-       response = MHD_create_response_from_callback(MHD_SIZE_UNKNOWN, SIZE_RESPONSE_BUFFER, (void*)send_json_cb, root, (void*)json_object_put);
+       reply = afb_msg_json_reply(status, info, resp, token, uuid);
+       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);
 }