projects
/
project
/
ubus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libubus: fix writev_retry() function when writing large packets
[project/ubus.git]
/
ubusd_obj.c
diff --git
a/ubusd_obj.c
b/ubusd_obj.c
index 8b1b18f8fe4e14de302882900d22b3d088204d15..3859c45728cbbd1ebe8c4ffff3976101b8c7708e 100644
(file)
--- a/
ubusd_obj.c
+++ b/
ubusd_obj.c
@@
-164,11
+164,12
@@
free:
return NULL;
}
return NULL;
}
-void ubus_subscribe(struct ubus_object *obj, struct ubus_object *target
, const char *method
)
+void ubus_subscribe(struct ubus_object *obj, struct ubus_object *target)
{
struct ubus_subscription *s;
{
struct ubus_subscription *s;
+ bool first = list_empty(&target->subscribers);
- s = calloc(1, sizeof(*s)
+ strlen(method) + 1
);
+ s = calloc(1, sizeof(*s));
if (!s)
return;
if (!s)
return;
@@
-176,14
+177,21
@@
void ubus_subscribe(struct ubus_object *obj, struct ubus_object *target, const c
s->target = target;
list_add(&s->list, &target->subscribers);
list_add(&s->target_list, &obj->target_list);
s->target = target;
list_add(&s->list, &target->subscribers);
list_add(&s->target_list, &obj->target_list);
- strcpy(s->method, method);
+
+ if (first)
+ ubus_notify_subscription(target);
}
void ubus_unsubscribe(struct ubus_subscription *s)
{
}
void ubus_unsubscribe(struct ubus_subscription *s)
{
+ struct ubus_object *obj = s->target;
+
list_del(&s->list);
list_del(&s->target_list);
free(s);
list_del(&s->list);
list_del(&s->target_list);
free(s);
+
+ if (list_empty(&obj->subscribers))
+ ubus_notify_subscription(obj);
}
void ubusd_free_object(struct ubus_object *obj)
}
void ubusd_free_object(struct ubus_object *obj)