X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=libubus.c;h=12bdb37a2318ac365ea51673f17148548c15bd0c;hp=64190f78df2e294b7ec8389628520bc0b26d3e6e;hb=659a98c8107d194f3ef6822dacc97e02e7c53e31;hpb=7b262aec3843912d68e020f0750b6f96e2f7c8e3

diff --git a/libubus.c b/libubus.c
index 64190f7..12bdb37 100644
--- a/libubus.c
+++ b/libubus.c
@@ -55,7 +55,7 @@ static int ubus_cmp_id(const void *k1, const void *k2, void *ptr)
 		return *id1 > *id2;
 }
 
-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;
@@ -102,8 +102,8 @@ static int ubus_send_msg(struct ubus_context *ctx, uint32_t seq,
 	return writev(ctx->sock.fd, iov, 2);
 }
 
-int ubus_start_request(struct ubus_context *ctx, struct ubus_request *req,
-		       struct blob_attr *msg, int cmd, uint32_t peer)
+static int ubus_start_request(struct ubus_context *ctx, struct ubus_request *req,
+			      struct blob_attr *msg, int cmd, uint32_t peer)
 {
 	memset(req, 0, sizeof(*req));
 
@@ -183,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;
@@ -192,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);
 	}
 }
@@ -232,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;
 
@@ -304,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:
@@ -329,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;
 
@@ -396,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:
@@ -408,13 +423,97 @@ skip:
 	}
 }
 
+struct ubus_lookup_request {
+	struct ubus_request req;
+	ubus_lookup_handler_t cb;
+};
+
+static void ubus_lookup_cb(struct ubus_request *ureq, int type, struct blob_attr *msg)
+{
+	struct ubus_lookup_request *req;
+	struct ubus_object_data obj;
+	struct blob_attr **attr;
+
+	req = container_of(ureq, struct ubus_lookup_request, req);
+	attr = ubus_parse_msg(msg);
+
+	if (!attr[UBUS_ATTR_OBJID] || !attr[UBUS_ATTR_OBJPATH] ||
+	    !attr[UBUS_ATTR_OBJTYPE])
+		return;
+
+	memset(&obj, 0, sizeof(obj));
+	obj.id = blob_get_int32(attr[UBUS_ATTR_OBJID]);
+	obj.path = blob_data(attr[UBUS_ATTR_OBJPATH]);
+	obj.type_id = blob_get_int32(attr[UBUS_ATTR_OBJTYPE]);
+	obj.signature = attr[UBUS_ATTR_SIGNATURE];
+	req->cb(ureq->ctx, &obj, ureq->priv);
+}
+
+int ubus_lookup(struct ubus_context *ctx, const char *path,
+		ubus_lookup_handler_t cb, void *priv)
+{
+	struct ubus_lookup_request lookup;
+
+	blob_buf_init(&b, 0);
+	if (path)
+		blob_put_string(&b, UBUS_ATTR_OBJPATH, path);
+	ubus_start_request(ctx, &lookup.req, b.head, UBUS_MSG_LOOKUP, 0);
+	lookup.req.raw_data_cb = ubus_lookup_cb;
+	lookup.req.priv = priv;
+	lookup.cb = cb;
+	return ubus_complete_request(ctx, &lookup.req);
+}
+
+static void ubus_lookup_id_cb(struct ubus_request *req, int type, struct blob_attr *msg)
+{
+	struct blob_attr **attr;
+	uint32_t *id = req->priv;
+
+	attr = ubus_parse_msg(msg);
+
+	if (!attr[UBUS_ATTR_OBJID])
+		return;
+
+	*id = blob_get_int32(attr[UBUS_ATTR_OBJID]);
+}
+
+int ubus_lookup_id(struct ubus_context *ctx, const char *path, uint32_t *id)
+{
+	struct ubus_request req;
+
+	blob_buf_init(&b, 0);
+	if (path)
+		blob_put_string(&b, UBUS_ATTR_OBJPATH, path);
+	ubus_start_request(ctx, &req, b.head, UBUS_MSG_LOOKUP, 0);
+	req.raw_data_cb = ubus_lookup_id_cb;
+	req.priv = id;
+
+	return ubus_complete_request(ctx, &req);
+}
+
+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)
 {
 	blob_buf_init(&b, 0);
 	blob_put_int32(&b, UBUS_ATTR_OBJID, obj);
 	blob_put_string(&b, UBUS_ATTR_METHOD, method);
-	blob_put(&b, UBUS_ATTR_DATA, blob_data(msg), blob_len(msg));
+	if (msg)
+		blob_put(&b, UBUS_ATTR_DATA, blob_data(msg), blob_len(msg));
 
 	ubus_start_request(ctx, req, b.head, UBUS_MSG_INVOKE, obj);
 }
@@ -523,7 +622,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)
@@ -558,36 +657,27 @@ struct ubus_context *ubus_connect(const char *path)
 		goto error;
 
 	ctx->sock.fd = usock(USOCK_UNIX, path, NULL);
-	if (ctx->sock.fd < 0) {
-		DPRINTF("Failed to connect to server\n");
+	if (ctx->sock.fd < 0)
 		goto error_free;
-	}
+
 	ctx->sock.cb = ubus_handle_data;
 
-	if (read(ctx->sock.fd, &hdr, sizeof(hdr)) != sizeof(hdr)) {
-		DPRINTF("Failed to read initial message data\n");
+	if (read(ctx->sock.fd, &hdr, sizeof(hdr)) != sizeof(hdr))
 		goto error_close;
-	}
 
-	if (!ubus_validate_hdr(&hdr.hdr)) {
-		DPRINTF("Failed to validate initial message header\n");
+	if (!ubus_validate_hdr(&hdr.hdr))
 		goto error_close;
-	}
 
-	if (hdr.hdr.type != UBUS_MSG_HELLO) {
-		DPRINTF("Unexpected initial message\n");
+	if (hdr.hdr.type != UBUS_MSG_HELLO)
 		goto error_close;
-	}
 
 	buf = calloc(1, blob_raw_len(&hdr.data));
 	if (!buf)
 		goto error_close;
 
 	memcpy(buf, &hdr.data, sizeof(hdr.data));
-	if (read(ctx->sock.fd, blob_data(buf), blob_len(buf)) != blob_len(buf)) {
-		DPRINTF("Failed to retrieve initial message data\n");
+	if (read(ctx->sock.fd, blob_data(buf), blob_len(buf)) != blob_len(buf))
 		goto error_free_buf;
-	}
 
 	ctx->local_id = hdr.hdr.peer;
 	free(buf);
@@ -597,10 +687,8 @@ struct ubus_context *ubus_connect(const char *path)
 	INIT_LIST_HEAD(&ctx->requests);
 	avl_init(&ctx->objects, ubus_cmp_id, false, NULL);
 
-	if (!ctx->local_id) {
-		DPRINTF("Failed to get local peer id\n");
+	if (!ctx->local_id)
 		goto error_close;
-	}
 
 	return ctx;