colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2007-09-20 Dan Williams <dcbw@redhat.com>

Browse Source 
* src/NetworkManagerPolicy.c
		- (nm_policy_device_change_check): re-enable the wireless device change
			checking code; insted of checking for SSIDs, check for the same
			connection instead



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2839 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2007-09-21 03:15:47 +00:00
parent a8b3aa46da
commit b6dfbeb71a
2 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2007-09-20 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerPolicy.c
- (nm_policy_device_change_check): re-enable the wireless device change
checking code; insted of checking for SSIDs, check for the same
connection instead
2007-09-20 Dan Williams <dcbw@redhat.com> 2007-09-20 Dan Williams <dcbw@redhat.com>
* src/nm-device-802-11-wireless.c * src/nm-device-802-11-wireless.c

44
src/NetworkManagerPolicy.c
View File

@@ -280,46 +280,33 @@ nm_policy_device_change_check (gpointer user_data)
do_switch = TRUE; do_switch = TRUE;
} }
} else if (NM_IS_DEVICE_802_11_WIRELESS (old_dev)) { } else if (NM_IS_DEVICE_802_11_WIRELESS (old_dev)) {
#if 0
/* Only switch if the old device's wireless config is invalid */ /* Only switch if the old device's wireless config is invalid */
if (NM_IS_DEVICE_802_11_WIRELESS (new_dev)) { if (NM_IS_DEVICE_802_11_WIRELESS (new_dev)) {
NMConnection *old_connection = nm_act_request_get_connection (old_act_req);
NMAccessPoint *old_ap = nm_device_802_11_wireless_get_activation_ap (NM_DEVICE_802_11_WIRELESS (old_dev)); NMAccessPoint *old_ap = nm_device_802_11_wireless_get_activation_ap (NM_DEVICE_802_11_WIRELESS (old_dev));
const GByteArray * old_ssid = nm_ap_get_ssid (old_ap); int old_mode = nm_ap_get_mode (old_ap);
int old_mode = nm_ap_get_mode (old_ap); gboolean same_request = FALSE;
const GByteArray * new_ssid = nm_ap_get_ssid (ap);
gboolean same_request = FALSE;
/* Schedule new activation if the currently associated /* Don't try to re-activate the same connection if it's not
* access point is not the "best" one or we've lost the * failed yet.
* link to the old access point. We don't switch away
* from Ad-Hoc APs either.
*/ */
gboolean same_ssid = nm_utils_same_ssid (old_ssid, new_ssid, TRUE); if ( (old_dev == new_dev)
&& nm_device_is_activating (new_dev)
/* If the "best" AP's SSID is the same as the current activation && (old_connection == connection))
* request's SSID, 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_ssid)
same_request = TRUE; same_request = TRUE;
if (!same_request && (!same_ssid || !old_has_link) && (old_mode != IW_MODE_ADHOC)) { if (!same_request && !old_has_link && (old_mode != IW_MODE_ADHOC)) {
char * new_esc_ssid; NMSettingConnection * new_sc = (NMSettingConnection *) nm_connection_get_setting (connection, NM_SETTING_CONNECTION);
char * old_esc_ssid; NMSettingConnection * old_sc = (NMSettingConnection *) nm_connection_get_setting (old_connection, NM_SETTING_CONNECTION);
new_esc_ssid = g_strdup (new_ssid ? nm_utils_escape_ssid (new_ssid->data, new_ssid->len) : "(none)");
old_esc_ssid = g_strdup (old_ssid ? nm_utils_escape_ssid (old_ssid->data, old_ssid->len) : "(none)");
nm_info ("SWITCH: found better connection '%s/%s'" nm_info ("SWITCH: found better connection '%s/%s'"
" than current connection '%s/%s'. " " than current connection '%s/%s'. "
"same_ssid=%d, have_link=%d", "have_link=%d",
nm_device_get_iface (new_dev), nm_device_get_iface (new_dev),
new_esc_ssid, new_sc->name,
nm_device_get_iface (old_dev), nm_device_get_iface (old_dev),
old_esc_ssid, old_sc->name,
same_ssid, old_has_link); old_has_link);
g_free (new_esc_ssid);
g_free (old_esc_ssid);
do_switch = TRUE; do_switch = TRUE;
} }
} else if (NM_IS_DEVICE_802_3_ETHERNET (new_dev)) { } else if (NM_IS_DEVICE_802_3_ETHERNET (new_dev)) {
@@ -327,7 +314,6 @@ nm_policy_device_change_check (gpointer user_data)
if (!old_user_requested) if (!old_user_requested)
do_switch = TRUE; do_switch = TRUE;
} }
#endif
} }
} }