DGNum/ubus
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libubus: fix initial subscribe with autosubscribe

Browse source 
Lookup + callbacks need to run after the subscriber object has been registered

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2023-11-28 13:52:56 +01:00
parent 2b39a27d8b
commit f84eb5998c
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libubus-sub.c
View file

@ -77,11 +77,16 @@ ubus_auto_sub_lookup(struct ubus_context *ctx, struct ubus_object_data *obj,
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;
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);
@ -91,7 +96,7 @@ int ubus_register_subscriber(struct ubus_context *ctx, struct ubus_subscriber *s
ubus_lookup(ctx, NULL, ubus_auto_sub_lookup, s);
}
return ubus_add_object(ctx, obj);
return 0;
}
static int