X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=cli.c;h=e4eb504bb185eaf1c0317d6926cb14030f118c5d;hp=0af5b64630b1ad3ffae9c4f2643ec6fcf7a6928c;hb=5db90dbc941da701c397b04ddce2515a231df59b;hpb=8c81142828a58e661d91da4f513a32ca5a9038bf

diff --git a/cli.c b/cli.c
index 0af5b64..e4eb504 100644
--- a/cli.c
+++ b/cli.c
@@ -1,62 +1,127 @@
+/*
+ * Copyright (C) 2011 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <unistd.h>
+
 #include <libubox/blobmsg_json.h>
 #include "libubus.h"
 
 static struct blob_buf b;
+static int timeout = 30;
+static bool simple_output = false;
+static int verbose = 0;
 
-static void receive_lookup(struct ubus_context *ctx, struct ubus_object_data *obj, void *priv)
+static const char *format_type(void *priv, struct blob_attr *attr)
+{
+	static const char * const attr_types[] = {
+		[BLOBMSG_TYPE_INT8] = "\"Boolean\"",
+		[BLOBMSG_TYPE_INT32] = "\"Integer\"",
+		[BLOBMSG_TYPE_STRING] = "\"String\"",
+		[BLOBMSG_TYPE_ARRAY] = "\"Array\"",
+		[BLOBMSG_TYPE_TABLE] = "\"Table\"",
+	};
+	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_list_result(struct ubus_context *ctx, struct ubus_object_data *obj, void *priv)
 {
 	struct blob_attr *cur;
 	char *s;
 	int rem;
 
-	fprintf(stderr, "'%s' @%08x\n", obj->path, obj->id);
+	if (simple_output || !verbose) {
+		printf("%s\n", obj->path);
+		return;
+	}
+
+	printf("'%s' @%08x\n", obj->path, obj->id);
 
 	if (!obj->signature)
 		return;
 
 	blob_for_each_attr(cur, obj->signature, rem) {
-		s = blobmsg_format_json(cur, false);
-		fprintf(stderr, "\t%s\n", s);
+		s = blobmsg_format_json_with_cb(cur, false, format_type, NULL, -1);
+		printf("\t%s\n", s);
 		free(s);
 	}
 }
 
-static void receive_data(struct ubus_request *req, int type, struct blob_attr *msg)
+static void receive_call_result_data(struct ubus_request *req, int type, struct blob_attr *msg)
 {
 	char *str;
 	if (!msg)
 		return;
 
-	str = blobmsg_format_json(msg, true);
-	fprintf(stderr, "%s\n", str);
+	str = blobmsg_format_json_indent(msg, true, simple_output ? -1 : 0);
+	printf("%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;
 
-static int usage(char *prog)
+	str = blobmsg_format_json(msg, true);
+	printf("{ \"%s\": %s }\n", type, str);
+	free(str);
+}
+
+static int ubus_cli_list(struct ubus_context *ctx, int argc, char **argv)
 {
-	fprintf(stderr,
-		"Usage: %s <command> [arguments...]\n"
-		"Commands:\n"
-		" - list [<path>]			List objects\n"
-		" - call <path> <method> [<message>]	Call an object method\n"
-		" - listen [<path>...]			Listen for events\n"
-		"\n", prog);
-	return 1;
+	const char *path = NULL;
+
+	if (argc > 1)
+		return -2;
+
+	if (argc == 1)
+		path = argv[0];
+
+	return ubus_lookup(ctx, path, receive_list_result, NULL);
 }
 
-static void receive_event(struct ubus_context *ctx, struct ubus_event_handler *ev,
-			  const char *type, struct blob_attr *msg)
+static int ubus_cli_call(struct ubus_context *ctx, int argc, char **argv)
 {
-	char *str;
+	uint32_t id;
+	int ret;
 
-	if (msg)
-		str = blobmsg_format_json(msg, true);
-	else
-		str = "";
+	if (argc < 2 || argc > 3)
+		return -2;
 
-	fprintf(stderr, "\"%s\":{ %s }\n", type, str);
-	free(str);
+	blob_buf_init(&b, 0);
+	if (argc == 3 && !blobmsg_add_json_from_string(&b, argv[2])) {
+		if (!simple_output)
+			fprintf(stderr, "Failed to parse message data\n");
+		return -1;
+	}
+
+	ret = ubus_lookup_id(ctx, argv[0], &id);
+	if (ret)
+		return ret;
+
+	return ubus_invoke(ctx, id, argv[1], b.head, receive_call_result_data, NULL, timeout * 1000);
 }
 
 static int ubus_cli_listen(struct ubus_context *ctx, int argc, char **argv)
@@ -68,21 +133,31 @@ static int ubus_cli_listen(struct ubus_context *ctx, int argc, char **argv)
 	memset(&listener, 0, sizeof(listener));
 	listener.cb = receive_event;
 
-	if (!argc) {
+	if (argc > 0) {
+		event = argv[0];
+	} else {
 		event = "*";
-		ret = ubus_register_event_handler(ctx, &listener, NULL);
+		argc = 1;
 	}
 
-	for (;argc;argv++, argc--) {
-		event = argv[0];
-		ret = ubus_register_event_handler(ctx, &listener, argv[0]);
+	do {
+		ret = ubus_register_event_handler(ctx, &listener, event);
 		if (ret)
 			break;
-	}
+
+		argv++;
+		argc--;
+		if (argc <= 0)
+			break;
+
+		event = argv[0];
+	} while (1);
 
 	if (ret) {
-		fprintf(stderr, "Error while registering for event '%s': %s\n",
-			event, ubus_strerror(ret));
+		if (!simple_output)
+			fprintf(stderr, "Error while registering for event '%s': %s\n",
+				event, ubus_strerror(ret));
+		return -1;
 	}
 
 	uloop_init();
@@ -93,54 +168,214 @@ static int ubus_cli_listen(struct ubus_context *ctx, int argc, char **argv)
 	return 0;
 }
 
+static int ubus_cli_send(struct ubus_context *ctx, int argc, char **argv)
+{
+	if (argc < 1 || argc > 2)
+		return -2;
+
+	blob_buf_init(&b, 0);
+
+	if (argc == 2 && !blobmsg_add_json_from_string(&b, argv[1])) {
+		if (!simple_output)
+			fprintf(stderr, "Failed to parse message data\n");
+		return -1;
+	}
+
+	return ubus_send_event(ctx, argv[0], b.head);
+}
+
+struct cli_wait_data {
+	struct uloop_timeout timeout;
+	struct ubus_event_handler ev;
+	char **pending;
+	int n_pending;
+};
+
+static void wait_check_object(struct cli_wait_data *data, const char *path)
+{
+	int i;
+
+	for (i = 0; i < data->n_pending; i++) {
+		if (strcmp(path, data->pending[i]) != 0)
+			continue;
+
+		data->n_pending--;
+		if (i == data->n_pending)
+			break;
+
+		memmove(&data->pending[i], &data->pending[i + 1],
+			(data->n_pending - i) * sizeof(*data->pending));
+		i--;
+	}
+
+	if (!data->n_pending)
+		uloop_end();
+}
+
+static void wait_event_cb(struct ubus_context *ctx, struct ubus_event_handler *ev,
+			  const char *type, struct blob_attr *msg)
+{
+	static const struct blobmsg_policy policy = {
+		"path", BLOBMSG_TYPE_STRING
+	};
+	struct cli_wait_data *data = container_of(ev, struct cli_wait_data, ev);
+	struct blob_attr *attr;
+	const char *path;
+
+	if (strcmp(type, "ubus.object.add") != 0)
+		return;
+
+	blobmsg_parse(&policy, 1, &attr, blob_data(msg), blob_len(msg));
+	if (!attr)
+		return;
+
+	path = blobmsg_data(attr);
+	wait_check_object(data, path);
+}
+
+static void wait_list_cb(struct ubus_context *ctx, struct ubus_object_data *obj, void *priv)
+{
+	struct cli_wait_data *data = priv;
+
+	wait_check_object(data, obj->path);
+}
+
+
+static void wait_timeout(struct uloop_timeout *timeout)
+{
+	uloop_end();
+}
+
+static int ubus_cli_wait_for(struct ubus_context *ctx, int argc, char **argv)
+{
+	struct cli_wait_data data = {
+		.timeout.cb = wait_timeout,
+		.ev.cb = wait_event_cb,
+		.pending = argv,
+		.n_pending = argc,
+	};
+	int ret;
+
+	if (argc < 1)
+		return -2;
+
+	uloop_init();
+	ubus_add_uloop(ctx);
+
+	ret = ubus_lookup(ctx, NULL, wait_list_cb, &data);
+	if (ret)
+		return ret;
+
+	if (!data.n_pending)
+		return ret;
+
+	ret = ubus_register_event_handler(ctx, &data.ev, "ubus.object.add");
+	if (ret)
+		return ret;
+
+	uloop_timeout_set(&data.timeout, timeout * 1000);
+	uloop_run();
+	uloop_done();
+
+	if (data.n_pending)
+		return UBUS_STATUS_TIMEOUT;
+
+	return ret;
+}
+
+
+static int usage(const char *prog)
+{
+	fprintf(stderr,
+		"Usage: %s [<options>] <command> [arguments...]\n"
+		"Options:\n"
+		" -s <socket>:		Set the unix domain socket to connect to\n"
+		" -t <timeout>:		Set the timeout (in seconds) for a command to complete\n"
+		" -S:			Use simplified output (for scripts)\n"
+		" -v:			More verbose output\n"
+		"\n"
+		"Commands:\n"
+		" - list [<path>]			List objects\n"
+		" - call <path> <method> [<message>]	Call an object method\n"
+		" - listen [<path>...]			Listen for events\n"
+		" - send <type> [<message>]		Send an event\n"
+		" - wait_for <object> [<object>...]	Wait for multiple objects to appear on ubus\n"
+		"\n", prog);
+	return 1;
+}
+
+
+struct {
+	const char *name;
+	int (*cb)(struct ubus_context *ctx, int argc, char **argv);
+} commands[] = {
+	{ "list", ubus_cli_list },
+	{ "call", ubus_cli_call },
+	{ "listen", ubus_cli_listen },
+	{ "send", ubus_cli_send },
+	{ "wait_for", ubus_cli_wait_for },
+};
+
 int main(int argc, char **argv)
 {
+	const char *progname, *ubus_socket = NULL;
 	static struct ubus_context *ctx;
 	char *cmd;
 	int ret = 0;
+	int i, ch;
 
-	ctx = ubus_connect(NULL);
-	if (!ctx) {
-		fprintf(stderr, "Failed to connect to ubus\n");
-		return -1;
-	}
+	progname = argv[0];
 
-	cmd = argv[1];
-	if (argc < 2)
-		return usage(argv[0]);
+	while ((ch = getopt(argc, argv, "vs:t:S")) != -1) {
+		switch (ch) {
+		case 's':
+			ubus_socket = optarg;
+			break;
+		case 't':
+			timeout = atoi(optarg);
+			break;
+		case 'S':
+			simple_output = true;
+			break;
+		case 'v':
+			verbose++;
+			break;
+		default:
+			return usage(progname);
+		}
+	}
 
-	if (!strcmp(cmd, "list")) {
-		const char *path = NULL;
+	argc -= optind;
+	argv += optind;
 
-		if (argc == 3)
-			path = argv[2];
+	cmd = argv[0];
+	if (argc < 1)
+		return usage(progname);
 
-		ret = ubus_lookup(ctx, path, receive_lookup, NULL);
-	} else if (!strcmp(cmd, "call")) {
-		uint32_t id;
+	ctx = ubus_connect(ubus_socket);
+	if (!ctx) {
+		if (!simple_output)
+			fprintf(stderr, "Failed to connect to ubus\n");
+		return -1;
+	}
 
-		if (argc < 4 || argc > 5)
-			return usage(argv[0]);
+	argv++;
+	argc--;
 
-		blob_buf_init(&b, 0);
-		if (argc == 5 && !blobmsg_add_json_from_string(&b, argv[4])) {
-			fprintf(stderr, "Failed to parse message data\n");
-			goto out;
-		}
+	ret = -2;
+	for (i = 0; i < ARRAY_SIZE(commands); i++) {
+		if (strcmp(commands[i].name, cmd) != 0)
+			continue;
 
-		ret = ubus_lookup_id(ctx, argv[2], &id);
-		if (!ret)
-			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 {
-		return usage(argv[0]);
+		ret = commands[i].cb(ctx, argc, argv);
+		break;
 	}
 
-	if (ret)
-		fprintf(stderr, "Failed: %s\n", ubus_strerror(ret));
+	if (ret > 0 && !simple_output)
+		fprintf(stderr, "Command failed: %s\n", ubus_strerror(ret));
+	else if (ret == -2)
+		usage(progname);
 
-out:
 	ubus_free(ctx);
 	return ret;
 }