X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Ftimeserver.c;h=467da52daf6ddc33e7c870401853695ef0395f2a;hb=230905c20905f2bc5ccf4b8fab75c1b5df2ac31d;hp=08dd81b5805cb4dfb713058efd37961dc2dffbd7;hpb=7a1a8e658bf3fcba09efbb842fdf6c739a5cea67;p=framework%2Fconnectivity%2Fconnman.git diff --git a/src/timeserver.c b/src/timeserver.c index 08dd81b..467da52 100644 --- a/src/timeserver.c +++ b/src/timeserver.c @@ -2,7 +2,7 @@ * * Connection Manager * - * Copyright (C) 2007-2010 Intel Corporation. All rights reserved. + * Copyright (C) 2007-2012 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -28,15 +28,14 @@ #include #include #include +#include #include "connman.h" -static char **system_timeservers = NULL; -static char **timeservers = NULL; +static GSList *ts_list = NULL; static GResolv *resolv = NULL; static int resolv_id = 0; -static volatile int count; static void resolv_debug(const char *str, void *data) { @@ -66,7 +65,6 @@ static void save_timeservers(char **servers) static char **load_timeservers() { GKeyFile *keyfile; - GError *error = NULL; char **servers = NULL; keyfile = __connman_storage_load_global(); @@ -74,90 +72,197 @@ static char **load_timeservers() return NULL; servers = g_key_file_get_string_list(keyfile, "global", - "Timeservers", NULL, &error); - if (error) { - DBG("Error loading timeservers: %s", error->message); - g_error_free(error); - } + "Timeservers", NULL, NULL); g_key_file_free(keyfile); return servers; } -/* Restart NTP procedure */ -static void connman_timeserver_restart() +static void resolv_result(GResolvResultStatus status, char **results, gpointer user_data) +{ + int i; + + DBG("status %d", status); + + if (status == G_RESOLV_RESULT_STATUS_SUCCESS) { + if (results != NULL) { + for (i = 0; results[i]; i++) + DBG("result: %s", results[i]); + + __connman_ntp_start(results[0]); + + return; + } + } + + /* If resolving fails, move to the next server */ + __connman_timeserver_sync_next(); +} + +/* + * Once the timeserver list (ts_list) is created, we start querying the + * servers one by one. If resolving fails on one of them, we move to the + * next one. The user can enter either an IP address or a URL for the + * timeserver. We only resolve the urls. Once we have a IP for the NTP + * server, we start querying it for time corrections. + */ +void __connman_timeserver_sync_next() { - /* If service timeservers are in use, dont restart ntp */ - if (timeservers != NULL) + char *server; + + __connman_ntp_stop(); + + /* Get the 1st server in the list */ + if (ts_list == NULL) return; - if (resolv == NULL) { - DBG("No online service."); + server = ts_list->data; + + ts_list = g_slist_delete_link(ts_list, ts_list); + + /* if its a IP , directly query it. */ + if (connman_inet_check_ipaddress(server) > 0) { + DBG("Using timeservers %s", server); + + __connman_ntp_start(server); + + g_free(server); return; } - /* Cancel current lookup */ - if(resolv_id > 0) - g_resolv_cancel_lookup(resolv, resolv_id); + DBG("Resolving server %s", server); - /* Reload system timeserver list */ - if (system_timeservers != NULL) { - g_strfreev(system_timeservers); - system_timeservers = NULL; - } + resolv_id = g_resolv_lookup_hostname(resolv, server, + resolv_result, NULL); - system_timeservers = load_timeservers(); + g_free(server); - if (system_timeservers == NULL) - return; + return; +} - __connman_ntp_stop(); +GSList *__connman_timeserver_add_list(GSList *server_list, + const char *timeserver) +{ + GSList *list = server_list; - count = 0; + if (timeserver == NULL) + return server_list; - __connman_timeserver_sync_next(); + while (list != NULL) { + char *existing_server = list->data; + if (strcmp(timeserver, existing_server) == 0) + return server_list; + list = g_slist_next(list); + } + return g_slist_prepend(server_list, g_strdup(timeserver)); } -static void resolv_result(GResolvResultStatus status, char **results, gpointer user_data) +/* + * __connman_timeserver_get_all function creates the timeserver + * list which will be used to determine NTP server for time corrections. + * The service settings take priority over the global timeservers. + */ +GSList *__connman_timeserver_get_all(struct connman_service *service) { - int i; + GSList *list = NULL; + struct connman_network *network; + char **timeservers; + char **service_ts; + char **service_ts_config; + const char *service_gw; + char **fallback_ts; + int index, i; + + service_ts_config = connman_service_get_timeservers_config(service); + + /* First add Service Timeservers.Configuration to the list */ + for (i = 0; service_ts_config != NULL && service_ts_config[i] != NULL; + i++) + list = __connman_timeserver_add_list(list, + service_ts_config[i]); + + service_ts = connman_service_get_timeservers(service); + + /* First add Service Timeservers via DHCP to the list */ + for (i = 0; service_ts != NULL && service_ts[i] != NULL; i++) + list = __connman_timeserver_add_list(list, service_ts[i]); + + network = __connman_service_get_network(service); + if (network != NULL) { + index = connman_network_get_index(network); + service_gw = __connman_ipconfig_get_gateway_from_index(index, + CONNMAN_IPCONFIG_TYPE_ALL); + + /* Then add Service Gateway to the list */ + if (service_gw != NULL) + list = __connman_timeserver_add_list(list, service_gw); + } - DBG("status %d", status); + /* Then add Global Timeservers to the list */ + timeservers = load_timeservers(); - __sync_fetch_and_add(&count, 1); + for (i = 0; timeservers != NULL && timeservers[i] != NULL; i++) + list = __connman_timeserver_add_list(list, timeservers[i]); - if (status == G_RESOLV_RESULT_STATUS_SUCCESS) { - if (results != NULL) { - for (i = 0; results[i]; i++) - DBG("result: %s", results[i]); + g_strfreev(timeservers); - __connman_ntp_start(results[0]); + fallback_ts = connman_setting_get_string_list("FallbackTimeservers"); - return; - } - } + /* Lastly add the fallback servers */ + for (i = 0; fallback_ts != NULL && fallback_ts[i] != NULL; i++) + list = __connman_timeserver_add_list(list, fallback_ts[i]); - __connman_timeserver_sync_next(); + return g_slist_reverse(list); } -void __connman_timeserver_sync_next() +/* + * This function must be called everytime the default service changes, the + * service timeserver(s) or gatway changes or the global timeserver(s) changes. + */ +int __connman_timeserver_sync(struct connman_service *default_service) { - if (system_timeservers == NULL || - system_timeservers[count] == NULL) - return; + struct connman_service *service; + + if (default_service != NULL) + service = default_service; + else + service = __connman_service_get_default(); - DBG("Trying timeserver %s", system_timeservers[count]); + if (service == NULL) + return -EINVAL; + + if (resolv == NULL) + return 0; + /* + * Before we start creating the new timeserver list we must stop + * any ongoing ntp query and server resolution. + */ - if (resolv) - resolv_id = g_resolv_lookup_hostname(resolv, - system_timeservers[count], resolv_result, - NULL); + __connman_ntp_stop(); + + if (resolv_id > 0) + g_resolv_cancel_lookup(resolv, resolv_id); + + g_slist_free_full(ts_list, g_free); + + ts_list = __connman_timeserver_get_all(service); + + __connman_service_timeserver_changed(service, ts_list); + + if (ts_list == NULL) { + DBG("No timeservers set."); + return 0; + } + + __connman_timeserver_sync_next(); + + return 0; } -int __connman_timeserver_sync(struct connman_service *service) +static int timeserver_start(struct connman_service *service) { - char **nameservers = NULL; + char **nameservers; int i; DBG("service %p", service); @@ -170,9 +275,21 @@ int __connman_timeserver_sync(struct connman_service *service) if (nameservers == NULL) return -EINVAL; + /* Stop an already ongoing resolution, if there is one */ + if (resolv != NULL && resolv_id > 0) + g_resolv_cancel_lookup(resolv, resolv_id); + + /* get rid of the old resolver */ + if (resolv != NULL) { + g_resolv_unref(resolv); + resolv = NULL; + } + resolv = g_resolv_new(i); - if (resolv == NULL) + if (resolv == NULL) { + g_strfreev(nameservers); return -ENOMEM; + } if (getenv("CONNMAN_RESOLV_DEBUG")) g_resolv_set_debug(resolv, resolv_debug, "RESOLV"); @@ -180,31 +297,12 @@ int __connman_timeserver_sync(struct connman_service *service) for (i = 0; nameservers[i] != NULL; i++) g_resolv_add_nameserver(resolv, nameservers[i], 53, 0); - count = 0; + g_strfreev(nameservers); - system_timeservers = load_timeservers(); - - timeservers = connman_service_get_timeservers(service); - - if (timeservers != NULL && timeservers[0] != NULL) { - DBG("Using service tiemservers"); - __connman_ntp_start(timeservers[0]); - return 0; - } - - if (system_timeservers == NULL || system_timeservers[count] == NULL) { - DBG("No timeservers set."); - return 0; - } - - DBG("Trying server %s", system_timeservers[count]); - - resolv_id = g_resolv_lookup_hostname(resolv, system_timeservers[count], - resolv_result, NULL); - return 0; + return __connman_timeserver_sync(service); } -void __connman_timeserver_stop() +static void timeserver_stop() { DBG(" "); @@ -213,14 +311,9 @@ void __connman_timeserver_stop() resolv = NULL; } - if (system_timeservers != NULL) { - g_strfreev(system_timeservers); - system_timeservers = NULL; - } - - timeservers = NULL; + g_slist_free_full(ts_list, g_free); - count = 0; + ts_list = NULL; __connman_ntp_stop(); } @@ -229,7 +322,7 @@ int __connman_timeserver_system_set(char **servers) { save_timeservers(servers); - connman_timeserver_restart(); + __connman_timeserver_sync(NULL); return 0; } @@ -242,14 +335,31 @@ char **__connman_timeserver_system_get() return servers; } +static void default_changed(struct connman_service *default_service) +{ + if (default_service != NULL) + timeserver_start(default_service); + else + timeserver_stop(); +} + +static struct connman_notifier timeserver_notifier = { + .name = "timeserver", + .default_changed = default_changed, +}; + int __connman_timeserver_init(void) { DBG(""); + connman_notifier_register(×erver_notifier); + return 0; } void __connman_timeserver_cleanup(void) { DBG(""); + + connman_notifier_unregister(×erver_notifier); }