X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=libubus-io.c;h=9d3ac6c33f4d926c7f5c5d2033d531fc5fc6f834;hp=bc054b8d0ff263a807482b48c093a6309ddcee72;hb=f361bfa5fcb2daadf3b160583ce665024f8d108e;hpb=47a9ab0c645d4d49def8080ae68c7c477e733530

diff --git a/libubus-io.c b/libubus-io.c
index bc054b8..9d3ac6c 100644
--- a/libubus-io.c
+++ b/libubus-io.c
@@ -11,6 +11,7 @@
  * GNU General Public License for more details.
  */
 
+#define _GNU_SOURCE
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <sys/socket.h>
@@ -28,6 +29,8 @@
 
 #define STATIC_IOV(_var) { .iov_base = (char *) &(_var), .iov_len = sizeof(_var) }
 
+#define UBUS_MSGBUF_REDUCTION_INTERVAL	16
+
 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 },
@@ -109,7 +112,10 @@ static int writev_retry(int fd, struct iovec *iov, int iov_len, int sock_fd)
 			if (!iov_len)
 				return len;
 		}
+		iov->iov_base += cur_len;
 		iov->iov_len -= cur_len;
+		msghdr.msg_iov = iov;
+		msghdr.msg_iovlen = iov_len;
 	} while (1);
 
 	/* Should never reach here */
@@ -142,6 +148,9 @@ int __hidden ubus_send_msg(struct ubus_context *ctx, uint32_t seq,
 	if (ret < 0)
 		ctx->sock.eof = true;
 
+	if (fd >= 0)
+		close(fd);
+
 	return ret;
 }
 
@@ -209,7 +218,7 @@ static int recv_retry(int fd, struct iovec *iov, bool wait, int *recv_fd)
 
 static bool ubus_validate_hdr(struct ubus_msghdr *hdr)
 {
-	struct blob_attr *data = ubus_msghdr_data(hdr);
+	struct blob_attr *data = (struct blob_attr *) (hdr + 1);
 
 	if (hdr->version != 0)
 		return false;
@@ -223,13 +232,47 @@ static bool ubus_validate_hdr(struct ubus_msghdr *hdr)
 	return true;
 }
 
+static bool alloc_msg_buf(struct ubus_context *ctx, int len)
+{
+	void *ptr;
+	int buf_len = ctx->msgbuf_data_len;
+	int rem;
+
+	if (!ctx->msgbuf.data)
+		buf_len = 0;
+
+	rem = (len % UBUS_MSG_CHUNK_SIZE);
+	if (rem > 0)
+		len += UBUS_MSG_CHUNK_SIZE - rem;
+
+	if (len < buf_len &&
+	    ++ctx->msgbuf_reduction_counter > UBUS_MSGBUF_REDUCTION_INTERVAL) {
+		ctx->msgbuf_reduction_counter = 0;
+		buf_len = 0;
+	}
+
+	if (len <= buf_len)
+		return true;
+
+	ptr = realloc(ctx->msgbuf.data, len);
+	if (!ptr)
+		return false;
+
+	ctx->msgbuf.data = ptr;
+	return true;
+}
+
 static bool get_next_msg(struct ubus_context *ctx, int *recv_fd)
 {
-	struct iovec iov = STATIC_IOV(ctx->msgbuf.hdr);
+	struct {
+		struct ubus_msghdr hdr;
+		struct blob_attr data;
+	} hdrbuf;
+	struct iovec iov = STATIC_IOV(hdrbuf);
+	int len;
 	int r;
 
 	/* receive header + start attribute */
-	iov.iov_len += sizeof(struct blob_attr);
 	r = recv_retry(ctx->sock.fd, &iov, false, recv_fd);
 	if (r <= 0) {
 		if (r < 0)
@@ -238,21 +281,31 @@ static bool get_next_msg(struct ubus_context *ctx, int *recv_fd)
 		return false;
 	}
 
-	iov.iov_len = blob_len(ubus_msghdr_data(&ctx->msgbuf.hdr));
+	if (!ubus_validate_hdr(&hdrbuf.hdr))
+		return false;
+
+	len = blob_raw_len(&hdrbuf.data);
+	if (!alloc_msg_buf(ctx, len))
+		return false;
+
+	memcpy(&ctx->msgbuf.hdr, &hdrbuf.hdr, sizeof(hdrbuf.hdr));
+	memcpy(ctx->msgbuf.data, &hdrbuf.data, sizeof(hdrbuf.data));
+
+	iov.iov_base = (char *)ctx->msgbuf.data + sizeof(hdrbuf.data);
+	iov.iov_len = blob_len(ctx->msgbuf.data);
 	if (iov.iov_len > 0 && !recv_retry(ctx->sock.fd, &iov, true, NULL))
 		return false;
 
-	return ubus_validate_hdr(&ctx->msgbuf.hdr);
+	return true;
 }
 
 void __hidden ubus_handle_data(struct uloop_fd *u, unsigned int events)
 {
 	struct ubus_context *ctx = container_of(u, struct ubus_context, sock);
-	struct ubus_msghdr *hdr = &ctx->msgbuf.hdr;
 	int recv_fd = -1;
 
 	while (get_next_msg(ctx, &recv_fd)) {
-		ubus_process_msg(ctx, hdr, recv_fd);
+		ubus_process_msg(ctx, &ctx->msgbuf, recv_fd);
 		if (uloop_cancelled)
 			break;
 	}
@@ -261,6 +314,17 @@ void __hidden ubus_handle_data(struct uloop_fd *u, unsigned int events)
 		ctx->connection_lost(ctx);
 }
 
+void __hidden ubus_poll_data(struct ubus_context *ctx, int timeout)
+{
+	struct pollfd pfd = {
+		.fd = ctx->sock.fd,
+		.events = POLLIN | POLLERR,
+	};
+
+	poll(&pfd, 1, timeout);
+	ubus_handle_data(&ctx->sock, ULOOP_READ);
+}
+
 static void
 ubus_refresh_state(struct ubus_context *ctx)
 {
@@ -329,7 +393,7 @@ int ubus_reconnect(struct ubus_context *ctx, const char *path)
 		goto out_free;
 
 	ret = UBUS_STATUS_OK;
-	fcntl(ctx->sock.fd, F_SETFL, fcntl(ctx->sock.fd, F_GETFL) | O_NONBLOCK);
+	fcntl(ctx->sock.fd, F_SETFL, fcntl(ctx->sock.fd, F_GETFL) | O_NONBLOCK | O_CLOEXEC);
 
 	ubus_refresh_state(ctx);