This email list is read-only. Emails sent to this list will be discarded
----------------------------------
include/element.h | 1 +
plugins/dhclient.c | 34 +++++-----------
plugins/ethernet.c | 40 +------------------
plugins/resolvconf.c | 2 +-
src/element.c | 110 +++++++++++++++++++++++++++++++++-----------------
5 files changed, 86 insertions(+), 101 deletions(-)
New commits:
commit 8dacf3b5cde294708c06e16a8c03b34834448e48
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Sun Aug 10 12:24:19 2008 +0200
Abort driver matching if probe succeeds
commit 57a065f9bd8db08f2fd4b3b40fbe26198f1358c1
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Sun Aug 10 12:14:10 2008 +0200
Fix wrong order of resolvconf arguments
commit d32b5d20f932ab5853d400ea800b2eeaffb37556
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Sun Aug 10 12:05:30 2008 +0200
Update of an element will also trigger update of its children
commit d3073cdb94002354fe6e37e39557402ddfb30561
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Sun Aug 10 11:58:32 2008 +0200
Let the core handle the children unregister task
commit 746e33bd6337b3abb7e2823f3b6afc83bf29b549
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Sun Aug 10 11:56:25 2008 +0200
Add function to unregister all children of an element
commit c3cdbfae11de2fbc126528955d4330794c590424
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Sun Aug 10 11:39:57 2008 +0200
The core takes care of the lifetime for child elements
commit a9655c2f60b39c69c2a9c8d38fbfc57084b930aa
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Sun Aug 10 11:25:53 2008 +0200
Don't allow elements without any name
commit 66f359d8eec2c9adde2f3083c791eee101170d2d
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Sun Aug 10 11:23:35 2008 +0200
Use type2string function if element name is not provided
commit 004cbb420e7a2b44cb2fde3b9e37f9dc3e60067e
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Sun Aug 10 11:21:45 2008 +0200
Add PropertyChanged signal declaration
Diff in this email is a maximum of 400 lines.
diff --git a/include/element.h b/include/element.h
index fb4f70f..c0702ac 100644
--- a/include/element.h
+++ b/include/element.h
@@ -119,6 +119,7 @@ extern int connman_element_get_value(struct connman_element
*element,
extern int connman_element_register(struct connman_element *element,
struct connman_element *parent);
extern void connman_element_unregister(struct connman_element *element);
+extern void connman_element_unregister_children(struct connman_element
*element);
extern void connman_element_update(struct connman_element *element);
static inline void *connman_element_get_data(struct connman_element *element)
diff --git a/plugins/dhclient.c b/plugins/dhclient.c
index 6bffa8f..ee8a3a5 100644
--- a/plugins/dhclient.c
+++ b/plugins/dhclient.c
@@ -41,7 +41,6 @@ struct dhclient_task {
int ifindex;
gchar *ifname;
struct connman_element *element;
- struct connman_element *child;
};
static GStaticMutex task_mutex = G_STATIC_MUTEX_INIT;
@@ -144,7 +143,6 @@ static int dhclient_probe(struct connman_element *element)
task->ifindex = element->netdev.index;
task->ifname = g_strdup(element->netdev.name);
task->element = element;
- task->child = NULL;
if (task->ifname == NULL) {
g_free(task);
@@ -204,7 +202,11 @@ static void dhclient_remove(struct connman_element
*element)
DBG("element %p name %s", element, element->name);
g_static_mutex_lock(&task_mutex);
+
task = find_task_by_index(element->netdev.index);
+ if (task != NULL)
+ task_list = g_slist_remove(task_list, task);
+
g_static_mutex_unlock(&task_mutex);
if (task == NULL)
@@ -212,16 +214,6 @@ static void dhclient_remove(struct connman_element
*element)
DBG("release %s", task->ifname);
- g_static_mutex_lock(&task_mutex);
- task_list = g_slist_remove(task_list, task);
- g_static_mutex_unlock(&task_mutex);
-
- if (task->child != NULL) {
- connman_element_unregister(task->child);
- connman_element_unref(task->child);
- task->child = NULL;
- }
-
kill_task(task);
}
@@ -308,16 +300,16 @@ static DBusHandlerResult dhclient_filter(DBusConnection
*conn,
if (g_ascii_strcasecmp(text, "PREINIT") == 0) {
} else if (g_ascii_strcasecmp(text, "BOUND") == 0 ||
g_ascii_strcasecmp(text, "REBOOT") == 0) {
- task->child = connman_element_create();
- task->child->type = CONNMAN_ELEMENT_TYPE_IPV4;
- task->child->netdev.index = task->ifindex;
- task->child->netdev.name = g_strdup(task->ifname);
+ struct connman_element *element;
+ element = connman_element_create();
+ element->type = CONNMAN_ELEMENT_TYPE_IPV4;
+ element->netdev.index = task->ifindex;
+ element->netdev.name = g_strdup(task->ifname);
connman_element_update(task->element);
- connman_element_register(task->child, task->element);
+ connman_element_register(element, task->element);
} else if (g_ascii_strcasecmp(text, "RENEW") == 0 ||
g_ascii_strcasecmp(text, "REBIND") == 0) {
connman_element_update(task->element);
- connman_element_update(task->child);
} else {
}
@@ -363,12 +355,6 @@ static void dhclient_exit(void)
for (list = task_list; list; list = list->next) {
struct dhclient_task *task = list->data;
- if (task->child) {
- connman_element_unregister(task->child);
- connman_element_unref(task->child);
- task->child = NULL;
- }
-
DBG("killing process %d", task->pid);
kill_task(task);
diff --git a/plugins/ethernet.c b/plugins/ethernet.c
index b908940..0f248bc 100644
--- a/plugins/ethernet.c
+++ b/plugins/ethernet.c
@@ -38,9 +38,6 @@
static GStaticMutex ethernet_mutex = G_STATIC_MUTEX_INIT;
static GSList *ethernet_list = NULL;
-static GStaticMutex element_mutex = G_STATIC_MUTEX_INIT;
-static GSList *element_list = NULL;
-
static void create_element(struct connman_element *parent,
enum connman_element_type type)
{
@@ -54,42 +51,9 @@ static void create_element(struct connman_element *parent,
element->netdev.index = parent->netdev.index;
element->netdev.name = g_strdup(parent->netdev.name);
- g_static_mutex_lock(&element_mutex);
- element_list = g_slist_append(element_list, element);
- g_static_mutex_unlock(&element_mutex);
-
connman_element_register(element, parent);
}
-static void remove_elements(struct connman_element *parent)
-{
- GSList *list = element_list;
-
- DBG("parent %p name %s", parent, parent->name);
-
- g_static_mutex_lock(&element_mutex);
-
- while (list) {
- GSList *next = list->next;
- struct connman_element *element = list->data;
-
- if (element->netdev.index != parent->netdev.index) {
- list = next;
- continue;
- }
-
- element_list = g_slist_delete_link(element_list, list);
-
- connman_element_unregister(element);
-
- connman_element_unref(element);
-
- list = next;
- }
-
- g_static_mutex_unlock(&element_mutex);
-}
-
static void rtnl_link(struct nlmsghdr *hdr, const char *type)
{
GSList *list;
@@ -127,7 +91,7 @@ static void rtnl_link(struct nlmsghdr *hdr, const char *type)
} else {
DBG("carrier off");
- remove_elements(element);
+ connman_element_unregister_children(element);
}
}
@@ -327,8 +291,6 @@ static void ethernet_remove(struct connman_element *element)
iface_down(element);
- remove_elements(element);
-
g_static_mutex_lock(ðernet_mutex);
ethernet_list = g_slist_remove(ethernet_list, element);
g_static_mutex_unlock(ðernet_mutex);
diff --git a/plugins/resolvconf.c b/plugins/resolvconf.c
index e512f2b..779c68f 100644
--- a/plugins/resolvconf.c
+++ b/plugins/resolvconf.c
@@ -51,7 +51,7 @@ static int resolvconf_probe(struct connman_element *element)
return -EINVAL;
cmd = g_strdup_printf("echo \"nameserver %s\" | %s -a %s",
- RESOLVCONF, nameserver,
+ nameserver, RESOLVCONF,
element->netdev.name);
DBG("%s", cmd);
diff --git a/src/element.c b/src/element.c
index 365b42b..d954b63 100644
--- a/src/element.c
+++ b/src/element.c
@@ -39,6 +39,7 @@ static GSList *driver_list = NULL;
static GThreadPool *thread_register = NULL;
static GThreadPool *thread_unregister = NULL;
+static GThreadPool *thread_unregister_children = NULL;
static gchar *device_filter = NULL;
@@ -276,6 +277,11 @@ static GDBusMethodTable element_methods[] = {
{ },
};
+static GDBusSignalTable element_signals[] = {
+ { "PropertyChanged", "sv" },
+ { },
+};
+
struct append_filter {
enum connman_element_type type;
DBusMessageIter *iter;
@@ -619,31 +625,9 @@ int connman_element_register(struct connman_element
*element,
__connman_element_load(element);
if (element->name == NULL) {
- switch (element->type) {
- case CONNMAN_ELEMENT_TYPE_IPV4:
- element->name = g_strdup("ipv4");
- break;
- case CONNMAN_ELEMENT_TYPE_IPV6:
- element->name = g_strdup("ipv6");
- break;
- case CONNMAN_ELEMENT_TYPE_DHCP:
- element->name = g_strdup("dhcp");
- break;
- case CONNMAN_ELEMENT_TYPE_BOOTP:
- element->name = g_strdup("bootp");
- break;
- case CONNMAN_ELEMENT_TYPE_ZEROCONF:
- element->name = g_strdup("zeroconf");
- break;
- case CONNMAN_ELEMENT_TYPE_RESOLVER:
- element->name = g_strdup("resolver");
- break;
- case CONNMAN_ELEMENT_TYPE_INTERNET:
- element->name = g_strdup("internet");
- break;
- default:
- break;
- }
+ element->name = g_strdup(type2string(element->type));
+ if (element->name == NULL)
+ return -EINVAL;
}
element->parent = parent;
@@ -664,21 +648,46 @@ void connman_element_unregister(struct connman_element
*element)
g_thread_pool_push(thread_unregister, element, NULL);
}
-void connman_element_update(struct connman_element *element)
+void connman_element_unregister_children(struct connman_element *element)
{
DBG("element %p name %s", element, element->name);
- g_static_rw_lock_reader_lock(&element_lock);
+ if (thread_unregister_children != NULL)
+ g_thread_pool_push(thread_unregister_children, element, NULL);
+}
+
+static gboolean update_element(GNode *node, gpointer user_data)
+{
+ struct connman_element *element = node->data;
+
+ DBG("element %p name %s", element, element->name);
if (element->driver && element->driver->update)
element->driver->update(element);
- g_static_rw_lock_reader_unlock(&element_lock);
-
g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
CONNMAN_MANAGER_INTERFACE, "ElementUpdated",
DBUS_TYPE_OBJECT_PATH, &element->path,
DBUS_TYPE_INVALID);
+
+ return FALSE;
+}
+
+void connman_element_update(struct connman_element *element)
+{
+ GNode *node;
+
+ DBG("element %p name %s", element, element->name);
+
+ g_static_rw_lock_reader_lock(&element_lock);
+
+ node = g_node_find(element_root, G_PRE_ORDER, G_TRAVERSE_ALL, element);
+
+ if (node != NULL)
+ g_node_traverse(node, G_PRE_ORDER,
+ G_TRAVERSE_ALL, -1, update_element, NULL);
+
+ g_static_rw_lock_reader_unlock(&element_lock);
}
static void register_element(gpointer data, gpointer user_data)
@@ -714,8 +723,8 @@ static void register_element(gpointer data, gpointer
user_data)
if (g_dbus_register_interface(connection, element->path,
CONNMAN_ELEMENT_INTERFACE,
- element_methods, NULL, NULL,
- element, NULL) == FALSE)
+ element_methods, element_signals,
+ NULL, element, NULL) == FALSE)
connman_error("Failed to register %s", element->path);
g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
@@ -737,12 +746,12 @@ static void register_element(gpointer data, gpointer
user_data)
DBG("driver %p name %s", driver, driver->name);
- if (driver->probe(element) < 0)
- continue;
-
- connman_element_lock(element);
- element->driver = driver;
- connman_element_unlock(element);
+ if (driver->probe(element) == 0) {
+ connman_element_lock(element);
+ element->driver = driver;
+ connman_element_unlock(element);
+ break;
+ }
}
g_static_rw_lock_writer_unlock(&element_lock);
@@ -751,9 +760,13 @@ static void register_element(gpointer data, gpointer
user_data)
static gboolean remove_element(GNode *node, gpointer user_data)
{
struct connman_element *element = node->data;
+ struct connman_element *root = user_data;
DBG("element %p name %s", element, element->name);
+ if (element == root)
+ return FALSE;
+
if (element->driver) {
if (element->driver->remove)
element->driver->remove(element);
@@ -799,6 +812,24 @@ static void unregister_element(gpointer data, gpointer
user_data)
g_static_rw_lock_writer_unlock(&element_lock);
}
+static void unregister_children(gpointer data, gpointer user_data)
+{
+ struct connman_element *element = data;
+ GNode *node;
+
+ DBG("element %p name %s", element, element->name);
+
+ g_static_rw_lock_writer_lock(&element_lock);
+
+ node = g_node_find(element_root, G_PRE_ORDER, G_TRAVERSE_ALL, element);
+
+ if (node != NULL)
+ g_node_traverse(node, G_POST_ORDER,
+ G_TRAVERSE_ALL, -1, remove_element, element);
+
+ g_static_rw_lock_writer_unlock(&element_lock);
+}
+
int __connman_element_init(DBusConnection *conn, const char *device)
{
struct connman_element *element;
@@ -827,6 +858,8 @@ int __connman_element_init(DBusConnection *conn, const char
*device)
NULL, 1, FALSE, NULL);
thread_unregister = g_thread_pool_new(unregister_element,
NULL, 1, FALSE, NULL);
+ thread_unregister_children = g_thread_pool_new(unregister_children,
+ NULL, 1, FALSE, NULL);
return 0;
}
@@ -881,6 +914,9 @@ void __connman_element_cleanup(void)
g_thread_pool_free(thread_unregister, FALSE, TRUE);
thread_unregister = NULL;
+ g_thread_pool_free(thread_unregister_children, FALSE, TRUE);
+ thread_unregister_children = NULL;
+
g_static_rw_lock_writer_lock(&element_lock);
g_node_destroy(element_root);
element_root = NULL;
_______________________________________________
Commits mailing list
[email protected]
https://www.moblin.org/mailman/listinfo/commits
