libubus: expose ubus_connect_ctx() in public API

[project/ubus.git] / cli.c

diff --git a/cli.c b/cli.c
index 9e16bc8..e4eb504 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -19,6 +19,7 @@
 static struct blob_buf b;
 static int timeout = 30;
 static bool simple_output = false;
+static int verbose = 0;
 
 static const char *format_type(void *priv, struct blob_attr *attr)
 {
@@ -26,6 +27,8 @@ static const char *format_type(void *priv, struct blob_attr *attr)
                [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;
@@ -48,7 +51,7 @@ static void receive_list_result(struct ubus_context *ctx, struct ubus_object_dat
        char *s;
        int rem;
 
-       if (simple_output) {
+       if (simple_output || !verbose) {
                printf("%s\n", obj->path);
                return;
        }
@@ -71,7 +74,7 @@ static void receive_call_result_data(struct ubus_request *req, int type, struct
        if (!msg)
                return;
 
-       str = blobmsg_format_json_indent(msg, true, 0);
+       str = blobmsg_format_json_indent(msg, true, simple_output ? -1 : 0);
        printf("%s\n", str);
        free(str);
 }
@@ -181,6 +184,106 @@ static int ubus_cli_send(struct ubus_context *ctx, int argc, char **argv)
        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,
@@ -189,12 +292,14 @@ static int usage(const char *prog)
                " -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;
 }
@@ -208,6 +313,7 @@ struct {
        { "call", ubus_cli_call },
        { "listen", ubus_cli_listen },
        { "send", ubus_cli_send },
+       { "wait_for", ubus_cli_wait_for },
 };
 
 int main(int argc, char **argv)
@@ -220,7 +326,7 @@ int main(int argc, char **argv)
 
        progname = argv[0];
 
-       while ((ch = getopt(argc, argv, "s:t:S")) != -1) {
+       while ((ch = getopt(argc, argv, "vs:t:S")) != -1) {
                switch (ch) {
                case 's':
                        ubus_socket = optarg;
@@ -231,6 +337,9 @@ int main(int argc, char **argv)
                case 'S':
                        simple_output = true;
                        break;
+               case 'v':
+                       verbose++;
+                       break;
                default:
                        return usage(progname);
                }