X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=cli.c;h=0690e2acb1bfccf05c533b8a5c468689160bbba7;hb=d2f1a01d9f6b49d7353dc848018c176400091741;hp=a1c90fee8cc42f13436fa7aed466cde2091a4c54;hpb=1555e4610fe2f82419821a34d471dda874a8c885;p=project%2Fubus.git diff --git a/cli.c b/cli.c index a1c90fe..0690e2a 100644 --- a/cli.c +++ b/cli.c @@ -1,28 +1,45 @@ +#include + +#include #include "libubus.h" static struct blob_buf b; -static struct ubus_context *ctx; -static uint32_t objid; -static void receive_lookup(struct ubus_request *req, int type, struct blob_attr *msg) +static const char *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 **attr, *cur; + struct blob_attr *cur; char *s; int rem; - attr = ubus_parse_msg(msg); - if (!attr[UBUS_ATTR_OBJID] || !attr[UBUS_ATTR_OBJPATH]) - return; - - fprintf(stderr, "'%s' @%08x\n", - (char *) blob_data(attr[UBUS_ATTR_OBJPATH]), - blob_get_int32(attr[UBUS_ATTR_OBJID])); + fprintf(stderr, "'%s' @%08x\n", obj->path, obj->id); - if (!attr[UBUS_ATTR_SIGNATURE]) + if (!obj->signature) return; - blob_for_each_attr(cur, attr[UBUS_ATTR_SIGNATURE], rem) { - s = blobmsg_format_json(cur, false); + blob_for_each_attr(cur, obj->signature, rem) { + s = blobmsg_format_json_with_cb(cur, false, format_type, NULL); fprintf(stderr, "\t%s\n", s); free(s); } @@ -30,94 +47,147 @@ static void receive_lookup(struct ubus_request *req, int type, struct blob_attr 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 store_objid(struct ubus_request *req, int type, struct blob_attr *msg) + +static void receive_event(struct ubus_context *ctx, struct ubus_event_handler *ev, + const char *type, struct blob_attr *msg) { - struct blob_attr **attr; + char *str; - attr = ubus_parse_msg(msg); - if (!attr[UBUS_ATTR_OBJID]) - return; + if (msg) + str = blobmsg_format_json(msg, true); + else + str = ""; - objid = blob_get_int32(attr[UBUS_ATTR_OBJID]); + fprintf(stderr, "\"%s\":{ %s }\n", type, str); + free(str); } -static uint32_t get_object(const char *name) +static int ubus_cli_listen(struct ubus_context *ctx, int argc, char **argv) { - struct ubus_request req; + static struct ubus_event_handler listener; + const char *event; + int ret = 0; - blob_buf_init(&b, 0); - blob_put_string(&b, UBUS_ATTR_OBJPATH, name); - ubus_start_request(ctx, &req, b.head, UBUS_MSG_LOOKUP, 0); - req.raw_data_cb = store_objid; - if (ubus_complete_request(ctx, &req)) - return 0; + memset(&listener, 0, sizeof(listener)); + listener.cb = receive_event; - return objid; + 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)); + } + + uloop_init(); + ubus_add_uloop(ctx); + uloop_run(); + uloop_done(); + + return 0; } -static int usage(char *prog) +static int usage(const char *prog) { fprintf(stderr, - "Usage: %s [arguments...]\n" + "Usage: %s [] [arguments...]\n" + "Options:\n" + " -s : Set the unix domain socket to connect to\n" + "\n" "Commands:\n" " - list [] List objects\n" " - call [] Call an object method\n" + " - listen [...] Listen for events\n" "\n", prog); return 1; } int main(int argc, char **argv) { - struct ubus_request req; + 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")) { - blob_buf_init(&b, 0); + const char *path = NULL; - if (argc == 3) - blob_put_string(&b, UBUS_ATTR_OBJPATH, argv[2]); + if (argc == 1) + path = argv[0]; - ubus_start_request(ctx, &req, b.head, UBUS_MSG_LOOKUP, 0); - req.raw_data_cb = receive_lookup; + ret = ubus_lookup(ctx, path, receive_lookup, NULL); } else if (!strcmp(cmd, "call")) { - if (argc < 4 || argc > 5) - return usage(argv[0]); + uint32_t id; - if (get_object(argv[2]) == 0) { - fprintf(stderr, "Object not found\n"); - return 1; - } + if (argc < 2 || argc > 3) + return usage(progname); blob_buf_init(&b, 0); - blob_put_int32(&b, UBUS_ATTR_OBJID, objid); - blob_put_string(&b, UBUS_ATTR_METHOD, argv[3]); - ubus_start_request(ctx, &req, b.head, UBUS_MSG_INVOKE, objid); - req.data_cb = receive_data; + 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[0], &id); + if (!ret) + ret = ubus_invoke(ctx, id, argv[1], b.head, receive_data, NULL); + } else if (!strcmp(cmd, "listen")) { + ret = ubus_cli_listen(ctx, argc, argv); } else { - return usage(argv[0]); + return usage(progname); } - ret = ubus_complete_request(ctx, &req); if (ret) fprintf(stderr, "Failed: %s\n", ubus_strerror(ret)); +out: ubus_free(ctx); - return 0; + return ret; }