X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hreq.c;h=6b7d64be28ef02c7140d2b5f0534aa9895b3f699;hb=f262b0f726ac0577f40525038b779185f144873f;hp=93cce62b67dc21b9ba9da0afd18e60fc0f532ae2;hpb=abbe8f79355cc7aa2ef906c626c1a43ea4762d88;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-hreq.c b/src/afb-hreq.c
index 93cce62b..6b7d64be 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[] = "";
 
@@ -81,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)
@@ -149,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 *);
@@ -161,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, ...)
@@ -584,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)
@@ -654,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);
 }