X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=plugins%2Fresolvconf.c;h=df3a834bf6b6ae152d874133f43d6fc249cd1e20;hb=0b83444798ff1963d8357e5aa36ebf79d45c67c3;hp=45d15c378e6df1943b4483b0e6aabbea44a68fb7;hpb=c6af8b38102a9d53be5fa7a25b4374e4a9f3f4b4;p=connman

diff --git a/plugins/resolvconf.c b/plugins/resolvconf.c
index 45d15c3..df3a834 100644
--- a/plugins/resolvconf.c
+++ b/plugins/resolvconf.c
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2008  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2009  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
@@ -23,70 +23,75 @@
 #include <config.h>
 #endif
 
+#include <errno.h>
+#include <unistd.h>
 #include <stdlib.h>
 
+#define CONNMAN_API_SUBJECT_TO_CHANGE
 #include <connman/plugin.h>
-#include <connman/driver.h>
+#include <connman/resolver.h>
 #include <connman/log.h>
 
-static int resolvconf_probe(struct connman_element *element)
-{
-	const char *nameserver = NULL;
-	gchar *cmd;
-	//int err;
+#include <glib.h>
 
-	DBG("element %p name %s", element, element->name);
+static int resolvconf_append(const char *interface, const char *domain,
+							const char *server)
+{
+	char *cmd;
+	int err;
 
-	connman_element_get_value(element,
-			CONNMAN_PROPERTY_TYPE_IPV4_NAMESERVER, &nameserver);
+	DBG("interface %s server %s", interface, server);
 
-	if (nameserver == NULL)
-		return -EINVAL;
+	if (access(RESOLVCONF, X_OK) < 0)
+		return -errno;
 
-	cmd = g_strdup_printf("echo \"nameserver %s\" | resolvconf -a %s",
-					nameserver, element->netdev.name);
+	cmd = g_strdup_printf("echo \"nameserver %s\" | %s -a %s",
+						server, RESOLVCONF, interface);
 
 	DBG("%s", cmd);
 
-	//err = system(cmd);
+	err = system(cmd);
 
 	g_free(cmd);
 
-	return 0;
+	return err;
 }
 
-static void resolvconf_remove(struct connman_element *element)
+static int resolvconf_remove(const char *interface, const char *domain,
+							const char *server)
 {
-	gchar *cmd;
-	//int err;
+	char *cmd;
+	int err;
 
-	DBG("element %p name %s", element, element->name);
+	DBG("interface %s server %s", interface, server);
 
-	cmd = g_strdup_printf("resolvconf -d %s", element->netdev.name);
+	cmd = g_strdup_printf("%s -d %s", RESOLVCONF, interface);
 
 	DBG("%s", cmd);
 
-	//err = system(cmd);
+	err = system(cmd);
 
 	g_free(cmd);
+
+	return err;
 }
 
-static struct connman_driver resolvconf_driver = {
+static struct connman_resolver resolvconf_resolver = {
 	.name		= "resolvconf",
-	.type		= CONNMAN_ELEMENT_TYPE_RESOLVER,
-	.probe		= resolvconf_probe,
+	.priority	= CONNMAN_RESOLVER_PRIORITY_DEFAULT,
+	.append		= resolvconf_append,
 	.remove		= resolvconf_remove,
 };
 
 static int resolvconf_init(void)
 {
-	return connman_driver_register(&resolvconf_driver);
+	return connman_resolver_register(&resolvconf_resolver);
 }
 
 static void resolvconf_exit(void)
 {
-	connman_driver_unregister(&resolvconf_driver);
+	connman_resolver_unregister(&resolvconf_resolver);
 }
 
-CONNMAN_PLUGIN_DEFINE("resolvconf", "Name resolver plugin", VERSION,
-					resolvconf_init, resolvconf_exit)
+CONNMAN_PLUGIN_DEFINE(resolvconf, "Name resolver plugin", VERSION,
+		CONNMAN_PLUGIN_PRIORITY_DEFAULT, resolvconf_init, resolvconf_exit)