use the json to blobmsg library

[project/ubus.git] / cli.c

diff --git a/cli.c b/cli.c
index ea1ec4d..0af5b64 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -1,5 +1,8 @@
+#include <libubox/blobmsg_json.h>

 #include "libubus.h"
 
 #include "libubus.h"
 

+static struct blob_buf b;
+

 static void receive_lookup(struct ubus_context *ctx, struct ubus_object_data *obj, void *priv)
 {
        struct blob_attr *cur;
 static void receive_lookup(struct ubus_context *ctx, struct ubus_object_data *obj, void *priv)
 {
        struct blob_attr *cur;


@@ -20,10 +23,13 @@ static void receive_lookup(struct ubus_context *ctx, struct ubus_object_data *ob
 
 static void receive_data(struct ubus_request *req, int type, struct blob_attr *msg)
 {
 
 static void receive_data(struct ubus_request *req, int type, struct blob_attr *msg)
 {

+       char *str;

        if (!msg)
                return;
 
        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);

 }
 
 
 }
 
 


@@ -39,12 +45,29 @@ static int usage(char *prog)
        return 1;
 }
 
        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 int ubus_cli_listen(struct ubus_context *ctx, int argc, char **argv)
 {

-       static struct ubus_object listener;
+       static struct ubus_event_handler listener;

        const char *event;
        int ret = 0;
 
        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);
        if (!argc) {
                event = "*";
                ret = ubus_register_event_handler(ctx, &listener, NULL);


@@ -62,6 +85,11 @@ static int ubus_cli_listen(struct ubus_context *ctx, int argc, char **argv)
                        event, ubus_strerror(ret));
        }
 
                        event, ubus_strerror(ret));
        }
 

+       uloop_init();
+       ubus_add_uloop(ctx);
+       uloop_run();
+       uloop_done();
+

        return 0;
 }
 
        return 0;
 }
 


@@ -69,7 +97,7 @@ int main(int argc, char **argv)
 {
        static struct ubus_context *ctx;
        char *cmd;
 {
        static struct ubus_context *ctx;
        char *cmd;

-       int ret;
+       int ret = 0;

 
        ctx = ubus_connect(NULL);
        if (!ctx) {
 
        ctx = ubus_connect(NULL);
        if (!ctx) {


@@ -94,9 +122,15 @@ int main(int argc, char **argv)
                if (argc < 4 || argc > 5)
                        return usage(argv[0]);
 
                if (argc < 4 || argc > 5)
                        return usage(argv[0]);
 

+               blob_buf_init(&b, 0);
+               if (argc == 5 && !blobmsg_add_json_from_string(&b, argv[4])) {
+                       fprintf(stderr, "Failed to parse message data\n");
+                       goto out;
+               }
+

                ret = ubus_lookup_id(ctx, argv[2], &id);
                if (!ret)
                ret = ubus_lookup_id(ctx, argv[2], &id);
                if (!ret)

-                       ret = ubus_invoke(ctx, id, argv[3], NULL, receive_data, NULL);
+                       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 {
        } else if (!strcmp(cmd, "listen")) {
                ret = ubus_cli_listen(ctx, argc - 2, argv + 2);
        } else {


@@ -106,6 +140,7 @@ int main(int argc, char **argv)
        if (ret)
                fprintf(stderr, "Failed: %s\n", ubus_strerror(ret));
 
        if (ret)
                fprintf(stderr, "Failed: %s\n", ubus_strerror(ret));
 

+out:

        ubus_free(ctx);
        return ret;
 }
        ubus_free(ctx);
        return ret;
 }