lua: add 'defer_request' and 'complete_deferred_request' functions

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

diff --git a/libubus-io.c b/libubus-io.c
index fa53040..0582ff7 100644 (file)
--- 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);
@@ -258,6 +259,7 @@ static bool alloc_msg_buf(struct ubus_context *ctx, int len)
                return false;
 
        ctx->msgbuf.data = ptr;
+       ctx->msgbuf_data_len = len;
        return true;
 }
 
@@ -280,6 +282,9 @@ 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;
 
@@ -292,7 +297,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->sock.fd, &iov, true, NULL) <= 0)
                return false;
 
        return true;
@@ -320,7 +326,7 @@ void __hidden ubus_poll_data(struct ubus_context *ctx, int timeout)
                .events = POLLIN | POLLERR,
        };
 
-       poll(&pfd, 1, timeout);
+       poll(&pfd, 1, timeout ? timeout : -1);
        ubus_handle_data(&ctx->sock, ULOOP_READ);
 }