X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=ubusd_obj.c;h=7ae9b5f63174ba6cadb5e5d9c1920822a00cccfd;hp=3c0e823f925b95e2a0386e9099009bd494028c83;hb=95062c1ef74695d138bbc4b9efc5910b1436bd9c;hpb=74eddc472d8c647f21a475bbe780b4509636ae35

diff --git a/ubusd_obj.c b/ubusd_obj.c
index 3c0e823..7ae9b5f 100644
--- a/ubusd_obj.c
+++ b/ubusd_obj.c
@@ -1,3 +1,16 @@
+/*
+ * 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"
 
@@ -99,6 +112,8 @@ struct ubus_object *ubusd_create_object_internal(struct ubus_object_type *type,
 	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++;
 
@@ -119,9 +134,6 @@ struct ubus_object *ubusd_create_object(struct ubus_client *cl, struct blob_attr
 	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);
@@ -152,8 +164,39 @@ 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);