X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=ubusd_proto.c;h=130e9a8007aec328cb3be10494f0a0b15c5a4a22;hp=005f07b893ffca576ebdf98161af8d932e89c97e;hb=e52db46c9c5d8eabe5abaccf28468c6e0b99be95;hpb=a03acea49cb86f708d398bdd1daeda99ee0152c2

diff --git a/ubusd_proto.c b/ubusd_proto.c
index 005f07b..130e9a8 100644
--- a/ubusd_proto.c
+++ b/ubusd_proto.c
@@ -1,13 +1,29 @@
+/*
+ * Copyright (C) 2011-2014 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 <unistd.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];
 
-typedef int (*ubus_cmd_cb)(struct ubus_client *cl, struct ubus_msg_buf *ub);
+typedef int (*ubus_cmd_cb)(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr);
 
 static const struct blob_attr_info ubus_policy[UBUS_ATTR_MAX] = {
 	[UBUS_ATTR_SIGNATURE] = { .type = BLOB_ATTR_NESTED },
@@ -15,14 +31,24 @@ static const struct blob_attr_info ubus_policy[UBUS_ATTR_MAX] = {
 	[UBUS_ATTR_OBJPATH] = { .type = BLOB_ATTR_STRING },
 	[UBUS_ATTR_OBJID] = { .type = BLOB_ATTR_INT32 },
 	[UBUS_ATTR_STATUS] = { .type = BLOB_ATTR_INT32 },
+	[UBUS_ATTR_METHOD] = { .type = BLOB_ATTR_STRING },
 };
 
-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;
 }
 
+static void ubus_msg_close_fd(struct ubus_msg_buf *ub)
+{
+	if (ub->fd < 0)
+		return;
+
+	close(ub->fd);
+	ub->fd = -1;
+}
+
 static void ubus_msg_init(struct ubus_msg_buf *ub, uint8_t type, uint16_t seq, uint32_t peer)
 {
 	ub->hdr.version = 0;
@@ -40,7 +66,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 +74,19 @@ 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 void
+ubus_send_msg_from_blob(struct ubus_client *cl, struct ubus_msg_buf *ub,
+			uint8_t type)
+{
+	ub = ubus_reply_from_blob(ub, true);
+	if (!ub)
+		return;
+
+	ub->hdr.type = type;
+	ubus_msg_send(cl, ub, true);
+}
+
+static bool ubusd_send_hello(struct ubus_client *cl)
 {
 	struct ubus_msg_buf *ub;
 
@@ -58,23 +96,48 @@ 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)
+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)
+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);
+	ubus_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
+
+	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;
-	struct blob_attr **attr;
 
-	attr = ubus_parse_msg(ub->data);
 	obj = ubusd_create_object(cl, attr);
 	if (!obj)
 		return UBUS_STATUS_INVALID_ARGUMENT;
@@ -84,11 +147,7 @@ static int ubusd_handle_publish(struct ubus_client *cl, struct ubus_msg_buf *ub)
 	if (attr[UBUS_ATTR_SIGNATURE])
 		blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id.id);
 
-	ub = ubus_reply_from_blob(ub, true);
-	if (!ub)
-		return UBUS_STATUS_NO_DATA;
-
-	ubus_msg_send(cl, ub);
+	ubus_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
 	return 0;
 }
 
@@ -102,29 +161,23 @@ static void ubusd_send_obj(struct ubus_client *cl, struct ubus_msg_buf *ub, stru
 	if (obj->path.key)
 		blob_put_string(&b, UBUS_ATTR_OBJPATH, obj->path.key);
 	blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id.id);
+	blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id.id);
 
 	s = blob_nest_start(&b, UBUS_ATTR_SIGNATURE);
 	list_for_each_entry(m, &obj->type->methods, list)
-		blob_put(&b, blob_id(m->data), blob_data(m->data), blob_len(m->data));
+		blobmsg_add_blob(&b, m->data);
 	blob_nest_end(&b, s);
 
-	ub = ubus_reply_from_blob(ub, true);
-	if (!ub)
-		return;
-
-	ubus_msg_send(cl, ub);
+	ubus_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
 }
 
-static int ubusd_handle_lookup(struct ubus_client *cl, struct ubus_msg_buf *ub)
+static int ubusd_handle_lookup(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
 {
 	struct ubus_object *obj;
-	struct blob_attr **attr;
 	char *objpath;
-	bool wildcard = false;
 	bool found = false;
 	int len;
 
-	attr = ubus_parse_msg(ub->data);
 	if (!attr[UBUS_ATTR_OBJPATH]) {
 		avl_for_each_element(&path, obj, path)
 			ubusd_send_obj(cl, ub, obj);
@@ -143,7 +196,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)
@@ -163,59 +215,118 @@ static int ubusd_handle_lookup(struct ubus_client *cl, struct ubus_msg_buf *ub)
 	return 0;
 }
 
-static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub)
+static void
+ubusd_forward_invoke(struct ubus_object *obj, const char *method,
+		     struct ubus_msg_buf *ub, struct blob_attr *data)
+{
+	blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id.id);
+	blob_put_string(&b, UBUS_ATTR_METHOD, method);
+	if (data)
+		blob_put(&b, UBUS_ATTR_DATA, blob_data(data), blob_len(data));
+
+	ubus_send_msg_from_blob(obj->client, ub, UBUS_MSG_INVOKE);
+}
+
+static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
 {
 	struct ubus_object *obj = NULL;
-	struct blob_attr **attr;
 	struct ubus_id *id;
 	const char *method;
 
-	attr = ubus_parse_msg(ub->data);
 	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;
 
 	obj = container_of(id, struct ubus_object, id);
 
 	method = blob_data(attr[UBUS_ATTR_METHOD]);
-	blob_buf_init(&b, 0);
-	blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id.id);
-	blob_put_string(&b, UBUS_ATTR_METHOD, method);
-	if (attr[UBUS_ATTR_DATA])
-		blob_put(&b, UBUS_ATTR_DATA, blob_data(attr[UBUS_ATTR_DATA]),
-			 blob_len(attr[UBUS_ATTR_DATA]));
 
+	if (!obj->client)
+		return obj->recv_msg(cl, method, attr[UBUS_ATTR_DATA]);
+
+	ub->hdr.peer = cl->id.id;
+	blob_buf_init(&b, 0);
+	ubusd_forward_invoke(obj, method, ub, attr[UBUS_ATTR_DATA]);
 	ubus_msg_free(ub);
 
-	ub = ubus_reply_from_blob(ub, true);
-	if (!ub)
-		return UBUS_STATUS_NO_DATA;
+	return -1;
+}
+
+static int ubusd_handle_notify(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
+{
+	struct ubus_object *obj = NULL;
+	struct ubus_subscription *s;
+	struct ubus_id *id;
+	const char *method;
+	bool no_reply = false;
+	void *c;
+
+	if (!attr[UBUS_ATTR_METHOD] || !attr[UBUS_ATTR_OBJID])
+		return UBUS_STATUS_INVALID_ARGUMENT;
+
+	if (attr[UBUS_ATTR_NO_REPLY])
+		no_reply = blob_get_int8(attr[UBUS_ATTR_NO_REPLY]);
+
+	id = ubus_find_id(&objects, blob_get_u32(attr[UBUS_ATTR_OBJID]));
+	if (!id)
+		return UBUS_STATUS_NOT_FOUND;
+
+	obj = container_of(id, struct ubus_object, id);
+	if (obj->client != cl)
+		return UBUS_STATUS_PERMISSION_DENIED;
+
+	if (!no_reply) {
+		blob_buf_init(&b, 0);
+		blob_put_int32(&b, UBUS_ATTR_OBJID, id->id);
+		c = blob_nest_start(&b, UBUS_ATTR_SUBSCRIBERS);
+		list_for_each_entry(s, &obj->subscribers, list) {
+			blob_put_int32(&b, 0, s->subscriber->id.id);
+		}
+		blob_nest_end(&b, c);
+		blob_put_int32(&b, UBUS_ATTR_STATUS, 0);
+		ubus_send_msg_from_blob(cl, ub, UBUS_MSG_STATUS);
+	}
 
-	ub->hdr.type = UBUS_MSG_INVOKE;
 	ub->hdr.peer = cl->id.id;
-	ubus_msg_send(obj->client, ub);
+	method = blob_data(attr[UBUS_ATTR_METHOD]);
+	list_for_each_entry(s, &obj->subscribers, list) {
+		blob_buf_init(&b, 0);
+		if (no_reply)
+			blob_put_int8(&b, UBUS_ATTR_NO_REPLY, 1);
+		ubusd_forward_invoke(s->subscriber, method, ub, attr[UBUS_ATTR_DATA]);
+	}
+	ubus_msg_free(ub);
 
 	return -1;
 }
 
-static int ubusd_handle_status(struct ubus_client *cl, struct ubus_msg_buf *ub)
+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 blob_attr **attr;
 	struct ubus_object *obj;
-	struct ubus_id *id;
 
-	attr = ubus_parse_msg(ub->data);
-	if (!attr[UBUS_ATTR_OBJID] || !attr[UBUS_ATTR_STATUS])
+	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;
 
@@ -223,8 +334,8 @@ static int ubusd_handle_status(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:
@@ -232,15 +343,73 @@ 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])
+		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_subscribe(obj, target);
+	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_subscription *s;
+	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(s, &obj->target_list, target_list) {
+		if (s->target->id.id != id)
+			continue;
+
+		ubus_unsubscribe(s);
+		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_status,
+	[UBUS_MSG_STATUS] = ubusd_handle_response,
+	[UBUS_MSG_DATA] = ubusd_handle_response,
+	[UBUS_MSG_SUBSCRIBE] = ubusd_handle_add_watch,
+	[UBUS_MSG_UNSUBSCRIBE] = ubusd_handle_remove_watch,
+	[UBUS_MSG_NOTIFY] = ubusd_handle_notify,
 };
 
-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;
@@ -251,8 +420,11 @@ void ubusd_receive_message(struct ubus_client *cl, struct ubus_msg_buf *ub)
 	if (ub->hdr.type < __UBUS_MSG_LAST)
 		cb = handlers[ub->hdr.type];
 
+	if (ub->hdr.type != UBUS_MSG_STATUS)
+		ubus_msg_close_fd(ub);
+
 	if (cb)
-		ret = cb(cl, ub);
+		ret = cb(cl, ub, ubus_parse_msg(ub->data));
 	else
 		ret = UBUS_STATUS_INVALID_COMMAND;
 
@@ -262,11 +434,82 @@ 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;
+	cl->pending_msg_fd = -1;
+
+	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_notify_subscription(struct ubus_object *obj)
+{
+	bool active = !list_empty(&obj->subscribers);
+	struct ubus_msg_buf *ub;
+
+	blob_buf_init(&b, 0);
+	blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id.id);
+	blob_put_int8(&b, UBUS_ATTR_ACTIVE, active);
+
+	ub = ubus_msg_from_blob(false);
+	ubus_msg_init(ub, UBUS_MSG_NOTIFY, ++obj->invoke_seq, 0);
+	ubus_msg_send(obj->client, ub, true);
+}
+
+void ubus_notify_unsubscribe(struct ubus_subscription *s)
+{
+	struct ubus_msg_buf *ub;
+
+	blob_buf_init(&b, 0);
+	blob_put_int32(&b, UBUS_ATTR_OBJID, s->subscriber->id.id);
+	blob_put_int32(&b, UBUS_ATTR_TARGET, s->target->id.id);
+
+	ub = ubus_msg_from_blob(false);
+	ubus_msg_init(ub, UBUS_MSG_UNSUBSCRIBE, ++s->subscriber->invoke_seq, 0);
+	ubus_msg_send(s->subscriber->client, ub, true);
+
+	ubus_unsubscribe(s);
 }
 
 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);