X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=ubusd_proto.c;h=2e4c2af63934ea48f34c7883dc20cf0f0a04d4ca;hb=0fccce4445b1961451ce3d99a99c1c0defbd4490;hp=821c24aca87164b8b2c7479a292cb9f82d9b2f2a;hpb=f86ec180c049f3344d18a2675ce95cdf7a7e62b7;p=project%2Fubus.git

diff --git a/ubusd_proto.c b/ubusd_proto.c
index 821c24a..2e4c2af 100644
--- a/ubusd_proto.c
+++ b/ubusd_proto.c
@@ -163,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;
 
@@ -185,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)
@@ -287,6 +285,59 @@ 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_ADD_OBJECT] = ubusd_handle_add_object,
@@ -295,6 +346,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_SUBSCRIBE] = ubusd_handle_add_watch,
+	[UBUS_MSG_UNSUBSCRIBE] = ubusd_handle_remove_watch,
 };
 
 void ubusd_proto_receive_message(struct ubus_client *cl, struct ubus_msg_buf *ub)
@@ -361,6 +414,35 @@ void ubusd_proto_free_client(struct ubus_client *cl)
 	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);