system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-15 04:24:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

2006-05-28 Dan Williams <dcbw@redhat.com>

Browse source 
* src/NetworkManagerPolicy.c
		- (nm_policy_device_change_check): don't switch devices if the "best"
			AP is essentially the same as the current activation request, but
			the current activation request isn't done activating yet.  Fixes
			multiple requests for keyring password on startup for Gnome applet.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1775 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2006-05-28 20:08:11 +00:00
parent 6392fe3fdf
commit e18e59e356
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2006-05-28 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerPolicy.c
- (nm_policy_device_change_check): don't switch devices if the "best"
AP is essentially the same as the current activation request, but
the current activation request isn't done activating yet. Fixes
multiple requests for keyring password on startup for Gnome applet.
2006-05-26 Nicolas Trangez <eikke@eikke.com>
* src/NetworkManager.c: use GOptions instead of getopt

14
src/NetworkManagerPolicy.c
View file

@ -327,7 +327,7 @@ nm_policy_device_change_check (NMData *data)
* 1) old device is NULL, new device is NULL - we aren't currently connected to anything, and we
* can't find anything to connect to. Do nothing.
*
* 2) old device is NULL, new device is good - we aren't currenlty connected to anything, but
* 2) old device is NULL, new device is good - we aren't currently connected to anything, but
* we have something we can connect to. Connect to it.
*
* 3) old device is good, new device is NULL - have a current connection, but it's no good since
@ -384,6 +384,7 @@ nm_policy_device_change_check (NMData *data)
const char * old_essid = nm_ap_get_essid (old_ap);
int old_mode = nm_ap_get_mode (old_ap);
const char * new_essid = nm_ap_get_essid (ap);
gboolean same_request = FALSE;
/* Schedule new activation if the currently associated
* access point is not the "best" one or we've lost the
@ -391,7 +392,16 @@ nm_policy_device_change_check (NMData *data)
* from Ad-Hoc APs either.
*/
gboolean same_essid = (nm_null_safe_strcmp (old_essid, new_essid) == 0);
if ((!same_essid || !old_has_link) && (old_mode != IW_MODE_ADHOC))
/* If the "best" AP's essid is the same as the current activation
* request's essid, but the current activation request isn't
* done yet, don't switch. This prevents multiple requests for the
* AP's password on startup.
*/
if ((old_dev == new_dev) && nm_device_is_activating (new_dev) && same_essid)
same_request = TRUE;
if (!same_request && (!same_essid || !old_has_link) && (old_mode != IW_MODE_ADHOC))
{
nm_info ("SWITCH: found better connection '%s/%s'"
" than current connection '%s/%s'. "