int __connman_element_init(DBusConnection *conn, const char *device);
void __connman_element_cleanup(void);
-void __connman_element_list(enum connman_element_type type,
- DBusMessageIter *iter);
-int __connman_element_count(enum connman_element_type type);
+void __connman_element_list(struct connman_element *element,
+ enum connman_element_type type,
+ DBusMessageIter *iter);
+int __connman_element_count(struct connman_element *element,
+ enum connman_element_type type);
const char *__connman_element_type2string(enum connman_element_type type);
const char *__connman_element_subtype2string(enum connman_element_subtype type);
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
-static void append_networks(DBusMessageIter *dict)
+static void append_networks(struct connman_element *element,
+ DBusMessageIter *dict)
{
DBusMessageIter entry, value, iter;
const char *key = "Networks";
dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
- __connman_element_list(CONNMAN_ELEMENT_TYPE_NETWORK, &iter);
+ __connman_element_list(element, CONNMAN_ELEMENT_TYPE_NETWORK, &iter);
dbus_message_iter_close_container(&value, &iter);
connman_dbus_dict_append_variant(&dict, "Powered",
DBUS_TYPE_BOOLEAN, &element->enabled);
- append_networks(&dict);
+ append_networks(element, &dict);
add_common_properties(element, &dict);
return FALSE;
}
-void __connman_element_list(enum connman_element_type type,
- DBusMessageIter *iter)
+void __connman_element_list(struct connman_element *element,
+ enum connman_element_type type,
+ DBusMessageIter *iter)
{
struct append_filter filter = { type, iter };
+ GNode *node;
DBG("");
+ if (element != NULL) {
+ node = g_node_find(element_root, G_PRE_ORDER,
+ G_TRAVERSE_ALL, element);
+ if (node == NULL)
+ return;
+ } else
+ node = element_root;
+
g_static_rw_lock_reader_lock(&element_lock);
- g_node_traverse(element_root, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
- append_path, &filter);
+ g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
+ append_path, &filter);
g_static_rw_lock_reader_unlock(&element_lock);
}
return FALSE;
}
-int __connman_element_count(enum connman_element_type type)
+int __connman_element_count(struct connman_element *element,
+ enum connman_element_type type)
{
struct count_data data = { type, 0 };
+ GNode *node;
DBG("");
+ if (element != NULL) {
+ node = g_node_find(element_root, G_PRE_ORDER,
+ G_TRAVERSE_ALL, element);
+ if (node == NULL)
+ return 0;
+ } else
+ node = element_root;
+
g_static_rw_lock_reader_lock(&element_lock);
- g_node_traverse(element_root, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
- count_element, &data);
+ g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
+ count_element, &data);
g_static_rw_lock_reader_unlock(&element_lock);
return data.count;
dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
- __connman_element_list(CONNMAN_ELEMENT_TYPE_DEVICE, &iter);
+ __connman_element_list(NULL, CONNMAN_ELEMENT_TYPE_DEVICE, &iter);
dbus_message_iter_close_container(&value, &iter);
dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
- __connman_element_list(CONNMAN_ELEMENT_TYPE_CONNECTION, &iter);
+ __connman_element_list(NULL, CONNMAN_ELEMENT_TYPE_CONNECTION, &iter);
dbus_message_iter_close_container(&value, &iter);
dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
- __connman_element_list(CONNMAN_ELEMENT_TYPE_DEVICE, &iter);
+ __connman_element_list(NULL, CONNMAN_ELEMENT_TYPE_DEVICE, &iter);
dbus_message_iter_close_container(&value, &iter);
dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
- __connman_element_list(CONNMAN_ELEMENT_TYPE_CONNECTION, &iter);
+ __connman_element_list(NULL, CONNMAN_ELEMENT_TYPE_CONNECTION, &iter);
dbus_message_iter_close_container(&value, &iter);
append_devices(&dict);
append_connections(&dict);
- if (__connman_element_count(CONNMAN_ELEMENT_TYPE_CONNECTION) > 0)
+ if (__connman_element_count(NULL, CONNMAN_ELEMENT_TYPE_CONNECTION) > 0)
append_state(&dict, "online");
else
append_state(&dict, "offline");