Add debug information for missing parent element

[connman] / src / element.c

diff --git a/src/element.c b/src/element.c
index ecdf4bf..ec27d69 100644 (file)
--- a/src/element.c
+++ b/src/element.c
@@ -286,7 +286,7 @@ static struct connman_network *__connman_element_get_network(struct connman_elem
 
 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;
@@ -306,7 +306,7 @@ struct connman_service *__connman_element_get_service(struct connman_element *el
        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;
@@ -1065,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)
@@ -1106,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);
@@ -1312,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)
@@ -1322,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,