X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=ubusd_obj.c;h=1991b177d66e38dbfa563ca410567611be0192a3;hp=d1e53f8fb4f5c3cebd56e8eb1e165afaca7f35e1;hb=42bc27ae38d92f4fe11872b0f9d57f8d3578dcfe;hpb=cb1feedb5e1388d7aea8bddef1284690c590874f diff --git a/ubusd_obj.c b/ubusd_obj.c index d1e53f8..1991b17 100644 --- a/ubusd_obj.c +++ b/ubusd_obj.c @@ -1,3 +1,16 @@ +/* + * Copyright (C) 2011 Felix Fietkau + * + * 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); @@ -135,10 +148,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; @@ -155,8 +169,9 @@ void ubusd_free_object(struct ubus_object *obj) { 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);