Unregister element's children by type

Add a new element API to be able to unregister an element's children
of a certain type.

diff --git a/include/element.h b/include/element.h
index f97e2e42e61dc188578ab4c32692b0f4c6876092..eab567e8fec3f504dbcb6419c459a6f2806b0adf 100644 (file)
--- a/include/element.h
+++ b/include/element.h
@@ -139,6 +139,8 @@ int connman_element_register(struct connman_element *element,
                                        struct connman_element *parent);
 void connman_element_unregister(struct connman_element *element);
 void connman_element_unregister_children(struct connman_element *element);
+void connman_element_unregister_children_type(struct connman_element *element,
+                                               enum connman_element_type type);
 void connman_element_update(struct connman_element *element);
 
 int connman_element_set_enabled(struct connman_element *element,

diff --git a/src/element.c b/src/element.c
index faaa9f841a2fbe687d5112a205519c323353f28e..13aede87fc1b525cfd4ed312c8fc542ee8aa034b 100644 (file)
--- a/src/element.c
+++ b/src/element.c
@@ -1120,6 +1120,45 @@ static gboolean remove_element(GNode *node, gpointer user_data)
        return FALSE;
 }
 
+struct unregister_type {
+       struct connman_element *root;
+       enum connman_element_type type;
+};
+
+static gboolean remove_element_type(GNode *node, gpointer user_data)
+{
+       struct unregister_type *children_type = user_data;
+       struct connman_element *root = children_type->root;
+       struct connman_element *element = node->data;
+       enum connman_element_type type = children_type->type;
+
+       DBG("element %p name %s", element, element->name);
+
+       if (element == root)
+               return FALSE;
+
+       if(element->type != type)
+               return FALSE;
+
+       if (node != NULL)
+               g_node_unlink(node);
+
+       if (element->driver) {
+               if (element->driver->remove)
+                       element->driver->remove(element);
+
+               element->driver = NULL;
+       }
+
+       if (node != NULL)
+               g_node_destroy(node);
+
+       connman_element_unref(element);
+
+       return FALSE;
+}
+
+
 void connman_element_unregister(struct connman_element *element)
 {
        GNode *node;
@@ -1146,6 +1185,25 @@ void connman_element_unregister_children(struct connman_element *element)
                                G_TRAVERSE_ALL, -1, remove_element, element);
 }
 
+void connman_element_unregister_children_type(struct connman_element *element, enum connman_element_type type)
+{
+       GNode *node;
+
+       DBG("element %p name %s", element, element->name);
+
+       node = g_node_find(element_root, G_PRE_ORDER, G_TRAVERSE_ALL, element);
+
+       if (node != NULL) {
+               struct unregister_type children_type;
+
+               children_type.root = element;
+               children_type.type = type;
+               g_node_traverse(node, G_POST_ORDER,
+                               G_TRAVERSE_ALL, -1, remove_element_type, &children_type);
+       }
+}
+
+
 static gboolean update_element(GNode *node, gpointer user_data)
 {
        struct connman_element *element = node->data;