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 7aee725602f1441f72093cc42ffdac7e16257117..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,7 +46,7 @@ static const struct lttcomm_proto_ops inet_ops = {
 /*
  * Creates an PF_INET socket.
  */
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
 int lttcomm_create_inet_sock(struct lttcomm_sock *sock, int type, int proto)
 {
        int val = 1, ret;
@@ -78,7 +77,7 @@ error:
 /*
  * Bind socket and return.
  */
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
 int lttcomm_bind_inet_sock(struct lttcomm_sock *sock)
 {
        int ret;
@@ -95,7 +94,7 @@ int lttcomm_bind_inet_sock(struct lttcomm_sock *sock)
 /*
  * Connect PF_INET socket.
  */
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
 int lttcomm_connect_inet_sock(struct lttcomm_sock *sock)
 {
        int ret, closeret;
@@ -103,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;
        }
 
@@ -125,7 +121,7 @@ error_connect:
  * Do an accept(2) on the sock and return the new lttcomm socket. The socket
  * MUST be bind(2) before.
  */
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
 struct lttcomm_sock *lttcomm_accept_inet_sock(struct lttcomm_sock *sock)
 {
        int new_fd;
@@ -169,7 +165,7 @@ error:
 /*
  * Make the socket listen using LTTNG_SESSIOND_COMM_MAX_LISTEN.
  */
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
 int lttcomm_listen_inet_sock(struct lttcomm_sock *sock, int backlog)
 {
        int ret;
@@ -200,7 +196,7 @@ end:
  *
  * Return the size of received data.
  */
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
 ssize_t lttcomm_recvmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
                size_t len, int flags)
 {
@@ -243,7 +239,7 @@ ssize_t lttcomm_recvmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
  *
  * Return the size of sent data.
  */
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
 ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
                size_t len, int flags)
 {
@@ -286,7 +282,7 @@ ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
 /*
  * Shutdown cleanly and close.
  */
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
 int lttcomm_close_inet_sock(struct lttcomm_sock *sock)
 {
        int ret;