X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=ubusd_proto.c;h=f461e47f781ec43b555adbe6fa8f4f41382c916f;hp=0654e99a60e9629c401bf2053c9a8bcf446adc27;hb=df69022bebe444a0c2ec2c9316748dc1dd833b4e;hpb=37e914937b0ae4c88f067149eca1ad67a55c2952

diff --git a/ubusd_proto.c b/ubusd_proto.c
index 0654e99..f461e47 100644
--- a/ubusd_proto.c
+++ b/ubusd_proto.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 <arpa/inet.h>
 #include "ubusd.h"
 
@@ -41,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;
 
@@ -150,7 +163,6 @@ static int ubusd_handle_lookup(struct ubus_client *cl, struct ubus_msg_buf *ub,
 {
 	struct ubus_object *obj;
 	char *objpath;
-	bool wildcard = false;
 	bool found = false;
 	int len;
 
@@ -172,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)
@@ -194,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;
@@ -219,9 +231,10 @@ 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;
 
@@ -272,6 +285,61 @@ 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_ADD_OBJECT] = ubusd_handle_add_object,
@@ -280,6 +348,8 @@ static const ubus_cmd_cb handlers[__UBUS_MSG_LAST] = {
 	[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_proto_receive_message(struct ubus_client *cl, struct ubus_msg_buf *ub)
@@ -346,6 +416,28 @@ void ubusd_proto_free_client(struct ubus_client *cl)
 	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);