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

diff --git a/libubus-io.c b/libubus-io.c
index 19e3c2f..9d3ac6c 100644
--- a/libubus-io.c
+++ b/libubus-io.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2012 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2011-2014 Felix Fietkau <nbd@openwrt.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 2.1
@@ -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 },
@@ -54,12 +57,37 @@ static void wait_data(int fd, bool write)
 	poll(&pfd, 1, 0);
 }
 
-static int writev_retry(int fd, struct iovec *iov, int iov_len)
+static int writev_retry(int fd, struct iovec *iov, int iov_len, int sock_fd)
 {
+	static struct {
+		struct cmsghdr h;
+		int fd;
+	} fd_buf = {
+		.h = {
+			.cmsg_len = sizeof(fd_buf),
+			.cmsg_level = SOL_SOCKET,
+			.cmsg_type = SCM_RIGHTS,
+		}
+	};
+	struct msghdr msghdr = {
+		.msg_iov = iov,
+		.msg_iovlen = iov_len,
+		.msg_control = &fd_buf,
+		.msg_controllen = sizeof(fd_buf),
+	};
 	int len = 0;
 
 	do {
-		int cur_len = writev(fd, iov, iov_len);
+		int cur_len;
+
+		if (sock_fd < 0) {
+			msghdr.msg_control = NULL;
+			msghdr.msg_controllen = 0;
+		} else {
+			fd_buf.fd = sock_fd;
+		}
+
+		cur_len = sendmsg(fd, &msghdr, 0);
 		if (cur_len < 0) {
 			switch(errno) {
 			case EAGAIN:
@@ -72,6 +100,10 @@ static int writev_retry(int fd, struct iovec *iov, int iov_len)
 			}
 			continue;
 		}
+
+		if (len > 0)
+			sock_fd = -1;
+
 		len += cur_len;
 		while (cur_len >= iov->iov_len) {
 			cur_len -= iov->iov_len;
@@ -80,7 +112,10 @@ static int writev_retry(int fd, struct iovec *iov, int iov_len)
 			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 */
@@ -88,7 +123,7 @@ static int writev_retry(int fd, struct iovec *iov, int iov_len)
 }
 
 int __hidden ubus_send_msg(struct ubus_context *ctx, uint32_t seq,
-			   struct blob_attr *msg, int cmd, uint32_t peer)
+			   struct blob_attr *msg, int cmd, uint32_t peer, int fd)
 {
 	struct ubus_msghdr hdr;
 	struct iovec iov[2] = {
@@ -109,22 +144,48 @@ int __hidden ubus_send_msg(struct ubus_context *ctx, uint32_t seq,
 	iov[1].iov_base = (char *) msg;
 	iov[1].iov_len = blob_raw_len(msg);
 
-	ret = writev_retry(ctx->sock.fd, iov, ARRAY_SIZE(iov));
+	ret = writev_retry(ctx->sock.fd, iov, ARRAY_SIZE(iov), fd);
 	if (ret < 0)
 		ctx->sock.eof = true;
 
+	if (fd >= 0)
+		close(fd);
+
 	return ret;
 }
 
-static int recv_retry(int fd, struct iovec *iov, bool wait)
+static int recv_retry(int fd, struct iovec *iov, bool wait, int *recv_fd)
 {
 	int bytes, total = 0;
+	static struct {
+		struct cmsghdr h;
+		int fd;
+	} fd_buf = {
+		.h = {
+			.cmsg_type = SCM_RIGHTS,
+			.cmsg_level = SOL_SOCKET,
+			.cmsg_len = sizeof(fd_buf),
+		},
+	};
+	struct msghdr msghdr = {
+		.msg_iov = iov,
+		.msg_iovlen = 1,
+	};
 
 	while (iov->iov_len > 0) {
 		if (wait)
 			wait_data(fd, false);
 
-		bytes = read(fd, iov->iov_base, iov->iov_len);
+		if (recv_fd) {
+			msghdr.msg_control = &fd_buf;
+			msghdr.msg_controllen = sizeof(fd_buf);
+		} else {
+			msghdr.msg_control = NULL;
+			msghdr.msg_controllen = 0;
+		}
+
+		fd_buf.fd = -1;
+		bytes = recvmsg(fd, &msghdr, 0);
 		if (!bytes)
 			return -1;
 
@@ -141,6 +202,11 @@ static int recv_retry(int fd, struct iovec *iov, bool wait)
 		if (!wait && !bytes)
 			return 0;
 
+		if (recv_fd)
+			*recv_fd = fd_buf.fd;
+
+		recv_fd = NULL;
+
 		wait = true;
 		iov->iov_len -= bytes;
 		iov->iov_base += bytes;
@@ -152,7 +218,7 @@ static int recv_retry(int fd, struct iovec *iov, bool wait)
 
 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;
@@ -166,14 +232,48 @@ static bool ubus_validate_hdr(struct ubus_msghdr *hdr)
 	return true;
 }
 
-static bool get_next_msg(struct ubus_context *ctx)
+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);
+	r = recv_retry(ctx->sock.fd, &iov, false, recv_fd);
 	if (r <= 0) {
 		if (r < 0)
 			ctx->sock.eof = true;
@@ -181,20 +281,31 @@ static bool get_next_msg(struct ubus_context *ctx)
 		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))
+	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->sock.fd, &iov, true, NULL))
+		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)) {
-		ubus_process_msg(ctx, hdr);
+	while (get_next_msg(ctx, &recv_fd)) {
+		ubus_process_msg(ctx, &ctx->msgbuf, recv_fd);
 		if (uloop_cancelled)
 			break;
 	}
@@ -203,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)
 {
@@ -271,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);