X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hreq.c;h=cc12da59713e0a06704c1a71bb0f54ef597824ee;hb=6b9b3b16ac738f99bddde3d7d375f9986bb1c09a;hp=72b90504594806941d103f8bf57038453423903b;hpb=46d9538587a3521caa1e3b20bf337a53ed400777;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-hreq.c b/src/afb-hreq.c
index 72b90504..cc12da59 100644
--- 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[] = "";
 
@@ -67,7 +68,7 @@ static struct afb_arg req_get(struct afb_hreq *hreq, const char *name);
 static void req_fail(struct afb_hreq *hreq, const char *status, const char *info);
 static void req_success(struct afb_hreq *hreq, json_object *obj, const char *info);
 static const char *req_raw(struct afb_hreq *hreq, size_t *size);
-static void req_send(struct afb_hreq *hreq, char *buffer, size_t size);
+static void req_send(struct afb_hreq *hreq, const char *buffer, size_t size);
 static int req_session_create(struct afb_hreq *hreq);
 static int req_session_check(struct afb_hreq *hreq, int refresh);
 static void req_session_close(struct afb_hreq *hreq);
@@ -151,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 *);
@@ -163,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, ...)
@@ -181,19 +194,19 @@ void afb_hreq_reply_empty(struct afb_hreq *hreq, unsigned status, ...)
 	va_end(args);
 }
 
-void afb_hreq_reply_static(struct afb_hreq *hreq, unsigned status, size_t size, char *buffer, ...)
+void afb_hreq_reply_static(struct afb_hreq *hreq, unsigned status, size_t size, const char *buffer, ...)
 {
 	va_list args;
 	va_start(args, buffer);
-	afb_hreq_reply_v(hreq, status, MHD_create_response_from_buffer((unsigned)size, buffer, MHD_RESPMEM_PERSISTENT), args);
+	afb_hreq_reply_v(hreq, status, MHD_create_response_from_buffer((unsigned)size, (char*)buffer, MHD_RESPMEM_PERSISTENT), args);
 	va_end(args);
 }
 
-void afb_hreq_reply_copy(struct afb_hreq *hreq, unsigned status, size_t size, char *buffer, ...)
+void afb_hreq_reply_copy(struct afb_hreq *hreq, unsigned status, size_t size, const char *buffer, ...)
 {
 	va_list args;
 	va_start(args, buffer);
-	afb_hreq_reply_v(hreq, status, MHD_create_response_from_buffer((unsigned)size, buffer, MHD_RESPMEM_MUST_COPY), args);
+	afb_hreq_reply_v(hreq, status, MHD_create_response_from_buffer((unsigned)size, (char*)buffer, MHD_RESPMEM_MUST_COPY), args);
 	va_end(args);
 }
 
@@ -648,7 +661,7 @@ static const char *req_raw(struct afb_hreq *hreq, size_t *size)
 	return result;
 }
 
-static void req_send(struct afb_hreq *hreq, char *buffer, size_t size)
+static void req_send(struct afb_hreq *hreq, const char *buffer, size_t size)
 {
 	afb_hreq_reply_free(hreq, MHD_HTTP_OK, size, buffer, NULL);
 }
@@ -656,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);
 }