remove an obsolete define

[project/ubus.git] / cli.c

diff --git a/cli.c b/cli.c
index ba6f30f..54db4a2 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -1,45 +1,46 @@
 #include "libubus.h"
 
 #include "libubus.h"
 

-static struct blob_buf b;
-static struct ubus_context *ctx;
-
-static void receive_lookup(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, *cur;
+       struct blob_attr *cur;

        char *s;
        int rem;
 
        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;
 
                return;
 

-       blob_for_each_attr(cur, attr[UBUS_ATTR_SIGNATURE], rem) {
+       blob_for_each_attr(cur, obj->signature, rem) {

                s = blobmsg_format_json(cur, false);
                fprintf(stderr, "\t%s\n", s);
                free(s);
        }
 }
 
                s = blobmsg_format_json(cur, false);
                fprintf(stderr, "\t%s\n", s);
                free(s);
        }
 }
 

+static void receive_data(struct ubus_request *req, int type, struct blob_attr *msg)
+{
+       if (!msg)
+               return;
+
+       fprintf(stderr, "%s\n", blobmsg_format_json(msg, true));
+}
+
+

 static int usage(char *prog)
 {
        fprintf(stderr,
                "Usage: %s <command> [arguments...]\n"
                "Commands:\n"
 static int usage(char *prog)
 {
        fprintf(stderr,
                "Usage: %s <command> [arguments...]\n"
                "Commands:\n"

-               " - list [<path>]       List objects\n"
+               " - list [<path>]                       List objects\n"
+               " - call <path> <method> [<message>]    Call an object method\n"

                "\n", prog);
        return 1;
 }
 
 int main(int argc, char **argv)
 {
                "\n", prog);
        return 1;
 }
 
 int main(int argc, char **argv)
 {

-       struct ubus_request req;
+       static struct ubus_context *ctx;

        char *cmd;
        int ret;
 
        char *cmd;
        int ret;
 


@@ -53,21 +54,29 @@ int main(int argc, char **argv)
        if (argc < 2)
                return usage(argv[0]);
 
        if (argc < 2)
                return usage(argv[0]);
 

-       blob_buf_init(&b, 0);
-

        if (!strcmp(cmd, "list")) {
        if (!strcmp(cmd, "list")) {

+               const char *path = NULL;
+

                if (argc == 3)
                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.data_cb = receive_lookup;
-               ret = ubus_complete_request(ctx, &req);
-               if (ret)
-                       fprintf(stderr, "Failed: %d\n", ret);
+               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]);
+
+               ret = ubus_lookup_id(ctx, argv[2], &id);
+               if (!ret)
+                       ret = ubus_invoke(ctx, id, argv[3], NULL, receive_data, NULL);

        } else {
                return usage(argv[0]);
        }
 
        } else {
                return usage(argv[0]);
        }
 

+       if (ret)
+               fprintf(stderr, "Failed: %s\n", ubus_strerror(ret));
+

        ubus_free(ctx);
        return 0;
 }
        ubus_free(ctx);
        return 0;
 }