Cleanup: use LTTNG_HIDDEN in lttng-ctl filter lib

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

diff --git a/src/common/sessiond-comm/inet.c b/src/common/sessiond-comm/inet.c
index e8d3afef316696ebdef315e92e58870f5c784c52..7aee725602f1441f72093cc42ffdac7e16257117 100644 (file)
--- a/src/common/sessiond-comm/inet.c
+++ b/src/common/sessiond-comm/inet.c
@@ -129,7 +129,7 @@ __attribute__((visibility("hidden")))
 struct lttcomm_sock *lttcomm_accept_inet_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_inet_sock(struct lttcomm_sock *sock)
                goto error;
        }
 
+       len = sizeof(new_sock->sockaddr.addr.sin);
+
        /* Blocking call */
        new_fd = accept(sock->fd, (struct sockaddr *) &new_sock->sockaddr.addr.sin,
                        &len);
@@ -205,6 +207,7 @@ ssize_t lttcomm_recvmsg_inet_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_inet_sock(struct lttcomm_sock *sock, void *buf,
        msg.msg_name = (struct sockaddr *) &sock->sockaddr.addr.sin;
        msg.msg_namelen = sizeof(sock->sockaddr.addr.sin);
 
-       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 inet");
+       } else if (ret > 0) {
+               ret = len;
        }
+       /* Else ret = 0 meaning an orderly shutdown. */
 
        return ret;
 }