X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=libubus-io.c;h=9d3ac6c33f4d926c7f5c5d2033d531fc5fc6f834;hp=31dad279238aab44d9e5be69cf3ffb1bf40e7926;hb=f361bfa5fcb2daadf3b160583ce665024f8d108e;hpb=5db90dbc941da701c397b04ddce2515a231df59b

diff --git a/libubus-io.c b/libubus-io.c
index 31dad27..9d3ac6c 100644
--- 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>
@@ -231,6 +232,36 @@ static bool ubus_validate_hdr(struct ubus_msghdr *hdr)
 	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;
+	return true;
+}
+
 static bool get_next_msg(struct ubus_context *ctx, int *recv_fd)
 {
 	struct {
@@ -254,23 +285,7 @@ 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) {
-		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));
@@ -287,11 +302,10 @@ static bool get_next_msg(struct ubus_context *ctx, int *recv_fd)
 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);
+		ubus_process_msg(ctx, &ctx->msgbuf, recv_fd);
 		if (uloop_cancelled)
 			break;
 	}
@@ -379,7 +393,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);