#include <errno.h>
#include <glib.h>
-#include <stdlib.h>
-#include <gweb/gresolv.h>
-#include <netdb.h>
#include "connman.h"
-static GSList *ts_list = NULL;
+static GSList *driver_list = NULL;
+static GHashTable *server_hash = NULL;
-static GResolv *resolv = NULL;
-static int resolv_id = 0;
-
-static void resolv_debug(const char *str, void *data)
-{
- connman_info("%s: %s\n", (const char *) data, str);
-}
-static void save_timeservers(char **servers)
+static gint compare_priority(gconstpointer a, gconstpointer b)
{
- GKeyFile *keyfile;
- int cnt;
-
- keyfile = __connman_storage_load_global();
- if (keyfile == NULL)
- keyfile = g_key_file_new();
-
- for (cnt = 0; servers != NULL && servers[cnt] != NULL; cnt++);
-
- g_key_file_set_string_list(keyfile, "global", "Timeservers",
- (const gchar **)servers, cnt);
+ const struct connman_timeserver_driver *driver1 = a;
+ const struct connman_timeserver_driver *driver2 = b;
- __connman_storage_save_global(keyfile);
-
- g_key_file_free(keyfile);
-
- return;
+ return driver2->priority - driver1->priority;
}
-static char **load_timeservers()
+/**
+ * connman_timeserver_driver_register:
+ * @driver: timeserver driver definition
+ *
+ * Register a new timeserver driver
+ *
+ * Returns: %0 on success
+ */
+int connman_timeserver_driver_register(struct connman_timeserver_driver *driver)
{
- GKeyFile *keyfile;
- GError *error = NULL;
- char **servers = NULL;
-
- keyfile = __connman_storage_load_global();
- if (keyfile == NULL)
- 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);
- }
+ DBG("driver %p name %s", driver, driver->name);
- g_key_file_free(keyfile);
+ driver_list = g_slist_insert_sorted(driver_list, driver,
+ compare_priority);
- return servers;
+ return 0;
}
-static void resolv_result(GResolvResultStatus status, char **results, gpointer user_data)
+/**
+ * connman_timeserver_driver_unregister:
+ * @driver: timeserver driver definition
+ *
+ * Remove a previously registered timeserver driver
+ */
+void connman_timeserver_driver_unregister(struct connman_timeserver_driver *driver)
{
- 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]);
+ DBG("driver %p name %s", driver, driver->name);
- __connman_ntp_start(results[0]);
-
- return;
- }
- }
-
- /* If resolving fails, move to the next server */
- __connman_timeserver_sync_next();
+ driver_list = g_slist_remove(driver_list, driver);
}
-/*
- * 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.
+/**
+ * connman_timeserver_append:
+ * @server: server address
+ *
+ * Append time server server address to current list
*/
-void __connman_timeserver_sync_next()
+int connman_timeserver_append(const char *server)
{
- char *server;
- int ret;
- struct addrinfo hints;
- struct addrinfo *addr;
-
- __connman_ntp_stop();
-
- /* Get the 1st server in the list */
- if (ts_list == NULL)
- return;
-
- server = ts_list->data;
-
- ts_list = g_slist_delete_link(ts_list, ts_list);
-
- memset(&hints, 0, sizeof(struct addrinfo));
- hints.ai_flags = AI_NUMERICHOST;
- addr = NULL;
-
- ret = getaddrinfo(server, NULL, &hints, &addr);
- freeaddrinfo(addr);
-
- /* if its a IP , directly query it. */
- if (ret == 0) {
- DBG("Using timeservers %s", server);
-
- __connman_ntp_start(server);
-
- g_free(server);
- return;
- }
+ GSList *list;
- DBG("Resolving server %s", server);
+ DBG("server %s", server);
- resolv_id = g_resolv_lookup_hostname(resolv, server,
- resolv_result, NULL);
-
- g_free(server);
-
- return;
-}
-
-
-/*
- * __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) 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 *default_service)
-{
- struct connman_service *service;
- struct connman_network *network;
- char **timeservers;
- char **service_ts;
- char **service_ts_config;
- const char *service_gw;
- char **fallback_ts;
- int index, i;
-
- if (default_service != NULL)
- service = default_service;
- else
- service = __connman_service_get_default();
-
- if (service == NULL)
+ if (server == NULL)
return -EINVAL;
- if (resolv == NULL)
+ /* This server is already handled by a driver */
+ if (g_hash_table_lookup(server_hash, server))
return 0;
- /*
- * Before be start creating the new timeserver list we must stop
- * any ongoing ntp query and server resolution.
- */
- __connman_ntp_stop();
+ for (list = driver_list; list; list = list->next) {
+ struct connman_timeserver_driver *driver = list->data;
+ char *new_server;
- if (resolv_id > 0)
- g_resolv_cancel_lookup(resolv, resolv_id);
-
- if (ts_list != NULL) {
- g_slist_free_full(ts_list, g_free);
- ts_list = NULL;
- }
+ if (driver->append == NULL)
+ continue;
- service_ts_config = connman_service_get_timeservers_config(service);
+ new_server = g_strdup(server);
+ if (new_server == NULL)
+ return -ENOMEM;
- /* First add Service Timeservers.Configuration to the list */
- for (i=0; service_ts_config != NULL && service_ts_config[i] != NULL; i++)
- ts_list = g_slist_prepend(ts_list, g_strdup(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++)
- ts_list = g_slist_prepend(ts_list, g_strdup(service_ts[i]));
-
- network = __connman_service_get_network(service);
-
- index = connman_network_get_index(network);
-
- service_gw = __connman_ipconfig_get_gateway_from_index(index);
-
- /* Then add Service Gateway to the list */
- if (service_gw != NULL)
- ts_list = g_slist_prepend(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++)
- ts_list = g_slist_prepend(ts_list, g_strdup(timeservers[i]));
-
- g_strfreev(timeservers);
-
- fallback_ts = connman_setting_get_string_list("FallbackTimeservers");
-
- /* Lastly add the fallback servers */
- for (i=0; fallback_ts != NULL && fallback_ts[i] != NULL; i++)
- ts_list = g_slist_prepend(ts_list, g_strdup(fallback_ts[i]));
-
- if (ts_list == NULL) {
- DBG("No timeservers set.");
- return 0;
+ if (driver->append(server) == 0) {
+ g_hash_table_insert(server_hash, new_server, driver);
+ return 0;
+ } else {
+ g_free(new_server);
+ }
}
- ts_list = g_slist_reverse(ts_list);
-
- __connman_timeserver_sync_next();
-
- return 0;
+ return -ENOENT;
}
-static int timeserver_start(struct connman_service *service)
+/**
+ * connman_timeserver_remove:
+ * @server: server address
+ *
+ * Remover time server server address from current list
+ */
+int connman_timeserver_remove(const char *server)
{
- char **nameservers;
- int i;
+ struct connman_timeserver_driver *driver;
- DBG("service %p", service);
+ DBG("server %s", server);
- i = __connman_service_get_index(service);
- if (i < 0)
+ if (server == NULL)
return -EINVAL;
- nameservers = connman_service_get_nameservers(service);
- if (nameservers == NULL)
+ driver = g_hash_table_lookup(server_hash, server);
+ if (driver == 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) {
- g_strfreev(nameservers);
- return -ENOMEM;
- }
-
- if (getenv("CONNMAN_RESOLV_DEBUG"))
- g_resolv_set_debug(resolv, resolv_debug, "RESOLV");
+ g_hash_table_remove(server_hash, server);
- for (i = 0; nameservers[i] != NULL; i++)
- g_resolv_add_nameserver(resolv, nameservers[i], 53, 0);
+ if (driver->remove == NULL)
+ return -ENOENT;
- g_strfreev(nameservers);
-
- return __connman_timeserver_sync(service);
+ return driver->remove(server);
}
-static void timeserver_stop()
+void connman_timeserver_sync(void)
{
- DBG(" ");
-
- if (resolv != NULL) {
- g_resolv_unref(resolv);
- resolv = NULL;
- }
+ GSList *list;
- if (ts_list != NULL)
- g_slist_free_full(ts_list, g_free);
-
- ts_list = NULL;
-
- __connman_ntp_stop();
-}
-
-int __connman_timeserver_system_set(char **servers)
-{
- save_timeservers(servers);
-
- __connman_timeserver_sync(NULL);
-
- return 0;
-}
+ DBG("");
-char **__connman_timeserver_system_get()
-{
- char **servers;
+ for (list = driver_list; list; list = list->next) {
+ struct connman_timeserver_driver *driver = list->data;
- servers = load_timeservers();
- return servers;
-}
+ if (driver->sync == NULL)
+ continue;
-static void default_changed(struct connman_service *default_service)
-{
- if (default_service != NULL)
- timeserver_start(default_service);
- else
- timeserver_stop();
+ driver->sync();
+ }
}
-static struct connman_notifier timeserver_notifier = {
- .name = "timeserver",
- .default_changed = default_changed,
-};
-
int __connman_timeserver_init(void)
{
DBG("");
- connman_notifier_register(×erver_notifier);
+ server_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
+ g_free, NULL);
return 0;
}
{
DBG("");
- connman_notifier_unregister(×erver_notifier);
+ g_hash_table_destroy(server_hash);
}
projects / framework / connectivity / connman.git / blobdiff