remove separate catch all list, always require a pattern argument for registering...

diff --git a/cli.c b/cli.c
index 61f1bb22a32a7386e3d1a898b49689e1382b168d..d020b8e652cbaea953dcb92ea5d6c0b682c5ccd3 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -108,17 +108,25 @@ static int ubus_cli_listen(struct ubus_context *ctx, int argc, char **argv)
        memset(&listener, 0, sizeof(listener));
        listener.cb = receive_event;
 
-       if (!argc) {
+       if (argc > 0) {
+               event = argv[0];
+       } else {
                event = "*";
-               ret = ubus_register_event_handler(ctx, &listener, NULL);
+               argc = 1;
        }
 
-       for (;argc;argv++, argc--) {
-               event = argv[0];
-               ret = ubus_register_event_handler(ctx, &listener, argv[0]);
+       do {
+               ret = ubus_register_event_handler(ctx, &listener, event);
                if (ret)
                        break;
-       }
+
+               argv++;
+               argc--;
+               if (argc <= 0)
+                       break;
+
+               event = argv[0];
+       } while (1);
 
        if (ret) {
                fprintf(stderr, "Error while registering for event '%s': %s\n",

diff --git a/libubus.c b/libubus.c
index 5b97e455bfca29091077151ebe96d4625653b842..0a0df973b6276000f06a2950b0f38af0339c2758 100644 (file)
--- a/libubus.c
+++ b/libubus.c
@@ -765,10 +765,8 @@ int ubus_register_event_handler(struct ubus_context *ctx,
        if (pattern)
                blobmsg_add_string(&b2, "pattern", pattern);
 
-       ret = ubus_invoke(ctx, UBUS_SYSTEM_OBJECT_EVENT, "register", b2.head,
+       return ubus_invoke(ctx, UBUS_SYSTEM_OBJECT_EVENT, "register", b2.head,
                          NULL, NULL);
-
-       return 0;
 }
 
 int ubus_send_event(struct ubus_context *ctx, const char *id,

diff --git a/ubusd_event.c b/ubusd_event.c
index 223ca4d8112edb4678d9666915d18c6b0f8b6168..87213b3d7c2e36b620624adaaff28eab72d63011 100644 (file)
--- a/ubusd_event.c
+++ b/ubusd_event.c
@@ -2,42 +2,21 @@
 #include "ubusd.h"
 
 static struct avl_tree patterns;
-static LIST_HEAD(catch_all);
 static struct ubus_object *event_obj;
 static int event_seq = 0;
 static int obj_event_seq = 1;
 
-enum evs_type {
-       EVS_PATTERN,
-       EVS_CATCHALL
-};
-
 struct event_source {
        struct list_head list;
        struct ubus_object *obj;
-       enum evs_type type;
-       union {
-               struct {
-                       struct avl_node avl;
-                       bool partial;
-               } pattern;
-               struct {
-                       struct list_head list;
-               } catchall;
-       };
+       struct avl_node avl;
+       bool partial;
 };
 
 static void ubusd_delete_event_source(struct event_source *evs)
 {
        list_del(&evs->list);
-       switch (evs->type) {
-       case EVS_PATTERN:
-               avl_delete(&patterns, &evs->pattern.avl);
-               break;
-       case EVS_CATCHALL:
-               list_del(&evs->catchall.list);
-               break;
-       }
+       avl_delete(&patterns, &evs->avl);
        free(evs);
 }
 
@@ -62,28 +41,6 @@ static struct blobmsg_policy evr_policy[] = {
        [EVREG_OBJECT] = { .name = "object", .type = BLOBMSG_TYPE_INT32 },
 };
 
-
-static struct event_source *ubusd_alloc_event_source(struct ubus_object *obj, enum evs_type type, int datalen)
-{
-       struct event_source *evs;
-
-       evs = calloc(1, sizeof(*evs) + datalen);
-       list_add(&evs->list, &obj->events);
-       evs->obj = obj;
-       evs->type = type;
-       return evs;
-}
-
-static int ubusd_alloc_catchall(struct ubus_object *obj)
-{
-       struct event_source *evs;
-
-       evs = ubusd_alloc_event_source(obj, EVS_CATCHALL, 0);
-       list_add(&evs->catchall.list, &catch_all);
-
-       return 0;
-}
-
 static int ubusd_alloc_event_pattern(struct ubus_client *cl, struct blob_attr *msg)
 {
        struct event_source *ev;
@@ -95,7 +52,7 @@ static int ubusd_alloc_event_pattern(struct ubus_client *cl, struct blob_attr *m
        int len;
 
        blobmsg_parse(evr_policy, EVREG_LAST, attr, blob_data(msg), blob_len(msg));
-       if (!attr[EVREG_OBJECT])
+       if (!attr[EVREG_OBJECT] || !attr[EVREG_PATTERN])
                return UBUS_STATUS_INVALID_ARGUMENT;
 
        id = blobmsg_get_u32(attr[EVREG_OBJECT]);
@@ -109,9 +66,6 @@ static int ubusd_alloc_event_pattern(struct ubus_client *cl, struct blob_attr *m
        if (obj->client != cl)
                return UBUS_STATUS_PERMISSION_DENIED;
 
-       if (!attr[EVREG_PATTERN])
-               return ubusd_alloc_catchall(obj);
-
        pattern = blobmsg_data(attr[EVREG_PATTERN]);
 
        len = strlen(pattern);
@@ -121,11 +75,16 @@ static int ubusd_alloc_event_pattern(struct ubus_client *cl, struct blob_attr *m
                len--;
        }
 
-       ev = ubusd_alloc_event_source(obj, EVS_PATTERN, len + 1);
-       ev->pattern.partial = partial;
-       ev->pattern.avl.key = (void *) (ev + 1);
-       strcpy(ev->pattern.avl.key, pattern);
-       avl_insert(&patterns, &ev->pattern.avl);
+       ev = calloc(1, sizeof(*ev) + len + 1);
+       if (!ev)
+               return UBUS_STATUS_NO_DATA;
+
+       list_add(&ev->list, &obj->events);
+       ev->obj = obj;
+       ev->partial = partial;
+       ev->avl.key = (void *) (ev + 1);
+       strcpy(ev->avl.key, pattern);
+       avl_insert(&patterns, &ev->avl);
 
        return 0;
 }
@@ -177,9 +136,6 @@ static int ubusd_send_event(struct ubus_client *cl, const char *id,
        struct event_source *ev;
        int match_len = 0;
 
-       list_for_each_entry(ev, &catch_all, catchall.list)
-               ubusd_send_event_msg(&ub, cl, ev->obj, id, fill_cb, cb_priv);
-
        obj_event_seq++;
 
        /*
@@ -187,8 +143,8 @@ static int ubusd_send_event(struct ubus_client *cl, const char *id,
         * matching entries as long as the number of matching characters
         * between the pattern string and our string is monotonically increasing.
         */
-       avl_for_each_element(&patterns, ev, pattern.avl) {
-               const char *key = ev->pattern.avl.key;
+       avl_for_each_element(&patterns, ev, avl) {
+               const char *key = ev->avl.key;
                int cur_match_len;
                bool full_match;
 
@@ -199,7 +155,7 @@ static int ubusd_send_event(struct ubus_client *cl, const char *id,
                match_len = cur_match_len;
 
                if (!full_match) {
-                       if (!ev->pattern.partial)
+                       if (!ev->partial)
                                continue;
 
                        if (match_len != strlen(key))