[PATCH v4 05/13] timeserver: Add service gateway to timeserver list

[Alok Barsode]

From: Alok Barsode <alok.bars...@linux.intel.com>

Add default service Gateway to the timeserver query list.
Now the list is service timeservers(via DHCP), gateway and global
timeservers, in that order.
---
 src/timeserver.c |   33 ++++++++++++++++++++++++++++-----
 1 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/timeserver.c b/src/timeserver.c
index 8344bd3..2b2585f 100644
--- a/src/timeserver.c
+++ b/src/timeserver.c
@@ -35,6 +35,7 @@
 static GSList *ts_list = NULL;
 
 static char **service_ts = NULL;
+static const char *service_gw = NULL;
 
 static GResolv *resolv = NULL;
 static int resolv_id = 0;
@@ -164,13 +165,14 @@ void __connman_timeserver_sync_next()
  * __connman_timeserver_sync function recreates the timeserver
  * list which will be used to determine NTP server for time corrections.
  * It must be called everytime the default service changes, the service
- * timeserver(s) changes or the global timeserver(s) changes.The service
- * settings take priority over the global timeservers.
+ * timeserver(s) or gatway changes or the global timeserver(s) changes.
+ * The service settings take priority over the global timeservers.
  */
 int __connman_timeserver_sync(struct connman_service *service)
 {
+       struct connman_network *network;
        char **timeservers;
-       int i;
+       int i, index;
 
        if (resolv == NULL)
                return 0;
@@ -189,12 +191,25 @@ int __connman_timeserver_sync(struct connman_service 
*service)
                ts_list = NULL;
        }
 
-       if (service != NULL)
+       if (service != NULL) {
                service_ts = connman_service_get_timeservers(service);
 
+               network = __connman_service_get_network(service);
+
+               index = connman_network_get_index(network);
+
+               service_gw = __connman_ipconfig_get_gateway_from_index(index);
+       }
+
+       /* First add Service Timeservers via DHCP to the list */
        for (i=0; service_ts != NULL && service_ts[i] != NULL; i++)
                ts_list = g_slist_append(ts_list, g_strdup(service_ts[i]));
 
+       /* Then add Service Gateway to the list */
+       if (service_gw != NULL)
+               ts_list = g_slist_append(ts_list, g_strdup(service_gw));
+
+       /* Then add Global Timeservers to the list */
        timeservers = load_timeservers();
 
        for (i=0; timeservers != NULL && timeservers[i] != NULL; i++)
@@ -212,7 +227,8 @@ int __connman_timeserver_sync(struct connman_service 
*service)
 
 static int timeserver_start(struct connman_service *service)
 {
-       char **nameservers = NULL;
+       struct connman_network *network;
+       char **nameservers;
        int i;
 
        DBG("service %p", service);
@@ -248,6 +264,13 @@ static int timeserver_start(struct connman_service 
*service)
        /* Cache service timeservers */
        service_ts = connman_service_get_timeservers(service);
 
+       network = __connman_service_get_network(service);
+
+       i = connman_network_get_index(network);
+
+       /* Cache service Gateway */
+       service_gw = __connman_ipconfig_get_gateway_from_index(i);
+
        return __connman_timeserver_sync(NULL);
 }
 
-- 
1.7.5.4

_______________________________________________
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman