From: Alok Barsode <[email protected]>
Add Timeservers.Configuration timerservers (if any) to the list of
timeservers for time correction query. Now the Order is
Timeserver.Config (via the user), service timeserver (via DHCP).
default gateway (system), global timeservers (via the user).
---
src/service.c | 2 ++
src/timeserver.c | 11 +++++++++++
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/service.c b/src/service.c
index 3b82e0f..4012377 100644
--- a/src/service.c
+++ b/src/service.c
@@ -2768,6 +2768,8 @@ static DBusMessage *set_property(DBusConnection *conn,
g_string_free(str, TRUE);
service_save(service);
+
+ __connman_timeserver_sync(service);
} else if (g_str_equal(name, "Domains.Configuration") == TRUE) {
DBusMessageIter entry;
GString *str;
diff --git a/src/timeserver.c b/src/timeserver.c
index c16716a..ba63fdb 100644
--- a/src/timeserver.c
+++ b/src/timeserver.c
@@ -34,6 +34,8 @@
static GList *ts_list = NULL;
static char **service_ts = NULL;
+static char **service_ts_config = NULL;
+
static const char *service_gw;
static GResolv *resolv = NULL;
@@ -186,9 +188,15 @@ int __connman_timeserver_sync(struct connman_service
*service)
ipconfig = __connman_service_get_ip4config(service);
service_gw = __connman_ipconfig_get_gateway(ipconfig);
+
+ service_ts_config =
connman_service_get_timeservers_config(service);
}
/* First add Service Timeservers via DHCP to the list */
+ for(i=0; service_ts_config != NULL && service_ts_config[i] != NULL; i++)
+ ts_list = g_list_append(ts_list,
g_strdup(service_ts_config[i]));
+
+ /* Then add Service Timeservers via DHCP to the list */
for(i=0; service_ts != NULL && service_ts[i] != NULL; i++)
ts_list = g_list_append(ts_list, g_strdup(service_ts[i]));
@@ -256,6 +264,9 @@ static int timeserver_start(struct connman_service *service)
/* Cache service Gateway */
service_gw = __connman_ipconfig_get_gateway(ipconfig);
+ /* Cache service timeservers.config */
+ service_ts_config = connman_service_get_timeservers_config(service);
+
return __connman_timeserver_sync(NULL);
}
--
1.7.5.4
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
