+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_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;
+
+ str = blobmsg_format_json(msg, true);
+ printf("{ \"%s\": %s }\n", type, str);
+ fflush(stdout);
+ free(str);
+}
+
+static int ubus_cli_list(struct ubus_context *ctx, int argc, char **argv)
+{
+ 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 int ubus_cli_call(struct ubus_context *ctx, int argc, char **argv)
+{
+ uint32_t id;
+ int ret;
+
+ if (argc < 2 || argc > 3)
+ return -2;
+
+ 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)
+{
+ static struct ubus_event_handler listener;
+ const char *event;
+ int ret = 0;
+
+ memset(&listener, 0, sizeof(listener));
+ listener.cb = receive_event;
+
+ if (argc > 0) {
+ event = argv[0];
+ } else {
+ event = "*";
+ argc = 1;
+ }
+
+ 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) {
+ if (!simple_output)
+ fprintf(stderr, "Error while registering for event '%s': %s\n",
+ event, ubus_strerror(ret));
+ return -1;
+ }
+
+ uloop_init();
+ ubus_add_uloop(ctx);
+ uloop_run();
+ uloop_done();
+
+ 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)