Use socket timeout value for tcp timeout if available

Make the inet subsystem initialize the tcp timeout value with the env.
variable LTTNG_NETWORK_SOCKET_TIMEOUT if available.

Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/src/common/sessiond-comm/inet.c b/src/common/sessiond-comm/inet.c
index b5a016e6f54fd46e3eb297b02c94c192cefe995a..fa9218769b31c1d903e9cd33e6c12c0e3fbe0bd5 100644 (file)
--- a/src/common/sessiond-comm/inet.c
+++ b/src/common/sessiond-comm/inet.c
@@ -495,7 +495,13 @@ error:
 LTTNG_HIDDEN
 void lttcomm_inet_init(void)
 {
-       unsigned long syn_retries, fin_timeout, syn_timeout;
+       unsigned long syn_retries, fin_timeout, syn_timeout, env;
+
+       env = lttcomm_get_network_timeout();
+       if (env) {
+               lttcomm_inet_tcp_timeout = env;
+               goto end;
+       }
 
        /* Assign default value and see if we can change it. */
        lttcomm_inet_tcp_timeout = DEFAULT_INET_TCP_TIMEOUT;
@@ -513,5 +519,6 @@ void lttcomm_inet_init(void)
                        max_t(unsigned long, syn_timeout, fin_timeout),
                        lttcomm_inet_tcp_timeout);
 
+end:
        DBG("TCP inet operation timeout set to %lu sec", lttcomm_inet_tcp_timeout);
 }