Introduce LTTNG_NETWORK_SOCKET_TIMEOUT env. var

[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 3cf8f5d3f5b4f89be36307929dee051590dafb98..b2bd65d9029672efb47a4469ef3632b30a649740 100644 (file)
--- a/src/common/sessiond-comm/inet.c
+++ b/src/common/sessiond-comm/inet.c
@@ -26,8 +26,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include <common/defaults.h>
-#include <common/error.h>
+#include <common/common.h>
 
 #include "inet.h"
 
@@ -47,9 +46,10 @@ static const struct lttcomm_proto_ops inet_ops = {
 /*
  * Creates an PF_INET socket.
  */
+LTTNG_HIDDEN
 int lttcomm_create_inet_sock(struct lttcomm_sock *sock, int type, int proto)
 {
-       int val, ret;
+       int val = 1, ret;
 
        /* Create server socket */
        if ((sock->fd = socket(PF_INET, type, proto)) < 0) {
@@ -77,6 +77,7 @@ error:
 /*
  * Bind socket and return.
  */
+LTTNG_HIDDEN
 int lttcomm_bind_inet_sock(struct lttcomm_sock *sock)
 {
        int ret;
@@ -93,6 +94,7 @@ int lttcomm_bind_inet_sock(struct lttcomm_sock *sock)
 /*
  * Connect PF_INET socket.
  */
+LTTNG_HIDDEN
 int lttcomm_connect_inet_sock(struct lttcomm_sock *sock)
 {
        int ret, closeret;
@@ -100,10 +102,7 @@ int lttcomm_connect_inet_sock(struct lttcomm_sock *sock)
        ret = connect(sock->fd, (struct sockaddr *) &sock->sockaddr.addr.sin,
                        sizeof(sock->sockaddr.addr.sin));
        if (ret < 0) {
-               /*
-                * Don't print message on connect error, because connect is used in
-                * normal execution to detect if sessiond is alive.
-                */
+               PERROR("connect");
                goto error_connect;
        }
 
@@ -122,10 +121,11 @@ error_connect:
  * Do an accept(2) on the sock and return the new lttcomm socket. The socket
  * MUST be bind(2) before.
  */
+LTTNG_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) {
@@ -136,11 +136,13 @@ struct lttcomm_sock *lttcomm_accept_inet_sock(struct lttcomm_sock *sock)
                goto end;
        }
 
-       new_sock = lttcomm_alloc_sock(LTTCOMM_INET, sock->proto);
+       new_sock = lttcomm_alloc_sock(sock->proto);
        if (new_sock == NULL) {
                goto error;
        }
 
+       len = sizeof(new_sock->sockaddr.addr.sin);
+
        /* Blocking call */
        new_fd = accept(sock->fd, (struct sockaddr *) &new_sock->sockaddr.addr.sin,
                        &len);
@@ -150,6 +152,7 @@ struct lttcomm_sock *lttcomm_accept_inet_sock(struct lttcomm_sock *sock)
        }
 
        new_sock->fd = new_fd;
+       new_sock->ops = &inet_ops;
 
 end:
        return new_sock;
@@ -162,6 +165,7 @@ error:
 /*
  * Make the socket listen using LTTNG_SESSIOND_COMM_MAX_LISTEN.
  */
+LTTNG_HIDDEN
 int lttcomm_listen_inet_sock(struct lttcomm_sock *sock, int backlog)
 {
        int ret;
@@ -192,12 +196,14 @@ end:
  *
  * Return the size of received data.
  */
+LTTNG_HIDDEN
 ssize_t lttcomm_recvmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
                size_t len, int flags)
 {
        struct msghdr msg;
        struct iovec iov[1];
        ssize_t ret = -1;
+       size_t len_last;
 
        memset(&msg, 0, sizeof(msg));
 
@@ -209,16 +215,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;
 }
@@ -228,6 +239,7 @@ ssize_t lttcomm_recvmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
  *
  * Return the size of sent data.
  */
+LTTNG_HIDDEN
 ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
                size_t len, int flags)
 {
@@ -270,11 +282,12 @@ ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
 /*
  * Shutdown cleanly and close.
  */
+LTTNG_HIDDEN
 int lttcomm_close_inet_sock(struct lttcomm_sock *sock)
 {
        int ret;
 
-       /* Don't try to close an invalid mark socket */
+       /* Don't try to close an invalid marked socket */
        if (sock->fd == -1) {
                return 0;
        }