X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libubus-io.c;h=228af5ca279c6d5f3d428c7ee4fe0b2670a68c1d;hb=76ea27a627742c8a6c40261287d322b7656cc43d;hp=31dad279238aab44d9e5be69cf3ffb1bf40e7926;hpb=5db90dbc941da701c397b04ddce2515a231df59b;p=oweals%2Fubus.git

diff --git a/libubus-io.c b/libubus-io.c
index 31dad27..228af5c 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>
@@ -53,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)
@@ -132,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);
@@ -153,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;
@@ -172,9 +174,6 @@ static int recv_retry(int fd, struct iovec *iov, bool wait, int *recv_fd)
 	};
 
 	while (iov->iov_len > 0) {
-		if (wait)
-			wait_data(fd, false);
-
 		if (recv_fd) {
 			msghdr.msg_control = &fd_buf;
 			msghdr.msg_controllen = sizeof(fd_buf);
@@ -190,8 +189,6 @@ static int recv_retry(int fd, struct iovec *iov, bool wait, int *recv_fd)
 
 		if (bytes < 0) {
 			bytes = 0;
-			if (uloop_cancelled)
-				return 0;
 			if (errno == EINTR)
 				continue;
 
@@ -210,6 +207,9 @@ static int recv_retry(int fd, struct iovec *iov, bool wait, int *recv_fd)
 		iov->iov_len -= bytes;
 		iov->iov_base += bytes;
 		total += bytes;
+
+		if (iov->iov_len > 0)
+			wait_data(fd, false);
 	}
 
 	return total;
@@ -231,6 +231,37 @@ 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 {
@@ -242,7 +273,7 @@ static bool get_next_msg(struct ubus_context *ctx, int *recv_fd)
 	int r;
 
 	/* receive header + start attribute */
-	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;
@@ -250,27 +281,14 @@ static bool get_next_msg(struct ubus_context *ctx, int *recv_fd)
 		return false;
 	}
 
+	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;
 
 	len = blob_raw_len(&hdrbuf.data);
-	if (len > ctx->msgbuf_data_len) {
-		ctx->msgbuf_reduction_counter = UBUS_MSGBUF_REDUCTION_INTERVAL;
-	} else if (ctx->msgbuf_data_len > UBUS_MSG_CHUNK_SIZE) {
-		if (ctx->msgbuf_reduction_counter > 0) {
-			len = -1;
-			--ctx->msgbuf_reduction_counter;
-		} else
-			len = UBUS_MSG_CHUNK_SIZE;
-	} else
-		len = -1;
-
-	if (len > -1) {
-		ctx->msgbuf.data = realloc(ctx->msgbuf.data, len * sizeof(char));
-		if (ctx->msgbuf.data)
-			ctx->msgbuf_data_len = len;
-	}
-	if (!ctx->msgbuf.data)
+	if (!alloc_msg_buf(ctx, len))
 		return false;
 
 	memcpy(&ctx->msgbuf.hdr, &hdrbuf.hdr, sizeof(hdrbuf.hdr));
@@ -278,7 +296,8 @@ static bool get_next_msg(struct ubus_context *ctx, int *recv_fd)
 
 	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))
+	if (iov.iov_len > 0 &&
+	    recv_retry(ctx, &iov, true, NULL) <= 0)
 		return false;
 
 	return true;
@@ -287,12 +306,11 @@ static bool get_next_msg(struct ubus_context *ctx, int *recv_fd)
 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;
 	}
 
@@ -307,7 +325,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);
 }
 
@@ -353,6 +372,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;
@@ -379,7 +400,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);