Add helper for already connected error messages

[connman] / src / element.c

diff --git a/src/element.c b/src/element.c
index b68e954..ecdf4bf 100644 (file)
--- a/src/element.c
+++ b/src/element.c
@@ -272,11 +272,61 @@ int __connman_element_count(struct connman_element *element,
        return data.count;
 }
 
-const char *__connman_element_get_device(struct connman_element *element)
+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_network *network;
+       struct connman_device *device;
+       enum connman_device_type type;
+
+       device = __connman_element_get_device(element);
+       if (device == NULL)
+               return NULL;
+
+       type = connman_device_get_type(device);
+
+       switch (type) {
+       case CONNMAN_DEVICE_TYPE_UNKNOWN:
+       case CONNMAN_DEVICE_TYPE_VENDOR:
+       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;
+       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;
+}
+
+struct connman_device *__connman_element_get_device(struct connman_element *element)
 {
        if (element->type == CONNMAN_ELEMENT_TYPE_DEVICE &&
                                                element->device != NULL)
-               return element->path;
+               return element->device;
 
        if (element->parent == NULL)
                return NULL;
@@ -284,7 +334,18 @@ const char *__connman_element_get_device(struct connman_element *element)
        return __connman_element_get_device(element->parent);
 }
 
-const char *__connman_element_get_network(struct connman_element *element)
+const char *__connman_element_get_device_path(struct connman_element *element)
+{
+       struct connman_device *device;
+
+       device = __connman_element_get_device(element);
+       if (device == NULL)
+               return NULL;
+
+       return connman_device_get_path(device);
+}
+
+const char *__connman_element_get_network_path(struct connman_element *element)
 {
        if (element->type == CONNMAN_ELEMENT_TYPE_NETWORK &&
                                                element->network != NULL)
@@ -293,7 +354,7 @@ const char *__connman_element_get_network(struct connman_element *element)
        if (element->parent == NULL)
                return NULL;
 
-       return __connman_element_get_network(element->parent);
+       return __connman_element_get_network_path(element->parent);
 }
 
 static gint compare_priority(gconstpointer a, gconstpointer b)
@@ -1284,6 +1345,7 @@ int __connman_element_init(DBusConnection *conn, const char *device,
        element_root = g_node_new(element);
 
        __connman_notifier_init();
+       __connman_service_init();
        __connman_network_init();
        __connman_device_init();
 
@@ -1368,6 +1430,7 @@ void __connman_element_cleanup(void)
 
        __connman_device_cleanup();
        __connman_network_cleanup();
+       __connman_service_cleanup();
        __connman_notifier_cleanup();
 
        g_node_traverse(element_root, G_POST_ORDER, G_TRAVERSE_ALL, -1,