libubus: fix msgbuf reduction logic during receive

[project/ubus.git] / libubus-io.c

diff --git a/libubus-io.c b/libubus-io.c
index 48bb72d..ba22dcb 100644 (file)
--- 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 */
@@ -249,7 +254,14 @@ static bool get_next_msg(struct ubus_context *ctx, int *recv_fd)
                return false;
 
        len = blob_raw_len(&hdrbuf.data);
-       if (len > ctx->msgbuf_data_len) {
+       if (len > ctx->msgbuf_data_len)
+               ctx->msgbuf_reduction_counter = UBUS_MSGBUF_REDUCTION_INTERVAL;
+       else if (ctx->msgbuf_reduction_counter > 0 && len < UBUS_MSG_CHUNK_SIZE)
+               len = !--ctx->msgbuf_reduction_counter ? UBUS_MSG_CHUNK_SIZE : -1;
+       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 +375,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);