X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=ubusd_proto.c;h=f461e47f781ec43b555adbe6fa8f4f41382c916f;hp=07bb9faad9273e1faa95e753eff93351a4b0d068;hb=960c342b4acf02ab5708dfdcd7f36e86644e9a51;hpb=fa989780bda3ad10fcbb637390d59afe2b32ba81

diff --git a/ubusd_proto.c b/ubusd_proto.c
index 07bb9fa..f461e47 100644
--- a/ubusd_proto.c
+++ b/ubusd_proto.c
@@ -1,9 +1,23 @@
+/*
+ * 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 <arpa/inet.h>
 #include "ubusd.h"
 
-static struct blob_buf b;
+struct blob_buf b;
 static struct ubus_msg_buf *retmsg;
 static int *retmsg_data;
+static struct avl_tree clients;
 
 static struct blob_attr *attrbuf[UBUS_ATTR_MAX];
 
@@ -17,7 +31,7 @@ static const struct blob_attr_info ubus_policy[UBUS_ATTR_MAX] = {
 	[UBUS_ATTR_STATUS] = { .type = BLOB_ATTR_INT32 },
 };
 
-struct blob_attr **ubus_parse_msg(struct blob_attr *msg)
+static struct blob_attr **ubus_parse_msg(struct blob_attr *msg)
 {
 	blob_parse(msg, attrbuf, ubus_policy, UBUS_ATTR_MAX);
 	return attrbuf;
@@ -40,7 +54,7 @@ static struct ubus_msg_buf *ubus_reply_from_blob(struct ubus_msg_buf *ub, bool s
 {
 	struct ubus_msg_buf *new;
 
-	new = ubus_msg_new(b.head, blob_raw_len(b.head), shared);
+	new = ubus_msg_from_blob(shared);
 	if (!new)
 		return NULL;
 
@@ -48,7 +62,7 @@ static struct ubus_msg_buf *ubus_reply_from_blob(struct ubus_msg_buf *ub, bool s
 	return new;
 }
 
-bool ubusd_send_hello(struct ubus_client *cl)
+static bool ubusd_send_hello(struct ubus_client *cl)
 {
 	struct ubus_msg_buf *ub;
 
@@ -58,18 +72,49 @@ bool ubusd_send_hello(struct ubus_client *cl)
 		return false;
 
 	ubus_msg_init(ub, UBUS_MSG_HELLO, 0, cl->id.id);
-	ubus_msg_send(cl, ub);
+	ubus_msg_send(cl, ub, true);
 	return true;
 }
 
 static int ubusd_send_pong(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
 {
 	ub->hdr.type = UBUS_MSG_DATA;
-	ubus_msg_send(cl, ubus_msg_ref(ub));
+	ubus_msg_send(cl, ub, false);
 	return 0;
 }
 
-static int ubusd_handle_publish(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
+static int ubusd_handle_remove_object(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
+{
+	struct ubus_object *obj;
+
+	if (!attr[UBUS_ATTR_OBJID])
+		return UBUS_STATUS_INVALID_ARGUMENT;
+
+	obj = ubusd_find_object(blob_get_u32(attr[UBUS_ATTR_OBJID]));
+	if (!obj)
+		return UBUS_STATUS_NOT_FOUND;
+
+	if (obj->client != cl)
+		return UBUS_STATUS_PERMISSION_DENIED;
+
+	blob_buf_init(&b, 0);
+	blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id.id);
+
+	/* check if we're removing the object type as well */
+	if (obj->type && obj->type->refcount == 1)
+		blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id.id);
+
+	ubusd_free_object(obj);
+
+	ub = ubus_reply_from_blob(ub, true);
+	if (!ub)
+		return UBUS_STATUS_NO_DATA;
+
+	ubus_msg_send(cl, ub, true);
+	return 0;
+}
+
+static int ubusd_handle_add_object(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
 {
 	struct ubus_object *obj;
 
@@ -86,7 +131,7 @@ static int ubusd_handle_publish(struct ubus_client *cl, struct ubus_msg_buf *ub,
 	if (!ub)
 		return UBUS_STATUS_NO_DATA;
 
-	ubus_msg_send(cl, ub);
+	ubus_msg_send(cl, ub, true);
 	return 0;
 }
 
@@ -111,14 +156,13 @@ static void ubusd_send_obj(struct ubus_client *cl, struct ubus_msg_buf *ub, stru
 	if (!ub)
 		return;
 
-	ubus_msg_send(cl, ub);
+	ubus_msg_send(cl, ub, true);
 }
 
 static int ubusd_handle_lookup(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
 {
 	struct ubus_object *obj;
 	char *objpath;
-	bool wildcard = false;
 	bool found = false;
 	int len;
 
@@ -140,7 +184,6 @@ static int ubusd_handle_lookup(struct ubus_client *cl, struct ubus_msg_buf *ub,
 	}
 
 	objpath[--len] = 0;
-	wildcard = true;
 
 	obj = avl_find_ge_element(&path, objpath, obj, path);
 	if (!obj)
@@ -162,6 +205,7 @@ static int ubusd_handle_lookup(struct ubus_client *cl, struct ubus_msg_buf *ub,
 
 static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
 {
+	struct ubus_msg_buf *ub_new;
 	struct ubus_object *obj = NULL;
 	struct ubus_id *id;
 	const char *method;
@@ -169,7 +213,7 @@ static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub,
 	if (!attr[UBUS_ATTR_METHOD] || !attr[UBUS_ATTR_OBJID])
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
-	id = ubus_find_id(&objects, blob_get_int32(attr[UBUS_ATTR_OBJID]));
+	id = ubus_find_id(&objects, blob_get_u32(attr[UBUS_ATTR_OBJID]));
 	if (!id)
 		return UBUS_STATUS_NOT_FOUND;
 
@@ -187,34 +231,44 @@ static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub,
 		blob_put(&b, UBUS_ATTR_DATA, blob_data(attr[UBUS_ATTR_DATA]),
 			 blob_len(attr[UBUS_ATTR_DATA]));
 
+	ub_new = ubus_reply_from_blob(ub, true);
 	ubus_msg_free(ub);
+	ub = ub_new;
 
-	ub = ubus_reply_from_blob(ub, true);
 	if (!ub)
 		return UBUS_STATUS_NO_DATA;
 
 	ub->hdr.type = UBUS_MSG_INVOKE;
 	ub->hdr.peer = cl->id.id;
-	ubus_msg_send(obj->client, ub);
+	ubus_msg_send(obj->client, ub, true);
 
 	return -1;
 }
 
+static struct ubus_client *ubusd_get_client_by_id(uint32_t id)
+{
+	struct ubus_id *clid;
+
+	clid = ubus_find_id(&clients, id);
+	if (!clid)
+		return NULL;
+
+	return container_of(clid, struct ubus_client, id);
+}
+
 static int ubusd_handle_response(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
 {
 	struct ubus_object *obj;
-	struct ubus_id *id;
 
 	if (!attr[UBUS_ATTR_OBJID] ||
 	    (ub->hdr.type == UBUS_MSG_STATUS && !attr[UBUS_ATTR_STATUS]) ||
 	    (ub->hdr.type == UBUS_MSG_DATA && !attr[UBUS_ATTR_DATA]))
 		goto error;
 
-	id = ubus_find_id(&objects, blob_get_int32(attr[UBUS_ATTR_OBJID]));
-	if (!id)
+	obj = ubusd_find_object(blob_get_u32(attr[UBUS_ATTR_OBJID]));
+	if (!obj)
 		goto error;
 
-	obj = container_of(id, struct ubus_object, id);
 	if (cl != obj->client)
 		goto error;
 
@@ -222,8 +276,8 @@ static int ubusd_handle_response(struct ubus_client *cl, struct ubus_msg_buf *ub
 	if (!cl)
 		goto error;
 
-	ub->hdr.peer = blob_get_int32(attr[UBUS_ATTR_OBJID]);
-	ubus_msg_send(cl, ub);
+	ub->hdr.peer = blob_get_u32(attr[UBUS_ATTR_OBJID]);
+	ubus_msg_send(cl, ub, true);
 	return -1;
 
 error:
@@ -231,16 +285,74 @@ error:
 	return -1;
 }
 
+static int ubusd_handle_add_watch(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
+{
+	struct ubus_object *obj, *target;
+
+	if (!attr[UBUS_ATTR_OBJID] || !attr[UBUS_ATTR_TARGET] ||
+	    !attr[UBUS_ATTR_METHOD]) {
+		return UBUS_STATUS_INVALID_ARGUMENT;
+	}
+
+	obj = ubusd_find_object(blob_get_u32(attr[UBUS_ATTR_OBJID]));
+	if (!obj)
+		return UBUS_STATUS_NOT_FOUND;
+
+	if (cl != obj->client)
+		return UBUS_STATUS_INVALID_ARGUMENT;
+
+	target = ubusd_find_object(blob_get_u32(attr[UBUS_ATTR_TARGET]));
+	if (!target)
+		return UBUS_STATUS_NOT_FOUND;
+
+	if (cl == target->client)
+		return UBUS_STATUS_INVALID_ARGUMENT;
+
+	ubus_watch_new(obj, target, blob_data(attr[UBUS_ATTR_METHOD]));
+	return 0;
+}
+
+static int ubusd_handle_remove_watch(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
+{
+	struct ubus_object *obj;
+	struct ubus_watch *w;
+	uint32_t id;
+
+	if (!attr[UBUS_ATTR_OBJID] || !attr[UBUS_ATTR_TARGET])
+		return UBUS_STATUS_INVALID_ARGUMENT;
+
+	obj = ubusd_find_object(blob_get_u32(attr[UBUS_ATTR_OBJID]));
+	if (!obj)
+		return UBUS_STATUS_NOT_FOUND;
+
+	if (cl != obj->client)
+		return UBUS_STATUS_INVALID_ARGUMENT;
+
+	id = blob_get_u32(attr[UBUS_ATTR_TARGET]);
+	list_for_each_entry(w, &obj->watched, watched_list) {
+		if (w->watched->id.id != id)
+			continue;
+
+		ubus_watch_free(w);
+		return 0;
+	}
+
+	return UBUS_STATUS_NOT_FOUND;
+}
+
 static const ubus_cmd_cb handlers[__UBUS_MSG_LAST] = {
 	[UBUS_MSG_PING] = ubusd_send_pong,
-	[UBUS_MSG_PUBLISH] = ubusd_handle_publish,
+	[UBUS_MSG_ADD_OBJECT] = ubusd_handle_add_object,
+	[UBUS_MSG_REMOVE_OBJECT] = ubusd_handle_remove_object,
 	[UBUS_MSG_LOOKUP] = ubusd_handle_lookup,
 	[UBUS_MSG_INVOKE] = ubusd_handle_invoke,
 	[UBUS_MSG_STATUS] = ubusd_handle_response,
 	[UBUS_MSG_DATA] = ubusd_handle_response,
+	[UBUS_MSG_ADD_WATCH] = ubusd_handle_add_watch,
+	[UBUS_MSG_REMOVE_WATCH] = ubusd_handle_remove_watch,
 };
 
-void ubusd_receive_message(struct ubus_client *cl, struct ubus_msg_buf *ub)
+void ubusd_proto_receive_message(struct ubus_client *cl, struct ubus_msg_buf *ub)
 {
 	ubus_cmd_cb cb = NULL;
 	int ret;
@@ -262,11 +374,74 @@ void ubusd_receive_message(struct ubus_client *cl, struct ubus_msg_buf *ub)
 	ubus_msg_free(ub);
 
 	*retmsg_data = htonl(ret);
-	ubus_msg_send(cl, ubus_msg_ref(retmsg));
+	ubus_msg_send(cl, retmsg, false);
+}
+
+struct ubus_client *ubusd_proto_new_client(int fd, uloop_fd_handler cb)
+{
+	struct ubus_client *cl;
+
+	cl = calloc(1, sizeof(*cl));
+	if (!cl)
+		return NULL;
+
+	INIT_LIST_HEAD(&cl->objects);
+	cl->sock.fd = fd;
+	cl->sock.cb = cb;
+
+	if (!ubus_alloc_id(&clients, &cl->id, 0))
+		goto free;
+
+	if (!ubusd_send_hello(cl))
+		goto delete;
+
+	return cl;
+
+delete:
+	ubus_free_id(&clients, &cl->id);
+free:
+	free(cl);
+	return NULL;
+}
+
+void ubusd_proto_free_client(struct ubus_client *cl)
+{
+	struct ubus_object *obj;
+
+	while (!list_empty(&cl->objects)) {
+		obj = list_first_entry(&cl->objects, struct ubus_object, list);
+		ubusd_free_object(obj);
+	}
+
+	ubus_free_id(&clients, &cl->id);
+}
+
+void ubus_proto_notify_watch(struct ubus_watch *w)
+{
+	struct ubus_msg_buf *ub;
+	void *data;
+
+	blob_buf_init(&b, 0);
+	blob_put_int32(&b, UBUS_ATTR_OBJID, w->watcher->id.id);
+	blob_put_string(&b, UBUS_ATTR_METHOD, w->method);
+
+	data = blob_nest_start(&b, UBUS_ATTR_DATA);
+	blobmsg_add_string(&b, "notify", "remove");
+	blobmsg_add_u32(&b, "id", w->watched->id.id);
+	blobmsg_add_u32(&b, "peer", w->watched->client->id.id);
+	blob_nest_end(&b, data);
+
+	ub = ubus_msg_from_blob(false);
+	ubus_msg_init(ub, UBUS_MSG_INVOKE, ++w->watcher->invoke_seq, 0);
+	ubus_msg_send(w->watcher->client, ub, true);
+
+	ubus_watch_free(w);
 }
 
 static void __init ubusd_proto_init(void)
 {
+	ubus_init_id_tree(&clients);
+
 	blob_buf_init(&b, 0);
 	blob_put_int32(&b, UBUS_ATTR_STATUS, 0);