X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=cli.c;h=6382a6c63341f97406ab5d649c9563271c1c0736;hp=45addc69cf79a3051ea2114ee697a3e51e49db53;hb=4ae1159f62958a386865ec2213f5f84b7220e4d8;hpb=23c9984a6cfe110f0112296d337978862ab34123 diff --git a/cli.c b/cli.c index 45addc6..6382a6c 100644 --- a/cli.c +++ b/cli.c @@ -1,66 +1,115 @@ +#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 bool blobmsg_add_element(struct blob_buf *b, const char *name, json_object *obj); + +static bool blobmsg_add_object(struct blob_buf *b, json_object *obj) { - struct blob_attr **attr, *cur; - char *s; - int rem; + json_object_object_foreach(obj, key, val) { + if (!blobmsg_add_element(b, key, val)) + return false; + } + return true; +} - attr = ubus_parse_msg(msg); - if (!attr[UBUS_ATTR_OBJID] || !attr[UBUS_ATTR_OBJPATH]) - return; +static bool blobmsg_add_array(struct blob_buf *b, struct array_list *a) +{ + int i, len; - fprintf(stderr, "'%s' @%08x\n", - (char *) blob_data(attr[UBUS_ATTR_OBJPATH]), - blob_get_int32(attr[UBUS_ATTR_OBJID])); + for (i = 0, len = array_list_length(a); i < len; i++) { + if (!blobmsg_add_element(b, NULL, array_list_get_idx(a, i))) + return false; + } - if (!attr[UBUS_ATTR_SIGNATURE]) - return; + return true; +} - blob_for_each_attr(cur, attr[UBUS_ATTR_SIGNATURE], rem) { - s = blobmsg_format_json(cur, false); - fprintf(stderr, "\t%s\n", s); - free(s); +static bool blobmsg_add_element(struct blob_buf *b, const char *name, json_object *obj) +{ + bool ret = true; + void *c; + + if (!obj) + return false; + + switch (json_object_get_type(obj)) { + case json_type_object: + c = blobmsg_open_table(b, name); + ret = blobmsg_add_object(b, obj); + blobmsg_close_table(b, c); + break; + case json_type_array: + c = blobmsg_open_array(b, name); + ret = blobmsg_add_array(b, json_object_get_array(obj)); + blobmsg_close_array(b, c); + break; + case json_type_string: + blobmsg_add_string(b, name, json_object_get_string(obj)); + break; + case json_type_boolean: + blobmsg_add_u8(b, name, json_object_get_boolean(obj)); + break; + case json_type_int: + blobmsg_add_u32(b, name, json_object_get_int(obj)); + break; + default: + return false; } + return ret; } -static void receive_data(struct ubus_request *req, int type, struct blob_attr *msg) +static bool blobmsg_from_json(struct blob_buf *b, const char *str) { - if (!msg) - return; + json_object *obj; + bool ret = false; + + obj = json_tokener_parse(str); + if (is_error(obj)) + return false; + + if (json_object_get_type(obj) != json_type_object) + goto out; + + ret = blobmsg_add_object(b, obj); - fprintf(stderr, "%s\n", blobmsg_format_json(msg, true)); +out: + json_object_put(obj); + return ret; } -static void store_objid(struct ubus_request *req, int type, struct blob_attr *msg) +static void receive_lookup(struct ubus_context *ctx, struct ubus_object_data *obj, void *priv) { - struct blob_attr **attr; + struct blob_attr *cur; + char *s; + int rem; - attr = ubus_parse_msg(msg); - if (!attr[UBUS_ATTR_OBJID]) + fprintf(stderr, "'%s' @%08x\n", obj->path, obj->id); + + if (!obj->signature) return; - objid = blob_get_int32(attr[UBUS_ATTR_OBJID]); + blob_for_each_attr(cur, obj->signature, rem) { + s = blobmsg_format_json(cur, false); + fprintf(stderr, "\t%s\n", s); + free(s); + } } -static uint32_t get_object(const char *name) +static void receive_data(struct ubus_request *req, int type, struct blob_attr *msg) { - struct ubus_request req; - - 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; + char *str; + if (!msg) + return; - return objid; + str = blobmsg_format_json(msg, true); + fprintf(stderr, "%s\n", str); + free(str); } + static int usage(char *prog) { fprintf(stderr, @@ -68,15 +117,64 @@ static int usage(char *prog) "Commands:\n" " - list [] List objects\n" " - call [] Call an object method\n" + " - listen [...] Listen for events\n" "\n", prog); return 1; } +static void receive_event(struct ubus_context *ctx, struct ubus_event_handler *ev, + const char *type, struct blob_attr *msg) +{ + char *str; + + if (msg) + str = blobmsg_format_json(msg, true); + else + str = ""; + + fprintf(stderr, "\"%s\":{ %s }\n", type, str); + free(str); +} + +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) { + 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; +} + int main(int argc, char **argv) { - struct ubus_request req; + static struct ubus_context *ctx; char *cmd; - int ret; + int ret = 0; ctx = ubus_connect(NULL); if (!ctx) { @@ -89,24 +187,29 @@ int main(int argc, char **argv) return usage(argv[0]); 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]); + path = argv[2]; - ubus_start_request(ctx, &req, b.head, UBUS_MSG_LOOKUP, 0); - req.raw_data_cb = receive_lookup; - ret = ubus_complete_request(ctx, &req); + ret = ubus_lookup(ctx, path, receive_lookup, NULL); } else if (!strcmp(cmd, "call")) { + uint32_t id; + if (argc < 4 || argc > 5) return usage(argv[0]); - if (get_object(argv[2]) == 0) { - fprintf(stderr, "Object not found\n"); - return 1; + blob_buf_init(&b, 0); + if (argc == 5 && !blobmsg_from_json(&b, argv[4])) { + fprintf(stderr, "Failed to parse message data\n"); + goto out; } - ret = ubus_invoke(ctx, objid, argv[3], NULL, receive_data, NULL); + 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]); } @@ -114,6 +217,7 @@ int main(int argc, char **argv) if (ret) fprintf(stderr, "Failed: %s\n", ubus_strerror(ret)); +out: ubus_free(ctx); - return 0; + return ret; }