+/*
+ * Copyright (C) 2011 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
#include "ubusd.h"
#include "ubusd_obj.h"
obj->type = type;
INIT_LIST_HEAD(&obj->list);
INIT_LIST_HEAD(&obj->events);
+ INIT_LIST_HEAD(&obj->watchers);
+ INIT_LIST_HEAD(&obj->watched);
if (type)
type->refcount++;
else if (attr[UBUS_ATTR_SIGNATURE])
type = ubus_create_obj_type(attr[UBUS_ATTR_SIGNATURE]);
- if (!!type ^ !!attr[UBUS_ATTR_OBJPATH])
- return NULL;
-
obj = ubusd_create_object_internal(type, 0);
if (type)
ubus_unref_object_type(type);
goto free;
if (avl_insert(&path, &obj->path) != 0) {
- free(obj->path.key);
+ free((void *) obj->path.key);
obj->path.key = NULL;
goto free;
}
return NULL;
}
+void ubus_watch_new(struct ubus_object *obj, struct ubus_object *target, const char *method)
+{
+ struct ubus_watch *w;
+
+ w = calloc(1, sizeof(*w) + strlen(method) + 1);
+ if (!w)
+ return;
+
+ w->watcher = obj;
+ w->watched = target;
+ list_add(&w->watcher_list, &target->watchers);
+ list_add(&w->watched_list, &obj->watched);
+ strcpy(w->method, method);
+}
+
+void ubus_watch_free(struct ubus_watch *w)
+{
+ list_del(&w->watcher_list);
+ list_del(&w->watched_list);
+ free(w);
+}
+
void ubusd_free_object(struct ubus_object *obj)
{
+ struct ubus_watch *w, *tmp;
+
+ list_for_each_entry_safe(w, tmp, &obj->watched, watched_list) {
+ ubus_watch_free(w);
+ }
+ list_for_each_entry_safe(w, tmp, &obj->watchers, watcher_list) {
+ ubus_proto_notify_watch(w);
+ }
+
ubusd_event_cleanup_object(obj);
if (obj->path.key) {
ubusd_send_obj_event(obj, false);
avl_delete(&path, &obj->path);
- free(obj->path.key);
+ free((void *) obj->path.key);
}
if (!list_empty(&obj->list))
list_del(&obj->list);