X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Finet6.c;h=ddbb50ed43aa96dc94b6f2fe4b8201c4925b8c5c;hb=f50f23d9f80ed9fae7fe5c49aee65e813e0031c8;hp=8fe0276013bce4b0f6e613b6230d55b377ffe58f;hpb=32dd26fbc3c69fe677a7917535e10ace066e674c;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/inet6.c b/src/common/sessiond-comm/inet6.c
index 8fe027601..ddbb50ed4 100644
--- a/src/common/sessiond-comm/inet6.c
+++ b/src/common/sessiond-comm/inet6.c
@@ -129,7 +129,7 @@ __attribute__((visibility("hidden")))
 struct lttcomm_sock *lttcomm_accept_inet6_sock(struct lttcomm_sock *sock)
 {
 	int new_fd;
-	socklen_t len = 0;
+	socklen_t len;
 	struct lttcomm_sock *new_sock;
 
 	if (sock->proto == LTTCOMM_SOCK_UDP) {
@@ -145,6 +145,8 @@ struct lttcomm_sock *lttcomm_accept_inet6_sock(struct lttcomm_sock *sock)
 		goto error;
 	}
 
+	len = sizeof(new_sock->sockaddr.addr.sin6);
+
 	/* Blocking call */
 	new_fd = accept(sock->fd,
 			(struct sockaddr *) &new_sock->sockaddr.addr.sin6, &len);
@@ -205,6 +207,7 @@ ssize_t lttcomm_recvmsg_inet6_sock(struct lttcomm_sock *sock, void *buf,
 	struct msghdr msg;
 	struct iovec iov[1];
 	ssize_t ret = -1;
+	size_t len_last;
 
 	memset(&msg, 0, sizeof(msg));
 
@@ -216,16 +219,21 @@ ssize_t lttcomm_recvmsg_inet6_sock(struct lttcomm_sock *sock, void *buf,
 	msg.msg_name = (struct sockaddr *) &sock->sockaddr.addr.sin6;
 	msg.msg_namelen = sizeof(sock->sockaddr.addr.sin6);
 
-	if (flags == 0) {
-		flags = MSG_WAITALL;
-	}
-
 	do {
+		len_last = iov[0].iov_len;
 		ret = recvmsg(sock->fd, &msg, flags);
-	} while (ret < 0 && errno == EINTR);
+		if (ret > 0) {
+			iov[0].iov_base += ret;
+			iov[0].iov_len -= ret;
+			assert(ret <= len_last);
+		}
+	} while ((ret > 0 && ret < len_last) || (ret < 0 && errno == EINTR));
 	if (ret < 0) {
-		PERROR("recvmsg inet6");
+		PERROR("recvmsg inet");
+	} else if (ret > 0) {
+		ret = len;
 	}
+	/* Else ret = 0 meaning an orderly shutdown. */
 
 	return ret;
 }