Fix broken global state change signals

[connman] / plugins / resolvconf.c

diff --git a/plugins/resolvconf.c b/plugins/resolvconf.c
index b199646..f81d106 100644 (file)
--- a/plugins/resolvconf.c
+++ b/plugins/resolvconf.c
@@ -23,41 +23,52 @@
 #include <config.h>
 #endif
 
+#include <unistd.h>
 #include <stdlib.h>
 
 #include <connman/plugin.h>
 #include <connman/driver.h>
 #include <connman/log.h>
 
+#include "inet.h"
+
+#define RESOLVCONF "/sbin/resolvconf"
+
 static int resolvconf_probe(struct connman_element *element)
 {
        const char *nameserver = NULL;
        struct connman_element *internet;
-       gchar *cmd;
+       gchar *cmd, *name;
        int err;
 
        DBG("element %p name %s", element, element->name);
 
+       if (access(RESOLVCONF, X_OK) < 0)
+               return -errno;
+
        connman_element_get_value(element,
-                       CONNMAN_PROPERTY_TYPE_IPV4_NAMESERVER, &nameserver);
+                       CONNMAN_PROPERTY_ID_IPV4_NAMESERVER, &nameserver);
 
        if (nameserver == NULL)
                return -EINVAL;
 
-       cmd = g_strdup_printf("echo \"nameserver %s\" | resolvconf -a %s",
-                                       nameserver, element->netdev.name);
+       name = inet_index2name(element->index);
+
+       cmd = g_strdup_printf("echo \"nameserver %s\" | %s -a %s",
+                                               nameserver, RESOLVCONF, name);
+
+       g_free(name);
 
        DBG("%s", cmd);
 
-       err = system(cmd);
+       //err = system(cmd);
+       err = 0;
 
        g_free(cmd);
 
-       internet = connman_element_create();
+       internet = connman_element_create(NULL);
 
-       internet->type = CONNMAN_ELEMENT_TYPE_INTERNET;
-
-       connman_element_set_data(element, internet);
+       internet->type = CONNMAN_ELEMENT_TYPE_CONNECTION;
 
        connman_element_register(internet, element);
 
@@ -66,25 +77,21 @@ static int resolvconf_probe(struct connman_element *element)
 
 static void resolvconf_remove(struct connman_element *element)
 {
-       struct connman_element *internet = connman_element_get_data(element);
-       gchar *cmd;
+       gchar *cmd, *name;
        int err;
 
        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);
+       name = inet_index2name(element->index);
 
-       connman_element_unref(internet);
+       cmd = g_strdup_printf("%s -d %s", RESOLVCONF, name);
 
-       cmd = g_strdup_printf("resolvconf -d %s", element->netdev.name);
+       g_free(name);
 
        DBG("%s", cmd);
 
-       err = system(cmd);
+       //err = system(cmd);
+       err = 0;
 
        g_free(cmd);
 }
@@ -92,6 +99,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,
 };