X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=cli.c;h=6382a6c63341f97406ab5d649c9563271c1c0736;hp=22fa7683bc401e28694777c532cbc8e188fe5ca8;hb=4ae1159f62958a386865ec2213f5f84b7220e4d8;hpb=f87a9dc69e6f47a047311544d693eef739e20806

diff --git a/cli.c b/cli.c
index 22fa768..6382a6c 100644
--- a/cli.c
+++ b/cli.c
@@ -1,5 +1,85 @@
+#include <json/json.h>
 #include "libubus.h"
 
+static struct blob_buf b;
+
+
+static bool blobmsg_add_element(struct blob_buf *b, const char *name, json_object *obj);
+
+static bool blobmsg_add_object(struct blob_buf *b, json_object *obj)
+{
+	json_object_object_foreach(obj, key, val) {
+		if (!blobmsg_add_element(b, key, val))
+			return false;
+	}
+	return true;
+}
+
+static bool blobmsg_add_array(struct blob_buf *b, struct array_list *a)
+{
+	int i, len;
+
+	for (i = 0, len = array_list_length(a); i < len; i++) {
+		if (!blobmsg_add_element(b, NULL, array_list_get_idx(a, i)))
+			return false;
+	}
+
+	return true;
+}
+
+static bool blobmsg_add_element(struct blob_buf *b, const char *name, json_object *obj)
+{
+	bool ret = true;
+	void *c;
+
+	if (!obj)
+		return false;
+
+	switch (json_object_get_type(obj)) {
+	case json_type_object:
+		c = blobmsg_open_table(b, name);
+		ret = blobmsg_add_object(b, obj);
+		blobmsg_close_table(b, c);
+		break;
+	case json_type_array:
+		c = blobmsg_open_array(b, name);
+		ret = blobmsg_add_array(b, json_object_get_array(obj));
+		blobmsg_close_array(b, c);
+		break;
+	case json_type_string:
+		blobmsg_add_string(b, name, json_object_get_string(obj));
+		break;
+	case json_type_boolean:
+		blobmsg_add_u8(b, name, json_object_get_boolean(obj));
+		break;
+	case json_type_int:
+		blobmsg_add_u32(b, name, json_object_get_int(obj));
+		break;
+	default:
+		return false;
+	}
+	return ret;
+}
+
+static bool blobmsg_from_json(struct blob_buf *b, const char *str)
+{
+	json_object *obj;
+	bool ret = false;
+
+	obj = json_tokener_parse(str);
+	if (is_error(obj))
+		return false;
+
+	if (json_object_get_type(obj) != json_type_object)
+		goto out;
+
+	ret = blobmsg_add_object(b, obj);
+
+out:
+	json_object_put(obj);
+	return ret;
+}
+
 static void receive_lookup(struct ubus_context *ctx, struct ubus_object_data *obj, void *priv)
 {
 	struct blob_attr *cur;
@@ -20,10 +100,13 @@ static void receive_lookup(struct ubus_context *ctx, struct ubus_object_data *ob
 
 static void receive_data(struct ubus_request *req, int type, struct blob_attr *msg)
 {
+	char *str;
 	if (!msg)
 		return;
 
-	fprintf(stderr, "%s\n", blobmsg_format_json(msg, true));
+	str = blobmsg_format_json(msg, true);
+	fprintf(stderr, "%s\n", str);
+	free(str);
 }
 
 
@@ -39,12 +122,29 @@ static int usage(char *prog)
 	return 1;
 }
 
+static void receive_event(struct ubus_context *ctx, struct ubus_event_handler *ev,
+			  const char *type, struct blob_attr *msg)
+{
+	char *str;
+
+	if (msg)
+		str = blobmsg_format_json(msg, true);
+	else
+		str = "";
+
+	fprintf(stderr, "\"%s\":{ %s }\n", type, str);
+	free(str);
+}
+
 static int ubus_cli_listen(struct ubus_context *ctx, int argc, char **argv)
 {
-	static struct ubus_object listener;
+	static struct ubus_event_handler listener;
 	const char *event;
 	int ret = 0;
 
+	memset(&listener, 0, sizeof(listener));
+	listener.cb = receive_event;
+
 	if (!argc) {
 		event = "*";
 		ret = ubus_register_event_handler(ctx, &listener, NULL);
@@ -74,7 +174,7 @@ int main(int argc, char **argv)
 {
 	static struct ubus_context *ctx;
 	char *cmd;
-	int ret;
+	int ret = 0;
 
 	ctx = ubus_connect(NULL);
 	if (!ctx) {
@@ -99,9 +199,15 @@ int main(int argc, char **argv)
 		if (argc < 4 || argc > 5)
 			return usage(argv[0]);
 
+		blob_buf_init(&b, 0);
+		if (argc == 5 && !blobmsg_from_json(&b, argv[4])) {
+			fprintf(stderr, "Failed to parse message data\n");
+			goto out;
+		}
+
 		ret = ubus_lookup_id(ctx, argv[2], &id);
 		if (!ret)
-			ret = ubus_invoke(ctx, id, argv[3], NULL, receive_data, NULL);
+			ret = ubus_invoke(ctx, id, argv[3], b.head, receive_data, NULL);
 	} else if (!strcmp(cmd, "listen")) {
 		ret = ubus_cli_listen(ctx, argc - 2, argv + 2);
 	} else {
@@ -111,6 +217,7 @@ int main(int argc, char **argv)
 	if (ret)
 		fprintf(stderr, "Failed: %s\n", ubus_strerror(ret));
 
+out:
 	ubus_free(ctx);
 	return ret;
 }