X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=ubusd_obj.c;h=7ae9b5f63174ba6cadb5e5d9c1920822a00cccfd;hp=ffd5330560f529d0f4cf1881fa57c03b659309ad;hb=9c0b821573b877fc8a7cd1f449cbc6d2eade8227;hpb=9a03063aee0560fd5c8978efda378011eac1a11f

diff --git a/ubusd_obj.c b/ubusd_obj.c
index ffd5330..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"
 
@@ -31,7 +44,7 @@ static bool ubus_create_obj_method(struct ubus_object_type *type, struct blob_at
 	if (!m)
 		return false;
 
-	list_add(&m->list, &type->methods);
+	list_add_tail(&m->list, &type->methods);
 	memcpy(m->data, attr, bloblen);
 	m->name = blobmsg_name(m->data);
 
@@ -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++;
 
@@ -115,13 +130,10 @@ struct ubus_object *ubusd_create_object(struct ubus_client *cl, struct blob_attr
 	struct ubus_object_type *type = NULL;
 
 	if (attr[UBUS_ATTR_OBJTYPE])
-		type = ubus_get_obj_type(blob_get_int32(attr[UBUS_ATTR_OBJTYPE]));
+		type = ubus_get_obj_type(blob_get_u32(attr[UBUS_ATTR_OBJTYPE]));
 	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);
@@ -135,10 +147,11 @@ struct ubus_object *ubusd_create_object(struct ubus_client *cl, struct blob_attr
 			goto free;
 
 		if (avl_insert(&path, &obj->path) != 0) {
-			free(obj->path.key);
+			free((void *) obj->path.key);
 			obj->path.key = NULL;
 			goto free;
 		}
+		ubusd_send_obj_event(obj, true);
 	}
 
 	obj->client = cl;
@@ -151,12 +164,44 @@ 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);