Use non-blocking recvmsg() for data/ctrl connections of lttng-relayd

[lttng-tools.git] / src / common / sessiond-comm / inet6.c

diff --git a/src/common/sessiond-comm/inet6.c b/src/common/sessiond-comm/inet6.c
index 1fd18a96258382e408df8c30fe8e250b456cd11d..dfb5fc5d1238c1b5cc6aa1b55cd0536b65ffec85 100644 (file)
--- a/src/common/sessiond-comm/inet6.c
+++ b/src/common/sessiond-comm/inet6.c
@@ -98,15 +98,9 @@ error:
 LTTNG_HIDDEN
 int lttcomm_bind_inet6_sock(struct lttcomm_sock *sock)
 {
-       int ret;
-
-       ret = bind(sock->fd, (const struct sockaddr *) &sock->sockaddr.addr.sin6,
+       return bind(sock->fd,
+                       (const struct sockaddr *) &sock->sockaddr.addr.sin6,
                        sizeof(sock->sockaddr.addr.sin6));
-       if (ret < 0) {
-               PERROR("bind inet6");
-       }
-
-       return ret;
 }
 
 static
@@ -370,6 +364,9 @@ ssize_t lttcomm_recvmsg_inet6_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);
@@ -381,7 +378,7 @@ ssize_t lttcomm_recvmsg_inet6_sock(struct lttcomm_sock *sock, void *buf,
                ret = len;
        }
        /* Else ret = 0 meaning an orderly shutdown. */
-
+end:
        return ret;
 }