X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-msg-json.c;h=b4ae51b44a5a2b6e5c95095284f1e0e7323f185f;hb=9fe2dfd3c4df334607083f989346090e1051a565;hp=dc096ac5cb88036f1ce78afa91ae27f4deae9cdc;hpb=694e6000719d2d003c3046683347f9388d5fb708;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-msg-json.c b/src/afb-msg-json.c
index dc096ac5..b4ae51b4 100644
--- a/src/afb-msg-json.c
+++ b/src/afb-msg-json.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 IoT.bzh
+ * Copyright (C) 2016, 2017 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,43 +17,104 @@
 
 #define _GNU_SOURCE
 
-#include <json.h>
+#include <json-c/json.h>
+
+#include <afb/afb-req-itf.h>
 
 #include "afb-msg-json.h"
+#include "afb-context.h"
 
 
-struct json_object *afb_msg_json_reply(const char *status, const char *info, struct json_object *resp, const char *token, const char *uuid)
+struct json_object *afb_msg_json_reply(const char *status, const char *info, struct json_object *resp, struct afb_context *context, const char *reqid)
 {
 	json_object *msg, *request;
+	const char *token, *uuid;
+	static json_object *type_reply = NULL;
+
+	msg = json_object_new_object();
+	if (resp != NULL)
+		json_object_object_add(msg, "response", resp);
+
+	if (type_reply == NULL)
+		type_reply = json_object_new_string("afb-reply");
+	json_object_object_add(msg, "jtype", json_object_get(type_reply));
 
 	request = json_object_new_object();
+	json_object_object_add(msg, "request", request);
 	json_object_object_add(request, "status", json_object_new_string(status));
+
 	if (info != NULL)
 		json_object_object_add(request, "info", json_object_new_string(info));
-	if (token != NULL)
-		json_object_object_add(request, "token", json_object_new_string(token));
-	if (uuid != NULL)
-		json_object_object_add(request, "uuid", json_object_new_string(uuid));
 
-	msg = json_object_new_object();
-	json_object_object_add(msg, "jtype", json_object_new_string("afb-reply"));
-	json_object_object_add(msg, "request", request);
-	if (resp != NULL)
-		json_object_object_add(msg, "response", resp);
+	if (reqid != NULL)
+		json_object_object_add(request, "reqid", json_object_new_string(reqid));
+
+	if (context != NULL) {
+		token = afb_context_sent_token(context);
+		if (token != NULL)
+			json_object_object_add(request, "token", json_object_new_string(token));
+
+		uuid = afb_context_sent_uuid(context);
+		if (uuid != NULL)
+			json_object_object_add(request, "uuid", json_object_new_string(uuid));
+	}
 
 	return msg;
 }
 
+struct json_object *afb_msg_json_reply_ok(const char *info, struct json_object *resp, struct afb_context *context, const char *reqid)
+{
+	return afb_msg_json_reply("success", info, resp, context, reqid);
+}
+
+struct json_object *afb_msg_json_reply_error(const char *status, const char *info, struct afb_context *context, const char *reqid)
+{
+	return afb_msg_json_reply(status, info, NULL, context, reqid);
+}
+
 struct json_object *afb_msg_json_event(const char *event, struct json_object *object)
 {
 	json_object *msg;
+	static json_object *type_event = NULL;
 
 	msg = json_object_new_object();
-	json_object_object_add(msg, "jtype", json_object_new_string("afb-event"));
+
 	json_object_object_add(msg, "event", json_object_new_string(event));
+
 	if (object != NULL)
 		json_object_object_add(msg, "data", object);
 
+	if (type_event == NULL)
+		type_event = json_object_new_string("afb-event");
+	json_object_object_add(msg, "jtype", json_object_get(type_event));
+
 	return msg;
 }
 
+struct afb_arg afb_msg_json_get_arg(struct json_object *object, const char *name)
+{
+	struct afb_arg arg;
+	struct json_object *value;
+
+	if (json_object_object_get_ex(object, name, &value)) {
+		arg.name = name;
+		arg.value = json_object_get_string(value);
+	} else {
+		arg.name = NULL;
+		arg.value = NULL;
+	}
+	arg.path = NULL;
+	return arg;
+}
+
+struct json_object *afb_msg_json_internal_error()
+{
+	static struct json_object *obj;
+
+	if (obj == NULL)
+		obj = afb_msg_json_reply_error("failed", "internal error", NULL, NULL);
+
+	return obj;
+}
+
+