Add support for reading RFKILL events

[connman] / src / element.c

diff --git a/src/element.c b/src/element.c
index 3dc1504..e670864 100644 (file)
--- a/src/element.c
+++ b/src/element.c
@@ -272,9 +272,22 @@ int __connman_element_count(struct connman_element *element,
        return data.count;
 }
 
+static struct connman_network *__connman_element_get_network(struct connman_element *element)
+{
+       if (element->type == CONNMAN_ELEMENT_TYPE_NETWORK &&
+                                               element->network != NULL)
+               return element->network;
+
+       if (element->parent == NULL)
+               return NULL;
+
+       return __connman_element_get_network(element->parent);
+}
+
 struct connman_service *__connman_element_get_service(struct connman_element *element)
 {
-       struct connman_service *service;
+       struct connman_service *service = NULL;
+       struct connman_network *network;
        struct connman_device *device;
        enum connman_device_type type;
 
@@ -287,18 +300,23 @@ struct connman_service *__connman_element_get_service(struct connman_element *el
        switch (type) {
        case CONNMAN_DEVICE_TYPE_UNKNOWN:
        case CONNMAN_DEVICE_TYPE_VENDOR:
-       case CONNMAN_DEVICE_TYPE_WIFI:
-       case CONNMAN_DEVICE_TYPE_WIMAX:
        case CONNMAN_DEVICE_TYPE_BLUETOOTH:
        case CONNMAN_DEVICE_TYPE_GPS:
        case CONNMAN_DEVICE_TYPE_HSO:
        case CONNMAN_DEVICE_TYPE_NOZOMI:
        case CONNMAN_DEVICE_TYPE_HUAWEI:
        case CONNMAN_DEVICE_TYPE_NOVATEL:
-               return NULL;
+               break;
        case CONNMAN_DEVICE_TYPE_ETHERNET:
                service = __connman_service_lookup_from_device(device);
                break;
+       case CONNMAN_DEVICE_TYPE_WIFI:
+       case CONNMAN_DEVICE_TYPE_WIMAX:
+               network = __connman_element_get_network(element);
+               if (network == NULL)
+                       return NULL;
+               service = __connman_service_lookup_from_network(network);
+               break;
        }
 
        return service;
@@ -324,7 +342,7 @@ const char *__connman_element_get_device_path(struct connman_element *element)
        if (device == NULL)
                return NULL;
 
-       return element->path;
+       return connman_device_get_path(device);
 }
 
 const char *__connman_element_get_network_path(struct connman_element *element)
@@ -1047,6 +1065,16 @@ static void emit_state_change(DBusConnection *conn, const char *state)
        append_state(&entry, state);
 
        g_dbus_send_message(conn, signal);
+
+       signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
+                               CONNMAN_MANAGER_INTERFACE, "StateChanged");
+       if (signal == NULL)
+               return;
+
+       dbus_message_iter_init_append(signal, &entry);
+       dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &state);
+
+       g_dbus_send_message(conn, signal);
 }
 
 static void probe_element(struct connman_element *element)
@@ -1088,13 +1116,19 @@ static void register_element(gpointer data, gpointer user_data)
                element->parent = element_root->data;
 
                node = element_root;
-               basepath = "";
+               basepath = "/device";
        }
 
        element->path = g_strdup_printf("%s/%s", basepath, element->name);
 
        __connman_element_unlock(element);
 
+       if (node == NULL) {
+               connman_error("Element registration for %s failed",
+                                                       element->path);
+               return;
+       }
+
        DBG("element %p path %s", element, element->path);
 
        g_node_append_data(node, element);
@@ -1294,6 +1328,8 @@ int connman_element_set_enabled(struct connman_element *element,
 void connman_element_set_error(struct connman_element *element,
                                        enum connman_element_error error)
 {
+       struct connman_service *service;
+
        DBG("element %p error %d", element, error);
 
        if (element->type == CONNMAN_ELEMENT_TYPE_ROOT)
@@ -1304,6 +1340,10 @@ void connman_element_set_error(struct connman_element *element,
 
        if (element->driver && element->driver->change)
                element->driver->change(element);
+
+       service = __connman_element_get_service(element);
+       __connman_service_indicate_state(service,
+                                       CONNMAN_SERVICE_STATE_FAILURE);
 }
 
 int __connman_element_init(DBusConnection *conn, const char *device,
@@ -1365,12 +1405,14 @@ void __connman_element_start(void)
        __connman_connection_init();
        __connman_ipv4_init();
        __connman_detect_init();
+       __connman_rfkill_init();
 }
 
 void __connman_element_stop(void)
 {
        DBG("");
 
+       __connman_rfkill_cleanup();
        __connman_detect_cleanup();
        __connman_ipv4_cleanup();
        __connman_connection_cleanup();