fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 03:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2006-02-24 Robert Love <rml@novell.com>

Browse source 
Patch from Timo Hoenig <thoenig@suse.de>:
	* src/NetworkManagerDbus.c: Survive DBUS restarts like a champ.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1490 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love 2006-02-24 18:59:03 +00:00 • committed by Robert Love
parent 8663d0c609
commit 63cd1b345d
2 changed files with 41 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2006-02-24 Robert Love <rml@novell.com>
Patch from Timo Hoenig <thoenig@suse.de>:
* src/NetworkManagerDbus.c: Survive DBUS restarts like a champ.
2006-02-24 Robert Love <rml@novell.com>
Patch from Dan Winship <danw@novell.com>:

39
src/NetworkManagerDbus.c
View file

@ -46,6 +46,8 @@
static char *get_nmi_match_string (const char *owner);
static gpointer nm_dbus_reinit (gpointer user_data);
/*
* nm_dbus_create_error_message
*
@ -494,10 +496,13 @@ static DBusHandlerResult nm_dbus_signal_filter (DBusConnection *connection, DBus
handled = TRUE;
}
}
else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "Disconnected"))
else if (dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL, "Disconnected"))
{
/* FIXME: try to recover from disconnection */
nm_hal_deinit (data);
dbus_connection_unref (data->dbus_connection);
data->dbus_connection = NULL;
nm_dhcp_manager_dispose (data->dhcp_manager);
g_thread_create ((GThreadFunc) nm_dbus_reinit, (gpointer) data, FALSE, NULL);
handled = TRUE;
}
else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
@ -734,6 +739,34 @@ static char *get_nmi_match_string (const char *owner)
return g_strdup_printf ("type='signal',interface='" NMI_DBUS_INTERFACE "',sender='%s',path='" NMI_DBUS_PATH "'", owner);
}
/*
* nm_dbus_reinit
*
* Reconnect to the system message bus if the connection was dropped.
*
*/
static gpointer nm_dbus_reinit (gpointer user_data)
{
NMData *data = (NMData *) user_data;
char *owner;
g_return_val_if_fail (data != NULL, NULL);
while ((data->dbus_connection = nm_dbus_init (data)) == NULL)
g_usleep (G_USEC_PER_SEC * 3);
/* if HAL was quick it is already back on the bus. Thus, we do not receive NameOwnerChanged */
if ((owner = get_name_owner (data->dbus_connection, "org.freedesktop.Hal")))
nm_hal_init (data);
data->dhcp_manager = nm_dhcp_manager_new (data);
nm_info ("Successfully reconnected to the system bus.");
return NULL;
}
/*
* nm_dbus_init
@ -762,7 +795,7 @@ DBusConnection *nm_dbus_init (NMData *data)
goto out;
}
//dbus_connection_set_exit_on_disconnect (connection, FALSE);
dbus_connection_set_exit_on_disconnect (connection, FALSE);
dbus_connection_setup_with_g_main (connection, data->main_context);
data->nm_methods = nm_dbus_nm_methods_setup ();