Clean-up: lttng-relayd: prepend `the_` to global variable names tcp_keep_alive.c
[lttng-tools.git] / src / bin / lttng-relayd / tcp_keep_alive.c
index 4a2cd9f1bd84d8427db624c5d66a22c598489594..2a0264e1179c936c10a3c19537073ed6e3c64df7 100644 (file)
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2017 Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
+ * Copyright (C) 2017 Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <sys/types.h>
@@ -36,7 +26,6 @@
 /* Per-platform definitions of TCP socket options. */
 #if defined (__linux__)
 
-#define COMPAT_SOCKET_LEVEL SOL_TCP
 #define COMPAT_TCP_LEVEL SOL_TCP
 #define COMPAT_TCP_ABORT_THRESHOLD 0 /* Does not exist on linux. */
 #define COMPAT_TCP_KEEPIDLE TCP_KEEPIDLE
@@ -45,7 +34,6 @@
 
 #elif defined (__sun__) /* ! defined (__linux__) */
 
-#define COMPAT_SOCKET_LEVEL SOL_SOCKET
 #define COMPAT_TCP_LEVEL IPPROTO_TCP
 
 #ifdef TCP_KEEPALIVE_THRESHOLD
@@ -65,7 +53,6 @@
 
 #else /* ! defined (__linux__) && ! defined (__sun__) */
 
-#define COMPAT_SOCKET_LEVEL 0
 #define COMPAT_TCP_LEVEL 0
 #define COMPAT_TCP_ABORT_THRESHOLD 0
 #define COMPAT_TCP_KEEPIDLE 0
@@ -118,21 +105,17 @@ struct tcp_keep_alive_config {
        int abort_threshold;
 };
 
-static struct tcp_keep_alive_config config = {
-       .enabled = false,
-       .idle_time = -1,
-       .probe_interval = -1,
-       .max_probe_count = -1,
-       .abort_threshold = -1
-};
+static 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 support = {
-       .supported = false,
-       .idle_time_supported = false,
-       .probe_interval_supported = false,
-       .max_probe_count_supported = false,
-       .abort_threshold_supported = false
-};
+static 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};
 
 /*
  * Common parser for string to positive int conversion where the value must be
@@ -526,10 +509,10 @@ error:
 
 /* Initialize the TCP keep-alive configuration. */
 __attribute__((constructor)) static
-int tcp_keep_alive_init(void)
+void tcp_keep_alive_init(void)
 {
-       tcp_keep_alive_init_support(&support);
-       return tcp_keep_alive_init_config(&support, &config);
+       tcp_keep_alive_init_support(&the_support);
+       (void) tcp_keep_alive_init_config(&the_support, &the_config);
 }
 
 /*
@@ -542,12 +525,13 @@ int socket_apply_keep_alive_config(int socket_fd)
        int val = 1;
 
        /* TCP keep-alive */
-       if (!support.supported || !config.enabled ) {
+       if (!the_support.supported || !the_config.enabled) {
                ret = 0;
                goto end;
        }
 
-       ret = setsockopt(socket_fd, COMPAT_SOCKET_LEVEL, SO_KEEPALIVE, &val,
+       DBG("TCP keep-alive enabled for socket %d", socket_fd);
+       ret = setsockopt(socket_fd, SOL_SOCKET, SO_KEEPALIVE, &val,
                        sizeof(val));
        if (ret < 0) {
                PERROR("setsockopt so_keepalive");
@@ -555,18 +539,26 @@ int socket_apply_keep_alive_config(int socket_fd)
        }
 
        /* TCP keep-alive idle time */
-       if (support.idle_time_supported && config.idle_time > 0) {
-               ret = setsockopt(socket_fd, COMPAT_TCP_LEVEL, COMPAT_TCP_KEEPIDLE, &config.idle_time,
-                               sizeof(config.idle_time));
+       if (the_support.idle_time_supported && the_config.idle_time > 0) {
+               DBG("TCP keep-alive keep idle: %d enabled for socket %d",
+                               the_config.idle_time, socket_fd);
+               ret = setsockopt(socket_fd, COMPAT_TCP_LEVEL,
+                               COMPAT_TCP_KEEPIDLE, &the_config.idle_time,
+                               sizeof(the_config.idle_time));
                if (ret < 0) {
                        PERROR("setsockopt TCP_KEEPIDLE");
                        goto end;
                }
        }
        /* TCP keep-alive probe interval */
-       if (support.probe_interval_supported && config.probe_interval > 0) {
-               ret = setsockopt(socket_fd, COMPAT_TCP_LEVEL, COMPAT_TCP_KEEPINTVL, &config.probe_interval,
-                               sizeof(config.probe_interval));
+       if (the_support.probe_interval_supported &&
+                       the_config.probe_interval > 0) {
+               DBG("TCP keep-alive probe_interval: %d enabled for socket %d",
+                               the_config.probe_interval, socket_fd);
+               ret = setsockopt(socket_fd, COMPAT_TCP_LEVEL,
+                               COMPAT_TCP_KEEPINTVL,
+                               &the_config.probe_interval,
+                               sizeof(the_config.probe_interval));
                if (ret < 0) {
                        PERROR("setsockopt TCP_KEEPINTVL");
                        goto end;
@@ -574,9 +566,13 @@ int socket_apply_keep_alive_config(int socket_fd)
        }
 
        /* TCP keep-alive max probe count */
-       if (support.max_probe_count_supported && config.max_probe_count > 0) {
-               ret = setsockopt(socket_fd, COMPAT_TCP_LEVEL, COMPAT_TCP_KEEPCNT, &config.max_probe_count,
-                               sizeof(config.max_probe_count));
+       if (the_support.max_probe_count_supported &&
+                       the_config.max_probe_count > 0) {
+               DBG("TCP keep-alive max_probe: %d enabled for socket %d",
+                               the_config.max_probe_count, socket_fd);
+               ret = setsockopt(socket_fd, COMPAT_TCP_LEVEL,
+                               COMPAT_TCP_KEEPCNT, &the_config.max_probe_count,
+                               sizeof(the_config.max_probe_count));
                if (ret < 0) {
                        PERROR("setsockopt TCP_KEEPCNT");
                        goto end;
@@ -584,9 +580,14 @@ int socket_apply_keep_alive_config(int socket_fd)
        }
 
        /* TCP keep-alive abort threshold */
-       if (support.abort_threshold_supported && config.abort_threshold > 0) {
-               ret = setsockopt(socket_fd, COMPAT_TCP_LEVEL, COMPAT_TCP_ABORT_THRESHOLD, &config.abort_threshold,
-                               sizeof(config.max_probe_count));
+       if (the_support.abort_threshold_supported &&
+                       the_config.abort_threshold > 0) {
+               DBG("TCP keep-alive abort threshold: %d enabled for socket %d",
+                               the_config.abort_threshold, socket_fd);
+               ret = setsockopt(socket_fd, COMPAT_TCP_LEVEL,
+                               COMPAT_TCP_ABORT_THRESHOLD,
+                               &the_config.abort_threshold,
+                               sizeof(the_config.max_probe_count));
                if (ret < 0) {
                        PERROR("setsockopt TCP_KEEPALIVE_ABORT_THRESHOLD");
                        goto end;
This page took 0.026204 seconds and 4 git commands to generate.