cli: use ubus_invoke() instead of low level handling

[project/ubus.git] / cli.c

diff --git a/cli.c b/cli.c
index bc884cd..45addc6 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -2,6 +2,7 @@
 
 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)
 {
@@ -27,6 +28,39 @@ 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)
+{
+       if (!msg)
+               return;
+
+       fprintf(stderr, "%s\n", blobmsg_format_json(msg, true));
+}
+
+static void store_objid(struct ubus_request *req, int type, struct blob_attr *msg)
+{
+       struct blob_attr **attr;
+
+       attr = ubus_parse_msg(msg);
+       if (!attr[UBUS_ATTR_OBJID])
+               return;
+
+       objid = blob_get_int32(attr[UBUS_ATTR_OBJID]);
+}
+
+static uint32_t get_object(const char *name)
+{
+       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;
+
+       return objid;
+}
+
 static int usage(char *prog)
 {
        fprintf(stderr,
@@ -54,26 +88,29 @@ int main(int argc, char **argv)
        if (argc < 2)
                return usage(argv[0]);
 
-       blob_buf_init(&b, 0);
-
        if (!strcmp(cmd, "list")) {
+               blob_buf_init(&b, 0);
+
                if (argc == 3)
                        blob_put_string(&b, UBUS_ATTR_OBJPATH, argv[2]);
 
                ubus_start_request(ctx, &req, b.head, UBUS_MSG_LOOKUP, 0);
-               req.data_cb = receive_lookup;
+               req.raw_data_cb = receive_lookup;
+               ret = ubus_complete_request(ctx, &req);
        } else if (!strcmp(cmd, "call")) {
                if (argc < 4 || argc > 5)
                        return usage(argv[0]);
 
-               blob_put_string(&b, UBUS_ATTR_OBJPATH, argv[2]);
-               blob_put_string(&b, UBUS_ATTR_METHOD, argv[3]);
-               ubus_start_request(ctx, &req, b.head, UBUS_MSG_INVOKE, 0);
+               if (get_object(argv[2]) == 0) {
+                       fprintf(stderr, "Object not found\n");
+                       return 1;
+               }
+
+               ret = ubus_invoke(ctx, objid, argv[3], NULL, receive_data, NULL);
        } else {
                return usage(argv[0]);
        }
 
-       ret = ubus_complete_request(ctx, &req);
        if (ret)
                fprintf(stderr, "Failed: %s\n", ubus_strerror(ret));