X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=libubus-io.c;h=3280e41a37489ff084624675e76c1966bf25dbab;hp=48bb72db1963b7aef1b32e8018d207e0736cab10;hb=b79e808944675040ec2cbc2534592a5d4e62477b;hpb=6d24ad71f6fdb5345970fcfa7450cd5a50790d18

diff --git a/libubus-io.c b/libubus-io.c
index 48bb72d..3280e41 100644
--- a/libubus-io.c
+++ b/libubus-io.c
@@ -28,6 +28,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 +111,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 */
@@ -250,6 +255,17 @@ static bool get_next_msg(struct ubus_context *ctx, int *recv_fd)
 
 	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;
@@ -363,7 +379,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);