Hi Alok, That makes your patch 10 more awkward:
From: Alok Barsode<[email protected]>Add Fallback timeservers via main.conf. These timeservers are used for time corrections when there are no valid timeservers provided by the user or by the network. The list of timeservers which are queried for timing correction are Timeservers.Configuration (set by the user), service timeservers(via service), gateway, global timeservers (via clock API) and fallback timeservers, in that order. --- src/main.conf | 7 +++++++ src/timeserver.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/src/main.conf b/src/main.conf index b4144dd..92ec841 100644 --- a/src/main.conf +++ b/src/main.conf @@ -5,3 +5,10 @@ # the scan list is empty. In that case, a simple backoff # mechanism starting from 10s up to 5 minutes will run. BackgroundScanning = true + +# List of Fallback timeservers separated by ",". +# These timeservers are used for NTP sync when there are +# no timeserver set by the user or by the service. +# These can contain mixed combination of fully qualified +# domain names, IPv4 and IPv6 addresses. +# FallbackTimeservers = diff --git a/src/timeserver.c b/src/timeserver.c index abe56fa..9dd3e30 100644 --- a/src/timeserver.c +++ b/src/timeserver.c @@ -37,6 +37,7 @@ static GSList *ts_list = NULL; static char **service_ts = NULL; static const char *service_gw = NULL; static char **service_ts_config = NULL; +static char **fallback_ts = NULL; static GResolv *resolv = NULL; static int resolv_id = 0; @@ -88,6 +89,27 @@ static char **load_timeservers() return servers; } +static void load_fallback_timeservers() +{ + GKeyFile *keyfile; + GError *error = NULL; + + keyfile = __connman_storage_load_mainconf();
No definitely not. The main.conf should be loaded AND parsed once, and then you request some value from their respective key elsewhere in the code. You should have add a FallbackTimeservers into the connman_settings structure in src/main.c and added a function connman_settings_get_string_list() in src/main.c
which you could have used here. Cheers, Tomasz _______________________________________________ connman mailing list [email protected] http://lists.connman.net/listinfo/connman
