Add resolver plugin for /etc/resolv.conf modifications

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 121e05a..ea85755 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -2,7 +2,7 @@
 plugindir = $(libdir)/connman/plugins
 
 plugin_LTLIBRARIES = hal.la ethernet.la wifi.la bluetooth.la \
-                                       dhclient.la ipv4.la resolvconf.la
+                       dhclient.la ipv4.la resolvconf.la resolvfile.la
 
 hal_la_SOURCES = hal.c
 hal_la_LIBADD = @HAL_LIBS@
@@ -22,6 +22,8 @@ ipv4_la_SOURCES = ipv4.c
 
 resolvconf_la_SOURCES = resolvconf.c
 
+resolvfile_la_SOURCES = resolvfile.c
+
 AM_LDFLAGS = -no-undefined -module -avoid-version \
                                -export-symbols-regex connman_plugin_desc
 

diff --git a/plugins/resolvconf.c b/plugins/resolvconf.c
index b199646..1d4927b 100644 (file)
--- a/plugins/resolvconf.c
+++ b/plugins/resolvconf.c
@@ -72,8 +72,6 @@ static void resolvconf_remove(struct connman_element *element)
 
        DBG("element %p name %s", element, element->name);
 
-       DBG("element %p name %s", element, element->name);
-
        connman_element_set_data(element, NULL);
 
        connman_element_unregister(internet);
@@ -92,6 +90,7 @@ static void resolvconf_remove(struct connman_element *element)
 static struct connman_driver resolvconf_driver = {
        .name           = "resolvconf",
        .type           = CONNMAN_ELEMENT_TYPE_RESOLVER,
+       .priority       = CONNMAN_DRIVER_PRIORITY_HIGH,
        .probe          = resolvconf_probe,
        .remove         = resolvconf_remove,
 };

diff --git a/plugins/resolvfile.c b/plugins/resolvfile.c
new file mode 100644 (file)
index 0000000..d39b2e1
--- /dev/null
+++ b/plugins/resolvfile.c
@@ -0,0 +1,99 @@
+/*
+ *
+ *  Connection Manager
+ *
+ *  Copyright (C) 2007-2008  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
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
+
+#include <connman/plugin.h>
+#include <connman/driver.h>
+#include <connman/log.h>
+
+static int resolvfile_probe(struct connman_element *element)
+{
+       const char *nameserver = NULL;
+       struct connman_element *internet;
+       gchar *cmd;
+       int err;
+
+       DBG("element %p name %s", element, element->name);
+
+       connman_element_get_value(element,
+                       CONNMAN_PROPERTY_TYPE_IPV4_NAMESERVER, &nameserver);
+
+       if (nameserver == NULL)
+               return -EINVAL;
+
+       cmd = g_strdup_printf("echo \"nameserver %s\" > /etc/resolv.conf",
+                                                               nameserver);
+
+       DBG("%s", cmd);
+
+       err = system(cmd);
+
+       g_free(cmd);
+
+       internet = connman_element_create();
+
+       internet->type = CONNMAN_ELEMENT_TYPE_INTERNET;
+
+       connman_element_set_data(element, internet);
+
+       connman_element_register(internet, element);
+
+       return 0;
+}
+
+static void resolvfile_remove(struct connman_element *element)
+{
+       struct connman_element *internet = connman_element_get_data(element);
+
+       DBG("element %p name %s", element, element->name);
+
+       connman_element_set_data(element, NULL);
+
+       connman_element_unregister(internet);
+
+       connman_element_unref(internet);
+}
+
+static struct connman_driver resolvfile_driver = {
+       .name           = "resolvconf",
+       .type           = CONNMAN_ELEMENT_TYPE_RESOLVER,
+       .priority       = CONNMAN_DRIVER_PRIORITY_LOW,
+       .probe          = resolvfile_probe,
+       .remove         = resolvfile_remove,
+};
+
+static int resolvfile_init(void)
+{
+       return connman_driver_register(&resolvfile_driver);
+}
+
+static void resolvfile_exit(void)
+{
+       connman_driver_unregister(&resolvfile_driver);
+}
+
+CONNMAN_PLUGIN_DEFINE("resolvfile", "Name resolver plugin", VERSION,
+                                       resolvfile_init, resolvfile_exit)