X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hreq.c;h=1e38b412f478d5889c39b815a759349c855f1734;hb=7e0abe76db7b90369429bf387d7aad0fb5a42328;hp=a325fd4f938a372c53fbc12339465daf20b3542e;hpb=a4487d8a46d3e4400bf73ce817fa1a34cde31a6f;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-hreq.c b/src/afb-hreq.c
index a325fd4f..1e38b412 100644
--- a/src/afb-hreq.c
+++ b/src/afb-hreq.c
@@ -74,8 +74,9 @@ 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, const char *buffer, size_t size);
+static int req_subscribe_unsubscribe_error(struct afb_hreq *hreq, struct afb_event event);
 
-static const struct afb_req_itf afb_hreq_itf = {
+const struct afb_req_itf afb_hreq_req_itf = {
 	.json = (void*)req_json,
 	.get = (void*)req_get,
 	.success = (void*)req_success,
@@ -87,7 +88,9 @@ static const struct afb_req_itf afb_hreq_itf = {
 	.addref = (void*)afb_hreq_addref,
 	.unref = (void*)afb_hreq_unref,
 	.session_close = (void*)afb_context_close,
-	.session_set_LOA = (void*)afb_context_change_loa
+	.session_set_LOA = (void*)afb_context_change_loa,
+	.subscribe = (void*)req_subscribe_unsubscribe_error,
+	.unsubscribe = (void*)req_subscribe_unsubscribe_error
 };
 
 static struct hreq_data *get_data(struct afb_hreq *hreq, const char *key, int create)
@@ -359,7 +362,7 @@ int afb_hreq_reply_file_if_exist(struct afb_hreq *hreq, int dirfd, const char *f
 	int fd;
 	unsigned int status;
 	struct stat st;
-	char etag[1 + 2 * sizeof(int)];
+	char etag[1 + 2 * 8];
 	const char *inm;
 	struct MHD_Response *response;
 	const char *mimetype;
@@ -697,7 +700,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, .closure = hreq };
+	return (struct afb_req){ .itf = &afb_hreq_req_itf, .closure = hreq };
 }
 
 static struct afb_arg req_get(struct afb_hreq *hreq, const char *name)
@@ -774,20 +777,15 @@ static ssize_t send_json_cb(json_object *obj, uint64_t pos, char *buf, size_t ma
 
 static void req_reply(struct afb_hreq *hreq, unsigned retcode, const char *status, const char *info, json_object *resp)
 {
-	struct json_object *reply, *request;
-	const char *token, *uuid, *reqid;
+	struct json_object *reply;
+	const char *reqid;
 	struct MHD_Response *response;
 
-	token = afb_context_sent_token(&hreq->context);
-	uuid = afb_context_sent_uuid(&hreq->context);
-
-	reply = afb_msg_json_reply(status, info, resp, token, uuid);
-
 	reqid = afb_hreq_get_argument(hreq, long_key_for_reqid);
 	if (reqid == NULL)
 		reqid = afb_hreq_get_argument(hreq, short_key_for_reqid);
-	if (reqid != NULL && json_object_object_get_ex(reply, "request", &request))
-		json_object_object_add (request, short_key_for_reqid, json_object_new_string(reqid));
+
+	reply = afb_msg_json_reply(status, info, resp, &hreq->context, reqid);
 
 	response = MHD_create_response_from_callback((uint64_t)strlen(json_object_to_json_string_ext(reply, JSON_C_TO_STRING_PLAIN)), SIZE_RESPONSE_BUFFER, (void*)send_json_cb, reply, (void*)json_object_put);
 	afb_hreq_reply(hreq, retcode, response, NULL);
@@ -803,6 +801,12 @@ static void req_success(struct afb_hreq *hreq, json_object *obj, const char *inf
 	req_reply(hreq, MHD_HTTP_OK, "success", info, obj);
 }
 
+static int req_subscribe_unsubscribe_error(struct afb_hreq *hreq, struct afb_event event)
+{
+	errno = EINVAL;
+	return -1;
+}
+
 int afb_hreq_init_context(struct afb_hreq *hreq)
 {
 	const char *uuid;