X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=libubus.c;h=1342ba19463810d09220c29017ca452db60c3e82;hp=93f9bac3483b441576eaeb9f68d6319f364c279c;hb=1555e4610fe2f82419821a34d471dda874a8c885;hpb=1a871e1e89055f8683793f1ca0d629ca2fa4d3be

diff --git a/libubus.c b/libubus.c
index 93f9bac..1342ba1 100644
--- a/libubus.c
+++ b/libubus.c
@@ -35,6 +35,7 @@ static const struct blob_attr_info ubus_policy[UBUS_ATTR_MAX] = {
 	[UBUS_ATTR_STATUS] = { .type = BLOB_ATTR_INT32 },
 	[UBUS_ATTR_OBJID] = { .type = BLOB_ATTR_INT32 },
 	[UBUS_ATTR_OBJPATH] = { .type = BLOB_ATTR_STRING },
+	[UBUS_ATTR_METHOD] = { .type = BLOB_ATTR_STRING },
 };
 static struct blob_attr *attrbuf[UBUS_ATTR_MAX];
 
@@ -182,6 +183,20 @@ static bool ubus_get_status(struct ubus_msghdr *hdr, int *ret)
 	return true;
 }
 
+static void req_data_cb(struct ubus_request *req, int type, struct blob_attr *data)
+{
+	struct blob_attr **attr;
+
+	if (req->raw_data_cb)
+		req->raw_data_cb(req, type, data);
+
+	if (!req->data_cb)
+		return;
+
+	attr = ubus_parse_msg(data);
+	req->data_cb(req, type, attr[UBUS_ATTR_DATA]);
+}
+
 static void ubus_process_req_data(struct ubus_request *req)
 {
 	struct ubus_pending_data *data;
@@ -191,7 +206,7 @@ static void ubus_process_req_data(struct ubus_request *req)
 			struct ubus_pending_data, list);
 		list_del(&data->list);
 		if (!req->cancelled)
-			req->data_cb(req, data->type, data->data);
+			req_data_cb(req, data->type, data->data);
 		free(data);
 	}
 }
@@ -231,7 +246,7 @@ static void ubus_req_data(struct ubus_request *req, struct ubus_msghdr *hdr)
 
 	if (!req->blocked) {
 		req->blocked = true;
-		req->data_cb(req, hdr->type, hdr->data);
+		req_data_cb(req, hdr->type, hdr->data);
 		ubus_process_req_data(req);
 		req->blocked = false;
 
@@ -274,12 +289,16 @@ static void ubus_process_invoke(struct ubus_context *ctx, struct ubus_msghdr *hd
 
 	ubus_parse_msg(hdr->data);
 
-	if (!attrbuf[UBUS_ATTR_METHOD] || !attrbuf[UBUS_ATTR_OBJID]) {
+	if (!attrbuf[UBUS_ATTR_OBJID])
+		return;
+
+	objid = blob_get_int32(attrbuf[UBUS_ATTR_OBJID]);
+
+	if (!attrbuf[UBUS_ATTR_METHOD]) {
 		ret = UBUS_STATUS_INVALID_ARGUMENT;
 		goto send;
 	}
 
-	objid = blob_get_int32(attrbuf[UBUS_ATTR_OBJID]);
 	obj = avl_find_element(&ctx->objects, &objid, obj, avl);
 	if (!obj) {
 		ret = UBUS_STATUS_NOT_FOUND;
@@ -299,7 +318,8 @@ found:
 	req.object = objid;
 	req.peer = hdr->peer;
 	req.seq = hdr->seq;
-	ret = obj->methods[method].handler(obj, &req, obj->methods[method].name,
+	ret = obj->methods[method].handler(ctx, obj, &req,
+					   obj->methods[method].name,
 					   attrbuf[UBUS_ATTR_DATA]);
 
 send:
@@ -324,7 +344,7 @@ static void ubus_process_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr)
 
 	case UBUS_MSG_DATA:
 		req = ubus_find_request(ctx, hdr->seq, hdr->peer);
-		if (req && req->data_cb)
+		if (req && (req->data_cb || req->raw_data_cb))
 			ubus_req_data(req, hdr);
 		break;
 
@@ -362,6 +382,9 @@ static void ubus_handle_data(struct uloop_fd *u, unsigned int events)
 
 	while (get_next_msg(ctx, false))
 		ubus_process_msg(ctx, hdr);
+
+	if (u->eof)
+		ctx->connection_lost(ctx);
 }
 
 int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req)
@@ -388,7 +411,7 @@ int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req)
 		case UBUS_MSG_STATUS:
 			return ubus_process_req_status(req, hdr);
 		case UBUS_MSG_DATA:
-			if (req->data_cb)
+			if (req->data_cb || req->raw_data_cb)
 				ubus_req_data(req, hdr);
 			continue;
 		default:
@@ -400,6 +423,21 @@ skip:
 	}
 }
 
+int ubus_send_reply(struct ubus_context *ctx, struct ubus_request_data *req,
+		    struct blob_attr *msg)
+{
+	int ret;
+
+	blob_buf_init(&b, 0);
+	blob_put_int32(&b, UBUS_ATTR_OBJID, req->object);
+	blob_put(&b, UBUS_ATTR_DATA, blob_data(msg), blob_len(msg));
+	ret = ubus_send_msg(ctx, req->seq, b.head, UBUS_MSG_DATA, req->peer);
+	if (ret < 0)
+		return UBUS_STATUS_NO_DATA;
+
+	return 0;
+}
+
 void ubus_invoke_async(struct ubus_context *ctx, uint32_t obj, const char *method,
                        struct blob_attr *msg, struct ubus_request *req)
 {
@@ -515,7 +553,7 @@ int ubus_publish(struct ubus_context *ctx, struct ubus_object *obj)
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
 	ubus_start_request(ctx, &req, b.head, UBUS_MSG_PUBLISH, 0);
-	req.data_cb = ubus_publish_cb;
+	req.raw_data_cb = ubus_publish_cb;
 	req.priv = obj;
 	ret = ubus_complete_request(ctx, &req);
 	if (ret)
@@ -527,6 +565,12 @@ int ubus_publish(struct ubus_context *ctx, struct ubus_object *obj)
 	return 0;
 }
 
+void ubus_default_connection_lost(struct ubus_context *ctx)
+{
+	if (ctx->sock.registered)
+		uloop_end();
+}
+
 struct ubus_context *ubus_connect(const char *path)
 {
 	struct ubus_context *ctx;
@@ -578,6 +622,8 @@ struct ubus_context *ubus_connect(const char *path)
 	ctx->local_id = hdr.hdr.peer;
 	free(buf);
 
+	ctx->connection_lost = ubus_default_connection_lost;
+
 	INIT_LIST_HEAD(&ctx->requests);
 	avl_init(&ctx->objects, ubus_cmp_id, false, NULL);