X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=cli.c;h=54db4a224738341a3a69b2be78547fd41838b01b;hp=e6b127884c20217df7e593537cb2b1a3b550fa27;hb=875619ed4ee6bc0d19b0057c9ee60db3b258624a;hpb=527d2523330cb41e23a435d89352680d108c789a

diff --git a/cli.c b/cli.c
index e6b1278..54db4a2 100644
--- a/cli.c
+++ b/cli.c
@@ -1,57 +1,31 @@
 #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 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) {
+	blob_for_each_attr(cur, obj->signature, rem) {
 		s = blobmsg_format_json(cur, false);
 		fprintf(stderr, "\t%s\n", s);
 		free(s);
 	}
 }
 
-static void store_objid(struct ubus_request *req, int type, struct blob_attr *msg)
+static void receive_data(struct ubus_request *req, int type, struct blob_attr *msg)
 {
-	struct blob_attr **attr;
-
-	attr = ubus_parse_msg(msg);
-	if (!attr[UBUS_ATTR_OBJID])
+	if (!msg)
 		return;
 
-	objid = blob_get_int32(attr[UBUS_ATTR_OBJID]);
+	fprintf(stderr, "%s\n", blobmsg_format_json(msg, true));
 }
 
-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.data_cb = store_objid;
-	if (ubus_complete_request(ctx, &req))
-		return 0;
-
-	return objid;
-}
 
 static int usage(char *prog)
 {
@@ -66,7 +40,7 @@ static int usage(char *prog)
 
 int main(int argc, char **argv)
 {
-	struct ubus_request req;
+	static struct ubus_context *ctx;
 	char *cmd;
 	int ret;
 
@@ -81,31 +55,25 @@ 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.data_cb = receive_lookup;
+		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);
-		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);
+		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]);
 	}
 
-	ret = ubus_complete_request(ctx, &req);
 	if (ret)
 		fprintf(stderr, "Failed: %s\n", ubus_strerror(ret));