X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=ubusd_proto.c;h=1b3216fba67163c1422350c83b8cd39f9239160d;hp=3c5a2367557c64c979ea811fb2d20a3843107c2e;hb=659a98c8107d194f3ef6822dacc97e02e7c53e31;hpb=527d2523330cb41e23a435d89352680d108c789a

diff --git a/ubusd_proto.c b/ubusd_proto.c
index 3c5a236..1b3216f 100644
--- a/ubusd_proto.c
+++ b/ubusd_proto.c
@@ -7,7 +7,7 @@ static int *retmsg_data;
 
 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 },
@@ -62,19 +62,17 @@ bool ubusd_send_hello(struct ubus_client *cl)
 	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));
 	return 0;
 }
 
-static int ubusd_handle_publish(struct ubus_client *cl, struct ubus_msg_buf *ub)
+static int ubusd_handle_publish(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;
@@ -102,6 +100,7 @@ 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)
@@ -115,16 +114,14 @@ static void ubusd_send_obj(struct ubus_client *cl, struct ubus_msg_buf *ub, stru
 	ubus_msg_send(cl, ub);
 }
 
-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);
@@ -163,28 +160,21 @@ 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 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])
+	if (!attr[UBUS_ATTR_METHOD] || !attr[UBUS_ATTR_OBJID])
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
-	if (attr[UBUS_ATTR_OBJID]) {
-		struct ubus_id *id;
-		id = ubus_find_id(&objects, blob_get_int32(attr[UBUS_ATTR_OBJID]));
-		if (id)
-			obj = container_of(id, struct ubus_object, id);
-	} else if (attr[UBUS_ATTR_OBJPATH]) {
-		const char *objpath = blob_data(attr[UBUS_ATTR_OBJPATH]);
-		obj = avl_find_element(&path, objpath, obj, path);
-	}
-	if (!obj)
+	id = ubus_find_id(&objects, blob_get_int32(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);
@@ -206,12 +196,22 @@ static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub)
 	return -1;
 }
 
-static int ubusd_handle_status(struct ubus_client *cl, struct ubus_msg_buf *ub)
+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;
+
+	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)
+		goto error;
 
-	attr = ubus_parse_msg(ub->data);
-	if (!attr[UBUS_ATTR_OBJID] || !attr[UBUS_ATTR_STATUS])
+	obj = container_of(id, struct ubus_object, id);
+	if (cl != obj->client)
 		goto error;
 
 	cl = ubusd_get_client_by_id(ub->hdr.peer);
@@ -232,7 +232,8 @@ static const ubus_cmd_cb handlers[__UBUS_MSG_LAST] = {
 	[UBUS_MSG_PUBLISH] = ubusd_handle_publish,
 	[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,
 };
 
 void ubusd_receive_message(struct ubus_client *cl, struct ubus_msg_buf *ub)
@@ -247,7 +248,7 @@ void ubusd_receive_message(struct ubus_client *cl, struct ubus_msg_buf *ub)
 		cb = handlers[ub->hdr.type];
 
 	if (cb)
-		ret = cb(cl, ub);
+		ret = cb(cl, ub, ubus_parse_msg(ub->data));
 	else
 		ret = UBUS_STATUS_INVALID_COMMAND;