CMakeLists.txt: bump minimum cmake version

[project/ubus.git] / libubus-sub.c

diff --git a/libubus-sub.c b/libubus-sub.c
index 2bfb483cfd8019dd22b12fc3d9144914fd1dbea8..80d1f1ac542469aa782d35f690c5b5d68b3d10e0 100644 (file)
--- a/libubus-sub.c
+++ b/libubus-sub.c
@@ -21,35 +21,92 @@ static int ubus_subscriber_cb(struct ubus_context *ctx, struct ubus_object *obj,
        struct ubus_subscriber *s;
 
        s = container_of(obj, struct ubus_subscriber, obj);
-       s->cb(ctx, obj, req, method, msg);
+       if (s->cb)
+               return s->cb(ctx, obj, req, method, msg);
        return 0;
 }
 
-static const struct ubus_method watch_method = {
+const struct ubus_method watch_method __hidden = {
        .name = NULL,
        .handler = ubus_subscriber_cb,
 };
 
+static void
+ubus_auto_sub_event_handler_cb(struct ubus_context *ctx,  struct ubus_event_handler *ev,
+                              const char *type, struct blob_attr *msg)
+{
+       enum {
+               EVENT_ID,
+               EVENT_PATH,
+               __EVENT_MAX
+       };
+
+       static const struct blobmsg_policy event_policy[__EVENT_MAX] = {
+               [EVENT_ID] = { .name = "id", .type = BLOBMSG_TYPE_INT32 },
+               [EVENT_PATH] = { .name = "path", .type = BLOBMSG_TYPE_STRING },
+       };
+
+       struct blob_attr *tb[__EVENT_MAX];
+       struct ubus_subscriber *s;
+       const char *path;
+       int id;
+
+       blobmsg_parse(event_policy, __EVENT_MAX, tb, blob_data(msg), blob_len(msg));
+
+       if (!tb[EVENT_ID] || !tb[EVENT_PATH])
+               return;
+
+       path = blobmsg_get_string(tb[EVENT_PATH]);
+       id = blobmsg_get_u32(tb[EVENT_ID]);
+
+       list_for_each_entry(s, &ctx->auto_subscribers, list)
+               if (s->new_obj_cb(ctx, s, path))
+                       ubus_subscribe(ctx, s, id);
+}
+
+static void
+ubus_auto_sub_lookup(struct ubus_context *ctx, struct ubus_object_data *obj,
+                    void *priv)
+{
+       struct ubus_subscriber *s = priv;
+
+       if (s->new_obj_cb(ctx, s, obj->path))
+               ubus_subscribe(ctx, s, obj->id);
+}
+
 int ubus_register_subscriber(struct ubus_context *ctx, struct ubus_subscriber *s)
 {
        struct ubus_object *obj = &s->obj;
+       int ret;
 
+       INIT_LIST_HEAD(&s->list);
        obj->methods = &watch_method;
        obj->n_methods = 1;
 
-       return ubus_add_object(ctx, obj);
+       ret = ubus_add_object(ctx, obj);
+       if (ret)
+               return ret;
+
+       if (s->new_obj_cb) {
+               struct ubus_event_handler *ev = &ctx->auto_subscribe_event_handler;
+               list_add(&s->list, &ctx->auto_subscribers);
+               ev->cb = ubus_auto_sub_event_handler_cb;
+               if (!ev->obj.id)
+                       ubus_register_event_handler(ctx, ev, "ubus.object.add");
+               ubus_lookup(ctx, NULL, ubus_auto_sub_lookup, s);
+       }
+
+       return 0;
 }
 
 static int
-__ubus_subscribe_request(struct ubus_context *ctx, struct ubus_object *obj, uint32_t id, const char *method, int type)
+__ubus_subscribe_request(struct ubus_context *ctx, struct ubus_object *obj, uint32_t id, int type)
 {
        struct ubus_request req;
 
        blob_buf_init(&b, 0);
        blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id);
        blob_put_int32(&b, UBUS_ATTR_TARGET, id);
-       if (method)
-               blob_put_string(&b, UBUS_ATTR_METHOD, method);
 
        if (ubus_start_request(ctx, &req, b.head, type, 0) < 0)
                return UBUS_STATUS_INVALID_ARGUMENT;
@@ -60,35 +117,11 @@ __ubus_subscribe_request(struct ubus_context *ctx, struct ubus_object *obj, uint
 
 int ubus_subscribe(struct ubus_context *ctx, struct ubus_subscriber *obj, uint32_t id)
 {
-       return __ubus_subscribe_request(ctx, &obj->obj, id, "event", UBUS_MSG_SUBSCRIBE);
+       return __ubus_subscribe_request(ctx, &obj->obj, id, UBUS_MSG_SUBSCRIBE);
 }
 
 int ubus_unsubscribe(struct ubus_context *ctx, struct ubus_subscriber *obj, uint32_t id)
 {
-       return __ubus_subscribe_request(ctx, &obj->obj, id, NULL, UBUS_MSG_UNSUBSCRIBE);
-}
-
-void __hidden ubus_process_unsubscribe(struct ubus_context *ctx, struct ubus_msghdr *hdr)
-{
-       struct ubus_subscriber *s;
-       struct blob_attr **attrbuf;
-       struct ubus_object *obj;
-       uint32_t objid;
-
-       attrbuf = ubus_parse_msg(hdr->data);
-       if (!attrbuf[UBUS_ATTR_OBJID] || !attrbuf[UBUS_ATTR_TARGET])
-               return;
-
-       objid = blob_get_u32(attrbuf[UBUS_ATTR_OBJID]);
-       obj = avl_find_element(&ctx->objects, &objid, obj, avl);
-       if (!obj)
-               return;
-
-       if (obj->methods != &watch_method)
-               return;
-
-       s = container_of(obj, struct ubus_subscriber, obj);
-       s->remove_cb(ctx, s, blob_get_u32(attrbuf[UBUS_ATTR_TARGET]));
+       return __ubus_subscribe_request(ctx, &obj->obj, id, UBUS_MSG_UNSUBSCRIBE);
 }
 
-