+static GSList *entry_list = NULL;
+static GSList *resolver_list = NULL;
+
+static void remove_entries(GSList *entries)
+{
+ GSList *list;
+
+ for (list = entries; list; list = list->next) {
+ struct entry_data *entry = list->data;
+ struct connman_resolver *resolver = entry->resolver;
+
+ entry_list = g_slist_remove(entry_list, entry);
+
+ if (resolver->remove)
+ resolver->remove(entry->interface, entry->domain,
+ entry->server);
+
+ g_free(entry->server);
+ g_free(entry->domain);
+ g_free(entry->interface);
+ g_free(entry);
+ }
+
+ g_slist_free(entries);
+}
+
+static gint compare_priority(gconstpointer a, gconstpointer b)
+{
+ const struct connman_resolver *resolver1 = a;
+ const struct connman_resolver *resolver2 = b;
+
+ return resolver2->priority - resolver1->priority;
+}
+
+/**
+ * connman_resolver_register:
+ * @resolver: resolver module
+ *
+ * Register a new resolver module
+ *
+ * Returns: %0 on success
+ */
+int connman_resolver_register(struct connman_resolver *resolver)
+{
+ GSList *list;
+
+ DBG("resolver %p name %s", resolver, resolver->name);
+
+ resolver_list = g_slist_insert_sorted(resolver_list, resolver,
+ compare_priority);
+
+ if (resolver->append == NULL)
+ return 0;
+
+ for (list = entry_list; list; list = list->next) {
+ struct entry_data *entry = list->data;
+
+ if (entry->resolver)
+ continue;
+
+ if (resolver->append(entry->interface, entry->domain,
+ entry->server) == 0)
+ entry->resolver = resolver;
+ }
+
+ return 0;
+}
+
+/**
+ * connman_resolver_unregister:
+ * @resolver: resolver module
+ *
+ * Remove a previously registered resolver module
+ */
+void connman_resolver_unregister(struct connman_resolver *resolver)
+{
+ GSList *list, *matches = NULL;
+
+ DBG("resolver %p name %s", resolver, resolver->name);
+
+ resolver_list = g_slist_remove(resolver_list, resolver);
+
+ for (list = entry_list; list; list = list->next) {
+ struct entry_data *entry = list->data;
+
+ if (entry->resolver != resolver)
+ continue;
+
+ matches = g_slist_append(matches, entry);
+ }
+
+ remove_entries(matches);
+}
+
+/**
+ * connman_resolver_append:
+ * @interface: network interface
+ * @domain: domain limitation
+ * @server: server address
+ *
+ * Append resolver server address to current list
+ */
+int connman_resolver_append(const char *interface, const char *domain,
+ const char *server)
+{
+ struct entry_data *entry;
+ GSList *list;
+
+ DBG("interface %s domain %s server %s", interface, domain, server);
+
+ entry = g_try_new0(struct entry_data, 1);
+ if (entry == NULL)
+ return -ENOMEM;
+
+ entry->interface = g_strdup(interface);
+ entry->domain = g_strdup(domain);
+ entry->server = g_strdup(server);
+
+ entry_list = g_slist_append(entry_list, entry);
+
+ for (list = resolver_list; list; list = list->next) {
+ struct connman_resolver *resolver = list->data;
+
+ if (resolver->append == NULL)
+ continue;
+
+ if (resolver->append(interface, domain, server) == 0) {
+ entry->resolver = resolver;
+ break;
+ }
+ }
+
+ return 0;
+}
+
+/**
+ * connman_resolver_remove_all:
+ * @interface: network interface
+ *
+ * Remove all resolver server address for the specified interface
+ */
+int connman_resolver_remove_all(const char *interface)