* GNU General Public License for more details.
*/
+#define _GNU_SOURCE
#include <sys/types.h>
#include <sys/uio.h>
#include <sys/socket.h>
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)
{
static struct {
- struct cmsghdr h;
int fd;
+ struct cmsghdr h;
} fd_buf = {
.h = {
.cmsg_len = sizeof(fd_buf),
int len = 0;
do {
- int cur_len;
+ ssize_t cur_len;
if (sock_fd < 0) {
msghdr.msg_control = NULL;
sock_fd = -1;
len += cur_len;
- while (cur_len >= iov->iov_len) {
+ while (cur_len >= (ssize_t) iov->iov_len) {
cur_len -= iov->iov_len;
iov_len--;
iov++;
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 */
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);
return ret;
}
-static int recv_retry(int fd, struct iovec *iov, bool wait, int *recv_fd)
+static int recv_retry(struct ubus_context *ctx, struct iovec *iov, bool wait, int *recv_fd)
{
int bytes, total = 0;
+ int fd = ctx->sock.fd;
static struct {
- struct cmsghdr h;
int fd;
+ struct cmsghdr h;
} fd_buf = {
.h = {
.cmsg_type = SCM_RIGHTS,
};
while (iov->iov_len > 0) {
- if (wait)
- wait_data(fd, false);
-
if (recv_fd) {
msghdr.msg_control = &fd_buf;
msghdr.msg_controllen = sizeof(fd_buf);
if (bytes < 0) {
bytes = 0;
- if (uloop_cancelled)
- return 0;
if (errno == EINTR)
continue;
iov->iov_len -= bytes;
iov->iov_base += bytes;
total += bytes;
+
+ if (iov->iov_len > 0)
+ wait_data(fd, false);
}
return total;
return true;
}
+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;
+ ctx->msgbuf_data_len = len;
+ return true;
+}
+
static bool get_next_msg(struct ubus_context *ctx, int *recv_fd)
{
struct {
int r;
/* receive header + start attribute */
- r = recv_retry(ctx->sock.fd, &iov, false, recv_fd);
+ r = recv_retry(ctx, &iov, false, recv_fd);
if (r <= 0) {
if (r < 0)
ctx->sock.eof = true;
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;
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;
- }
- if (!ctx->msgbuf.data)
+ if (!alloc_msg_buf(ctx, len))
return false;
memcpy(&ctx->msgbuf.hdr, &hdrbuf.hdr, sizeof(hdrbuf.hdr));
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, &iov, true, NULL) <= 0)
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, &recv_fd)) {
- ubus_process_msg(ctx, hdr, recv_fd);
- if (uloop_cancelled)
+ ubus_process_msg(ctx, &ctx->msgbuf, recv_fd);
+ if (uloop_cancelling() || ctx->cancel_poll)
break;
}
.events = POLLIN | POLLERR,
};
- poll(&pfd, 1, timeout);
+ ctx->cancel_poll = false;
+ poll(&pfd, 1, timeout ? timeout : -1);
ubus_handle_data(&ctx->sock, ULOOP_READ);
}
close(ctx->sock.fd);
}
+ ctx->sock.eof = false;
+ ctx->sock.error = false;
ctx->sock.fd = usock(USOCK_UNIX, path, NULL);
if (ctx->sock.fd < 0)
return UBUS_STATUS_CONNECTION_FAILED;
goto out_close;
memcpy(buf, &hdr.data, sizeof(hdr.data));
- if (read(ctx->sock.fd, blob_data(buf), blob_len(buf)) != blob_len(buf))
+ if (read(ctx->sock.fd, blob_data(buf), blob_len(buf)) != (ssize_t) blob_len(buf))
goto out_free;
ctx->local_id = hdr.hdr.peer;
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);