summaryrefslogtreecommitdiff
path: root/src/resolver.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2008-12-13 19:25:04 +0100
committerMarcel Holtmann <marcel@holtmann.org>2008-12-13 19:25:04 +0100
commitaad2c32df36c15ccafaadd5c0f7f71aff4c21995 (patch)
tree74753a68cc3bc5eb3f10aee407388dbec26337fd /src/resolver.c
parent1854341db894fd9efc8aa5eabe32b3a101ec605c (diff)
downloadconnman-aad2c32df36c15ccafaadd5c0f7f71aff4c21995.tar.gz
connman-aad2c32df36c15ccafaadd5c0f7f71aff4c21995.tar.bz2
connman-aad2c32df36c15ccafaadd5c0f7f71aff4c21995.zip
Add improved resolver framework
Diffstat (limited to 'src/resolver.c')
-rw-r--r--src/resolver.c167
1 files changed, 167 insertions, 0 deletions
diff --git a/src/resolver.c b/src/resolver.c
index a8132361..d77ebc2a 100644
--- a/src/resolver.c
+++ b/src/resolver.c
@@ -25,8 +25,39 @@
#include "connman.h"
+struct entry_data {
+ struct connman_resolver *resolver;
+ char *interface;
+ char *domain;
+ char *server;
+};
+
+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;
@@ -45,11 +76,27 @@ static gint compare_priority(gconstpointer a, gconstpointer b)
*/
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;
}
@@ -61,7 +108,127 @@ int connman_resolver_register(struct connman_resolver *resolver)
*/
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)
+{
+ GSList *list, *matches = NULL;
+
+ DBG("interface %s", interface);
+
+ for (list = entry_list; list; list = list->next) {
+ struct entry_data *entry = list->data;
+ struct connman_resolver *resolver;
+
+ if (g_str_equal(entry->interface, interface) == FALSE)
+ continue;
+
+ matches = g_slist_append(matches, entry);
+ }
+
+ remove_entries(matches);
+
+ return 0;
+}
+
+static int selftest_append(const char *interface, const char *domain,
+ const char *server)
+{
+ DBG("server %s", server);
+
+ return 0;
+}
+
+static int selftest_remove(const char *interface, const char *domain,
+ const char *server)
+{
+ DBG("server %s", server);
+
+ return 0;
+}
+
+static struct connman_resolver selftest = {
+ .name = "selftest",
+ .priority = CONNMAN_RESOLVER_PRIORITY_HIGH + 42,
+ .append = selftest_append,
+ .remove = selftest_remove,
+};
+
+int __connman_resolver_selftest(void)
+{
+ connman_resolver_append("wlan0", "lwn.net", "192.168.0.1");
+
+ connman_resolver_register(&selftest);
+
+ connman_resolver_append("eth0", "moblin.org", "192.168.42.1");
+ connman_resolver_append("wlan0", "lwn.net", "192.168.0.2");
+
+ connman_resolver_remove_all("wlan0");
+
+ connman_resolver_unregister(&selftest);
+
+ return 0;
}