X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=libubus-io.c;h=daa710677880c1d5933b45ab9b528116c5f320ca;hp=9a6c7cd77ec168be2b6779fc9fe05aea751c0fa2;hb=HEAD;hpb=1d5ac421a5b3dca60562e876ba70d0c2fe46b3d2

diff --git a/libubus-io.c b/libubus-io.c
index 9a6c7cd..daa7106 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 },
@@ -51,7 +54,7 @@ static void wait_data(int fd, bool write)
 	struct pollfd pfd = { .fd = fd };
 
 	pfd.events = write ? POLLOUT : POLLIN;
-	poll(&pfd, 1, 0);
+	poll(&pfd, 1, -1);
 }
 
 static int writev_retry(int fd, struct iovec *iov, int iov_len, int sock_fd)
@@ -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 */
@@ -127,8 +133,8 @@ int __hidden ubus_send_msg(struct ubus_context *ctx, uint32_t seq,
 
 	hdr.version = 0;
 	hdr.type = cmd;
-	hdr.seq = seq;
-	hdr.peer = peer;
+	hdr.seq = cpu_to_be16(seq);
+	hdr.peer = cpu_to_be32(peer);
 
 	if (!msg) {
 		blob_buf_init(&b, 0);
@@ -148,9 +154,10 @@ int __hidden ubus_send_msg(struct ubus_context *ctx, uint32_t seq,
 	return ret;
 }
 
-static int recv_retry(int fd, struct iovec *iov, bool wait, int *recv_fd)
+static int recv_retry(struct ubus_context *ctx, struct iovec *iov, bool wait, int *recv_fd)
 {
 	int bytes, total = 0;
+	int fd = ctx->sock.fd;
 	static struct {
 		struct cmsghdr h;
 		int fd;
@@ -185,7 +192,7 @@ static int recv_retry(int fd, struct iovec *iov, bool wait, int *recv_fd)
 
 		if (bytes < 0) {
 			bytes = 0;
-			if (uloop_cancelled)
+			if (uloop_cancelling() || ctx->cancel_poll)
 				return 0;
 			if (errno == EINTR)
 				continue;
@@ -212,7 +219,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;
@@ -226,14 +233,49 @@ 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;
+	ctx->msgbuf_data_len = len;
+	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);
+	r = recv_retry(ctx, &iov, false, recv_fd);
 	if (r <= 0) {
 		if (r < 0)
 			ctx->sock.eof = true;
@@ -241,22 +283,36 @@ 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 (iov.iov_len > 0 && !recv_retry(ctx->sock.fd, &iov, true, NULL))
+	hdrbuf.hdr.seq = be16_to_cpu(hdrbuf.hdr.seq);
+	hdrbuf.hdr.peer = be32_to_cpu(hdrbuf.hdr.peer);
+
+	if (!ubus_validate_hdr(&hdrbuf.hdr))
 		return false;
 
-	return ubus_validate_hdr(&ctx->msgbuf.hdr);
+	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, &iov, true, NULL) <= 0)
+		return false;
+
+	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);
-		if (uloop_cancelled)
+		ubus_process_msg(ctx, &ctx->msgbuf, recv_fd);
+		if (uloop_cancelling() || ctx->cancel_poll)
 			break;
 	}
 
@@ -271,7 +327,8 @@ void __hidden ubus_poll_data(struct ubus_context *ctx, int timeout)
 		.events = POLLIN | POLLERR,
 	};
 
-	poll(&pfd, 1, timeout);
+	ctx->cancel_poll = false;
+	poll(&pfd, 1, timeout ? timeout : -1);
 	ubus_handle_data(&ctx->sock, ULOOP_READ);
 }
 
@@ -317,6 +374,8 @@ int ubus_reconnect(struct ubus_context *ctx, const char *path)
 		close(ctx->sock.fd);
 	}
 
+	ctx->sock.eof = false;
+	ctx->sock.error = false;
 	ctx->sock.fd = usock(USOCK_UNIX, path, NULL);
 	if (ctx->sock.fd < 0)
 		return UBUS_STATUS_CONNECTION_FAILED;
@@ -343,7 +402,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);