libubus: remove ubus_msghdr_data() by passing in the right data structure pointer

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

diff --git a/libubus-io.c b/libubus-io.c
index 030d382..55ddff5 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 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 },
 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;
                }
                        if (!iov_len)
                                return len;
                }

+               iov->iov_base += cur_len;

                iov->iov_len -= cur_len;
                iov->iov_len -= cur_len;

+               msghdr.msg_iov = iov;
+               msghdr.msg_iovlen = iov_len;

        } while (1);
 
        /* Should never reach here */
        } while (1);
 
        /* Should never reach here */


@@ -212,7 +217,7 @@ static int recv_retry(int fd, struct iovec *iov, bool wait, int *recv_fd)
 
 static bool ubus_validate_hdr(struct ubus_msghdr *hdr)
 {
 
 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;
 
        if (hdr->version != 0)
                return false;


@@ -228,11 +233,15 @@ static bool ubus_validate_hdr(struct ubus_msghdr *hdr)
 
 static bool get_next_msg(struct ubus_context *ctx, int *recv_fd)
 {
 
 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 */
        int r;
 
        /* receive header + start attribute */

-       iov.iov_len += sizeof(struct blob_attr);

        r = recv_retry(ctx->sock.fd, &iov, false, recv_fd);
        if (r <= 0) {
                if (r < 0)
        r = recv_retry(ctx->sock.fd, &iov, false, recv_fd);
        if (r <= 0) {
                if (r < 0)


@@ -241,21 +250,43 @@ static bool get_next_msg(struct ubus_context *ctx, int *recv_fd)
                return false;
        }
 
                return false;
        }
 

-       iov.iov_len = blob_len(ubus_msghdr_data(&ctx->msgbuf.hdr));
+       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_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;
+       }
+       if (!ctx->msgbuf.data)
+               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;
 
        if (iov.iov_len > 0 && !recv_retry(ctx->sock.fd, &iov, true, NULL))
                return false;
 

-       return ubus_validate_hdr(&ctx->msgbuf.hdr);
+       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);
 }
 
 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)) {
        int recv_fd = -1;
 
        while (get_next_msg(ctx, &recv_fd)) {

-               ubus_process_msg(ctx, hdr, recv_fd);
+               ubus_process_msg(ctx, &ctx->msgbuf, recv_fd);

                if (uloop_cancelled)
                        break;
        }
                if (uloop_cancelled)
                        break;
        }


@@ -264,6 +295,17 @@ void __hidden ubus_handle_data(struct uloop_fd *u, unsigned int events)
                ctx->connection_lost(ctx);
 }
 
                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)
 {
 static void
 ubus_refresh_state(struct ubus_context *ctx)
 {


@@ -332,7 +374,7 @@ int ubus_reconnect(struct ubus_context *ctx, const char *path)
                goto out_free;
 
        ret = UBUS_STATUS_OK;
                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);
 
 
        ubus_refresh_state(ctx);