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

wifi: clean up removal of current AP if it fails during association (bgo #733105)

Browse Source 
Now that NM follows the supplicant's scan list and CurrentBSS, any AP that isn't
known to the supplicant will be 'fake', and priv->current_ap always tracks
CurrentBSS.

We can then simplify link_timeout_cb() because any AP that would have been
force-removed before will now be marked "fake" if it's unknown to the supplicant,
and will always be removed by set_current_ap(), so we can remove the force
argument.  To better fix #733105 we never want to remove an AP known to
the supplicant, even if it we failed to connect to it.

https://bugzilla.gnome.org/show_bug.cgi?id=733105
This commit is contained in:
Dan Williams
2015-11-10 17:37:58 -06:00
parent ec4d653532
commit 46b46fd1ca
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/devices/wifi/nm-device-wifi.c
View File

@@ -334,7 +334,7 @@ update_seen_bssids_cache (NMDeviceWifi *self, NMAccessPoint *ap)
} }
static void static void
set_current_ap (NMDeviceWifi *self, NMAccessPoint *new_ap, gboolean recheck_available_connections, gboolean force_remove_old_ap) set_current_ap (NMDeviceWifi *self, NMAccessPoint *new_ap, gboolean recheck_available_connections)
{ {
NMDeviceWifiPrivate *priv; NMDeviceWifiPrivate *priv;
NMAccessPoint *old_ap; NMAccessPoint *old_ap;
@@ -358,7 +358,8 @@ set_current_ap (NMDeviceWifi *self, NMAccessPoint *new_ap, gboolean recheck_avai
if (old_ap) { if (old_ap) {
NM80211Mode mode = nm_ap_get_mode (old_ap); NM80211Mode mode = nm_ap_get_mode (old_ap);
if (force_remove_old_ap || mode == NM_802_11_MODE_ADHOC || mode == NM_802_11_MODE_AP || nm_ap_get_fake (old_ap)) /* Remove any AP from the internal list if it was created by NM or isn't known to the supplicant */
if (mode == NM_802_11_MODE_ADHOC || mode == NM_802_11_MODE_AP || nm_ap_get_fake (old_ap))
ap_add_remove (self, ACCESS_POINT_REMOVED, old_ap, recheck_available_connections); ap_add_remove (self, ACCESS_POINT_REMOVED, old_ap, recheck_available_connections);
g_object_unref (old_ap); g_object_unref (old_ap);
} }
@@ -477,7 +478,7 @@ remove_all_aps (NMDeviceWifi *self)
if (!g_hash_table_size (priv->aps)) if (!g_hash_table_size (priv->aps))
return; return;
set_current_ap (self, NULL, FALSE, FALSE); set_current_ap (self, NULL, FALSE);
again: again:
g_hash_table_iter_init (&iter, priv->aps); g_hash_table_iter_init (&iter, priv->aps);
@@ -506,12 +507,7 @@ deactivate (NMDevice *device)
priv->rate = 0; priv->rate = 0;
/* If the AP is 'fake', i.e. it wasn't actually found from set_current_ap (self, NULL, TRUE);
* a scan but the user tried to connect to it manually (maybe it
* was non-broadcasting or something) get rid of it, because 'fake'
* APs should only live for as long as we're connected to them.
**/
set_current_ap (self, NULL, TRUE, FALSE);
/* Clear any critical protocol notification in the Wi-Fi stack */ /* Clear any critical protocol notification in the Wi-Fi stack */
nm_platform_wifi_indicate_addressing_running (NM_PLATFORM_GET, ifindex, FALSE); nm_platform_wifi_indicate_addressing_running (NM_PLATFORM_GET, ifindex, FALSE);
@@ -1719,13 +1715,7 @@ link_timeout_cb (gpointer user_data)
if (nm_device_get_state (device) != NM_DEVICE_STATE_ACTIVATED) if (nm_device_get_state (device) != NM_DEVICE_STATE_ACTIVATED)
return FALSE; return FALSE;
/* If the access point failed, and wasn't found by the supplicant when it set_current_ap (self, NULL, TRUE);
* attempted to reconnect, then it's probably out of range or turned off.
* Remove it from the list and if it's actually still present, it'll be
* found in the next scan.
*/
if (priv->ssid_found == FALSE && priv->current_ap)
set_current_ap (self, NULL, TRUE, TRUE);
nm_device_state_changed (device, nm_device_state_changed (device,
NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_FAILED,
@@ -2073,7 +2063,7 @@ supplicant_iface_notify_current_bss (NMSupplicantInterface *iface,
new_bssid ? new_bssid : "(none)", new_bssid ? new_bssid : "(none)",
new_ssid ? nm_utils_escape_ssid (new_ssid->data, new_ssid->len) : "(none)"); new_ssid ? nm_utils_escape_ssid (new_ssid->data, new_ssid->len) : "(none)");
set_current_ap (self, new_ap, TRUE, FALSE); set_current_ap (self, new_ap, TRUE);
} }
} }
@@ -2353,13 +2343,13 @@ act_stage1_prepare (NMDevice *device, NMDeviceStateReason *reason)
g_object_freeze_notify (G_OBJECT (self)); g_object_freeze_notify (G_OBJECT (self));
ap_add_remove (self, ACCESS_POINT_ADDED, ap, TRUE); ap_add_remove (self, ACCESS_POINT_ADDED, ap, TRUE);
g_object_thaw_notify (G_OBJECT (self)); g_object_thaw_notify (G_OBJECT (self));
set_current_ap (self, ap, FALSE, FALSE); set_current_ap (self, ap, FALSE);
nm_active_connection_set_specific_object (NM_ACTIVE_CONNECTION (req), nm_active_connection_set_specific_object (NM_ACTIVE_CONNECTION (req),
nm_exported_object_get_path (NM_EXPORTED_OBJECT (ap))); nm_exported_object_get_path (NM_EXPORTED_OBJECT (ap)));
return NM_ACT_STAGE_RETURN_SUCCESS; return NM_ACT_STAGE_RETURN_SUCCESS;
done: done:
set_current_ap (self, ap, TRUE, FALSE); set_current_ap (self, ap, TRUE);
return NM_ACT_STAGE_RETURN_SUCCESS; return NM_ACT_STAGE_RETURN_SUCCESS;
} }