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

2008-02-04 Dan Williams <dcbw@redhat.com>

Browse source 
* src/supplicant-manager/nm-supplicant-manager.c
		- (poke_supplicant_cb): reschedule the poke as a timeout, don't let
			glib automatically reschedule
		- (nm_supplicant_manager_init): immediately try to start the supplicant
		- (nm_supplicant_manager_name_owner_changed): immediately try to restart
			the supplicant



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3285 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-02-04 15:24:18 +00:00
parent 595062c641
commit 06e44762a1
2 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2008-02-04 Dan Williams <dcbw@redhat.com>
* src/supplicant-manager/nm-supplicant-manager.c
- (poke_supplicant_cb): reschedule the poke as a timeout, don't let
glib automatically reschedule
- (nm_supplicant_manager_init): immediately try to start the supplicant
- (nm_supplicant_manager_name_owner_changed): immediately try to restart
the supplicant
2008-02-01 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerPolicy.c

35
src/supplicant-manager/nm-supplicant-manager.c
View file

@ -29,7 +29,7 @@
#include "nm-marshal.h"
#include "nm-utils.h"
#define SUPPLICANT_POKE_INTERVAL 6000
#define SUPPLICANT_POKE_INTERVAL 120000
typedef struct {
NMDBusManager * dbus_mgr;
@ -97,14 +97,20 @@ poke_supplicant_cb (gpointer user_data)
WPAS_DBUS_INTERFACE);
if (!proxy) {
nm_warning ("Error: could not init wpa_supplicant proxy");
return TRUE;
goto out;
}
nm_info ("Trying to start the supplicant...");
dbus_g_proxy_call_no_reply (proxy, "getInterface", G_TYPE_STRING, tmp, G_TYPE_INVALID);
g_object_unref (proxy);
return TRUE;
out:
/* Reschedule the poke */
priv->poke_id = g_timeout_add (SUPPLICANT_POKE_INTERVAL,
poke_supplicant_cb,
(gpointer) self);
return FALSE;
}
static void
@ -126,12 +132,8 @@ nm_supplicant_manager_init (NMSupplicantManager * self)
self);
if (!running) {
/* Poke the supplicant so that it gets activated by dbus system bus
* activation.
*/
priv->poke_id = g_timeout_add (SUPPLICANT_POKE_INTERVAL,
poke_supplicant_cb,
(gpointer) self);
/* Try to activate the supplicant */
priv->poke_id = g_idle_add (poke_supplicant_cb, (gpointer) self);
}
}
@ -209,14 +211,13 @@ nm_supplicant_manager_name_owner_changed (NMDBusManager *dbus_mgr,
} else if (old_owner_good && !new_owner_good) {
nm_supplicant_manager_set_state (self, NM_SUPPLICANT_MANAGER_STATE_DOWN);
if (!priv->poke_id) {
/* Poke the supplicant so that it gets activated by dbus system bus
* activation.
*/
priv->poke_id = g_timeout_add (SUPPLICANT_POKE_INTERVAL,
poke_supplicant_cb,
(gpointer) self);
}
if (priv->poke_id)
g_source_remove (priv->poke_id);
/* Poke the supplicant so that it gets activated by dbus system bus
* activation.
*/
priv->poke_id = g_idle_add (poke_supplicant_cb, (gpointer) self);
}
}