X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Finet.c;h=f70fc93a08dfacaba934c1d1fd5cb62b6374503b;hb=a8cad46163850205f0dc2607e361a63b4fab3f7a;hp=ed7f5dc165e1b3961a2f53ef3107a0f54db85472;hpb=c1591e37fbac83d8d12519b3c15e9ba13934b25a;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/inet.c b/src/common/sessiond-comm/inet.c
index ed7f5dc16..f70fc93a0 100644
--- a/src/common/sessiond-comm/inet.c
+++ b/src/common/sessiond-comm/inet.c
@@ -390,18 +390,22 @@ ssize_t lttcomm_recvmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
 		len_last = iov[0].iov_len;
 		ret = recvmsg(sock->fd, &msg, flags);
 		if (ret > 0) {
+			if (flags & MSG_DONTWAIT) {
+				goto end;
+			}
 			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 inet");
 	} else if (ret > 0) {
 		ret = len;
 	}
 	/* Else ret = 0 meaning an orderly shutdown. */
-
+end:
 	return ret;
 }