diff options
| author | Grant Erickson <gerickson@nuovations.com> | 2023-12-21 14:35:06 -0800 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2023-12-23 13:19:19 +0100 |
| commit | 831523e6bd7eceb5c4e54391447ee486309183a4 (patch) | |
| tree | 9582c1711dce98913f4fd828e3929fdd20e30b34 | |
| parent | f6a6d065f0e05328383b03ea584f65bd0f20f110 (diff) | |
| download | connman-831523e6bd7eceb5c4e54391447ee486309183a4.tar.gz | |
main: Consolidate logging of online check-related settings.
This consolidates logging, at the info level, of all online
check-related settings to a single place, 'online_check_settings_log'
such that when the 'OnlineCheckMode' is "none", the following is
logged:
Online check mode "none"
when 'OnlineCheckMode' is "one-shot", the following are logged:
Online check mode "one-shot"
Online check IPv4 URL "http://ipv4.connman.net/online/status.html"
Online check IPv6 URL "http://ipv6.connman.net/online/status.html"
Online check interval style "geometric"
Online check interval range [1, 12]
Online check connect timeout 12100 ms
and when 'OnlineCheckMode' is "continuous the following are logged:
Online check mode "continuous"
Online check IPv4 URL "http://ipv4.connman.net/online/status.html"
Online check IPv6 URL "http://ipv6.connman.net/online/status.html"
Online check interval style "geometric"
Online check interval range [1, 12]
Online check connect timeout 12100 ms
Online check continuous mode failures threshold 6
Online check continuous mode successes threshold 6
| -rw-r--r-- | src/main.c | 47 |
1 files changed, 40 insertions, 7 deletions
diff --git a/src/main.c b/src/main.c index c8d97ee80..f8007cb3b 100644 --- a/src/main.c +++ b/src/main.c @@ -379,6 +379,44 @@ static void online_check_mode_set_to_deprecated(void) } } +static void online_check_settings_log(void) +{ + connman_info("Online check mode \"%s\"", + __connman_service_online_check_mode2string( + connman_settings.online_check_mode)); + + if (connman_settings.online_check_mode == + CONNMAN_SERVICE_ONLINE_CHECK_MODE_NONE) + return; + + connman_info("Online check IPv4 URL \"%s\"", + connman_settings.online_check_ipv4_url); + + connman_info("Online check IPv6 URL \"%s\"", + connman_settings.online_check_ipv6_url); + + connman_info("Online check interval style \"%s\"", + connman_settings.online_check_interval_style); + + connman_info("Online check interval range [%u, %u]", + connman_settings.online_check_initial_interval, + connman_settings.online_check_max_interval); + + if (connman_settings.online_check_connect_timeout_ms) + connman_info("Online check connect timeout %u ms", + connman_settings.online_check_connect_timeout_ms); + + if (connman_settings.online_check_mode != + CONNMAN_SERVICE_ONLINE_CHECK_MODE_CONTINUOUS) + return; + + connman_info("Online check continuous mode failures threshold %d", + connman_settings.online_check_failures_threshold); + + connman_info("Online check continuous mode successes threshold %d", + connman_settings.online_check_successes_threshold); +} + static void parse_config(GKeyFile *config) { GError *error = NULL; @@ -571,8 +609,6 @@ static void parse_config(GKeyFile *config) CONF_ENABLE_ONLINE_CHECK, &error); if (!error) { connman_settings.enable_online_check = boolean; - if (!boolean) - connman_info("Online check disabled by main config."); } g_clear_error(&error); @@ -622,10 +658,6 @@ static void parse_config(GKeyFile *config) real * 1000; } - if (connman_settings.online_check_connect_timeout_ms) - connman_info("Online check connect timeout %ums", - connman_settings.online_check_connect_timeout_ms); - g_clear_error(&error); /* OnlineCheckIPv4URL */ @@ -650,7 +682,6 @@ static void parse_config(GKeyFile *config) connman_settings.online_check_ipv6_url = g_strdup(DEFAULT_ONLINE_CHECK_IPV6_URL); - g_clear_error(&error); /* OnlineCheck{Initial,Max}Interval */ @@ -777,6 +808,8 @@ static void parse_config(GKeyFile *config) g_free(string); g_clear_error(&error); + + online_check_settings_log(); } static int config_init(const char *file) |