X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=cli.c;h=2d30fc527712b8c99a96db737ae5724ee98dbc9f;hp=59e62edfcb08917f862cdab3dbb890ea2d988aef;hb=5e78a8012819ef92a8e60523ced9207d8a6b016f;hpb=fa989780bda3ad10fcbb637390d59afe2b32ba81

diff --git a/cli.c b/cli.c
index 59e62ed..2d30fc5 100644
--- a/cli.c
+++ b/cli.c
@@ -1,5 +1,32 @@
+#include <unistd.h>
+
+#include <libubox/blobmsg_json.h>
 #include "libubus.h"
 
+static struct blob_buf b;
+
+static const char * const attr_types[] = {
+	[BLOBMSG_TYPE_INT32] = "\"Integer\"",
+	[BLOBMSG_TYPE_STRING] = "\"String\"",
+};
+
+static const char *format_type(void *priv, struct blob_attr *attr)
+{
+	const char *type = NULL;
+	int typeid;
+
+	if (blob_id(attr) != BLOBMSG_TYPE_INT32)
+		return NULL;
+
+	typeid = blobmsg_get_u32(attr);
+	if (typeid < ARRAY_SIZE(attr_types))
+		type = attr_types[typeid];
+	if (!type)
+		type = "\"(unknown)\"";
+
+	return type;
+}
+
 static void receive_lookup(struct ubus_context *ctx, struct ubus_object_data *obj, void *priv)
 {
 	struct blob_attr *cur;
@@ -12,7 +39,7 @@ static void receive_lookup(struct ubus_context *ctx, struct ubus_object_data *ob
 		return;
 
 	blob_for_each_attr(cur, obj->signature, rem) {
-		s = blobmsg_format_json(cur, false);
+		s = blobmsg_format_json_with_cb(cur, false, format_type, NULL);
 		fprintf(stderr, "\t%s\n", s);
 		free(s);
 	}
@@ -20,17 +47,71 @@ 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);
+}
+
+
+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_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);
+	}
+
+	for (;argc;argv++, argc--) {
+		event = argv[0];
+		ret = ubus_register_event_handler(ctx, &listener, argv[0]);
+		if (ret)
+			break;
+	}
+
+	if (ret) {
+		fprintf(stderr, "Error while registering for event '%s': %s\n",
+			event, ubus_strerror(ret));
+	}
 
-static int usage(char *prog)
+	uloop_init();
+	ubus_add_uloop(ctx);
+	uloop_run();
+	uloop_done();
+
+	return 0;
+}
+
+static int usage(const char *prog)
 {
 	fprintf(stderr,
-		"Usage: %s <command> [arguments...]\n"
+		"Usage: %s [<options>] <command> [arguments...]\n"
+		"Options:\n"
+		" -s <socket>:		Set the unix domain socket to connect to\n"
+		"\n"
 		"Commands:\n"
 		" - list [<path>]			List objects\n"
 		" - call <path> <method> [<message>]	Call an object method\n"
@@ -41,45 +122,72 @@ static int usage(char *prog)
 
 int main(int argc, char **argv)
 {
+	const char *progname, *ubus_socket = NULL;
 	static struct ubus_context *ctx;
 	char *cmd;
-	int ret;
+	int ret = 0;
+	int ch;
+
+	progname = argv[0];
+
+	while ((ch = getopt(argc, argv, "s:")) != -1) {
+		switch (ch) {
+		case 's':
+			ubus_socket = optarg;
+			break;
+		default:
+			return usage(progname);
+		}
+	}
 
-	ctx = ubus_connect(NULL);
+	argc -= optind;
+	argv += optind;
+
+	ctx = ubus_connect(ubus_socket);
 	if (!ctx) {
 		fprintf(stderr, "Failed to connect to ubus\n");
 		return -1;
 	}
 
-	cmd = argv[1];
-	if (argc < 2)
-		return usage(argv[0]);
+	cmd = argv[0];
+	if (argc < 1)
+		return usage(progname);
+
+	argv++;
+	argc--;
 
 	if (!strcmp(cmd, "list")) {
 		const char *path = NULL;
 
-		if (argc == 3)
-			path = argv[2];
+		if (argc == 1)
+			path = argv[0];
 
 		ret = ubus_lookup(ctx, path, receive_lookup, NULL);
 	} else if (!strcmp(cmd, "call")) {
 		uint32_t id;
 
-		if (argc < 4 || argc > 5)
-			return usage(argv[0]);
+		if (argc < 2 || argc > 3)
+			return usage(progname);
+
+		blob_buf_init(&b, 0);
+		if (argc == 3 && !blobmsg_add_json_from_string(&b, argv[2])) {
+			fprintf(stderr, "Failed to parse message data\n");
+			goto out;
+		}
 
-		ret = ubus_lookup_id(ctx, argv[2], &id);
+		ret = ubus_lookup_id(ctx, argv[0], &id);
 		if (!ret)
-			ret = ubus_invoke(ctx, id, argv[3], NULL, receive_data, NULL);
+			ret = ubus_invoke(ctx, id, argv[1], b.head, receive_data, NULL);
 	} else if (!strcmp(cmd, "listen")) {
-		ret = ubus_invoke(ctx, UBUS_SYSTEM_OBJECT_EVENT, "listen", NULL, receive_data, NULL);
+		ret = ubus_cli_listen(ctx, argc, argv);
 	} else {
-		return usage(argv[0]);
+		return usage(progname);
 	}
 
 	if (ret)
 		fprintf(stderr, "Failed: %s\n", ubus_strerror(ret));
 
+out:
 	ubus_free(ctx);
 	return ret;
 }