X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Ftcp_keep_alive.cpp;h=d632b77426966c7bbc80c7659e93b88cf3660455;hb=f149493493fbd8a3efa4748832c03278c96c38ca;hp=94bf4ab9332742f42ea3c8e8872f6ea545f253f9;hpb=ac497a37018f3c253d2e50397294f58d33f7f24f;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/tcp_keep_alive.cpp b/src/bin/lttng-relayd/tcp_keep_alive.cpp
index 94bf4ab93..d632b7742 100644
--- a/src/bin/lttng-relayd/tcp_keep_alive.cpp
+++ b/src/bin/lttng-relayd/tcp_keep_alive.cpp
@@ -11,12 +11,12 @@
 #include <sys/socket.h>
 #include <limits.h>
 
-#include <common/compat/getenv.h>
-#include <common/time.h>
-#include <common/defaults.h>
-#include <common/config/session-config.h>
+#include <common/compat/getenv.hpp>
+#include <common/time.hpp>
+#include <common/defaults.hpp>
+#include <common/ini-config/ini-config.hpp>
 
-#include "tcp_keep_alive.h"
+#include "tcp_keep_alive.hpp"
 
 #define SOLARIS_IDLE_TIME_MIN_S 10
 #define SOLARIS_IDLE_TIME_MAX_S 864000 /* 10 days */
@@ -61,6 +61,7 @@
 
 #endif /* ! defined (__linux__) && ! defined (__sun__) */
 
+namespace {
 struct tcp_keep_alive_support {
 	/* TCP keep-alive is supported by this platform. */
 	bool supported;
@@ -105,17 +106,18 @@ struct tcp_keep_alive_config {
 	int abort_threshold;
 };
 
-static struct tcp_keep_alive_config the_config = {.enabled = false,
+struct tcp_keep_alive_config the_config = {.enabled = false,
 		.idle_time = -1,
 		.probe_interval = -1,
 		.max_probe_count = -1,
 		.abort_threshold = -1};
 
-static struct tcp_keep_alive_support the_support = {.supported = false,
+struct tcp_keep_alive_support the_support = {.supported = false,
 		.idle_time_supported = false,
 		.probe_interval_supported = false,
 		.max_probe_count_supported = false,
 		.abort_threshold_supported = false};
+} /* namespace */
 
 /*
  * Common parser for string to positive int conversion where the value must be