implement code for receiving events

[project/ubus.git] / cli.c

diff --git a/cli.c b/cli.c
index 22fa768..8a47cd0 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -20,10 +20,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 +42,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);