return ubus_invoke(ctx, id, argv[1], b.head, receive_call_result_data, NULL, timeout * 1000);
}
+struct cli_listen_data {
+ struct uloop_timeout timeout;
+ struct ubus_event_handler ev;
+ bool timed_out;
+};
+
+static void listen_timeout(struct uloop_timeout *timeout)
+{
+ struct cli_listen_data *data = container_of(timeout, struct cli_listen_data, timeout);
+ data->timed_out = true;
+ uloop_end();
+}
+
static int ubus_cli_listen(struct ubus_context *ctx, int argc, char **argv)
{
- static struct ubus_event_handler listener;
+ struct cli_listen_data data = {
+ .timeout.cb = listen_timeout,
+ .ev.cb = receive_event,
+ .timed_out = false,
+ };
const char *event;
int ret = 0;
- memset(&listener, 0, sizeof(listener));
- listener.cb = receive_event;
-
if (argc > 0) {
event = argv[0];
} else {
}
do {
- ret = ubus_register_event_handler(ctx, &listener, event);
+ ret = ubus_register_event_handler(ctx, &data.ev, event);
if (ret)
break;
uloop_init();
ubus_add_uloop(ctx);
+ uloop_timeout_set(&data.timeout, timeout * 1000);
uloop_run();
uloop_done();
uloop_init();
ubus_add_uloop(ctx);
- ret = ubus_lookup(ctx, NULL, wait_list_cb, &data);
+ ret = ubus_register_event_handler(ctx, &data.ev, "ubus.object.add");
if (ret)
return ret;
if (!data.n_pending)
return ret;
- ret = ubus_register_event_handler(ctx, &data.ev, "ubus.object.add");
+ ret = ubus_lookup(ctx, NULL, wait_list_cb, &data);
if (ret)
return ret;
+ if (!data.n_pending)
+ return ret;
+
uloop_timeout_set(&data.timeout, timeout * 1000);
uloop_run();
uloop_done();
}
-struct {
+static struct {
const char *name;
int (*cb)(struct ubus_context *ctx, int argc, char **argv);
} commands[] = {
int main(int argc, char **argv)
{
const char *progname, *ubus_socket = NULL;
- static struct ubus_context *ctx;
+ struct ubus_context *ctx;
char *cmd;
int ret = 0;
int i, ch;