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

wifi: clear WPAS_REMOVED_TAG when scanning Wi-Fi AP

Browse Source 
(cherry picked from commit 47c505523c72b6454dec4681c0edda535c3a2e91)

https://bugzilla.gnome.org/show_bug.cgi?id=733105
This commit is contained in:
Bernd Edlinger
2015-04-02 16:27:02 +02:00
committed by Thomas Haller
parent 0f71335d52
commit 1282b468bd
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1623,6 +1623,8 @@ supplicant_iface_scan_done_cb (NMSupplicantInterface *iface,
* *
*/ */
#define WPAS_REMOVED_TAG "supplicant-removed"
static void static void
try_fill_ssid_for_hidden_ap (NMAccessPoint *ap) try_fill_ssid_for_hidden_ap (NMAccessPoint *ap)
{ {
@@ -1730,6 +1732,7 @@ merge_scanned_ap (NMDeviceWifi *self,
* fake, since it clearly exists somewhere. * fake, since it clearly exists somewhere.
*/ */
nm_ap_set_fake (found_ap, FALSE); nm_ap_set_fake (found_ap, FALSE);
g_object_set_data (G_OBJECT (found_ap), WPAS_REMOVED_TAG, NULL);
} else { } else {
/* New entry in the list */ /* New entry in the list */
_LOGD (LOGD_WIFI_SCAN, "adding new AP '%s' %s (%p)", _LOGD (LOGD_WIFI_SCAN, "adding new AP '%s' %s (%p)",
@@ -1743,8 +1746,6 @@ merge_scanned_ap (NMDeviceWifi *self,
} }
} }
#define WPAS_REMOVED_TAG "supplicant-removed"
static gboolean static gboolean
cull_scan_list (NMDeviceWifi *self) cull_scan_list (NMDeviceWifi *self)
{ {
@@ -1899,9 +1900,23 @@ supplicant_iface_bss_removed_cb (NMSupplicantInterface *iface,
g_return_if_fail (object_path != NULL); g_return_if_fail (object_path != NULL);
ap = get_ap_by_supplicant_path (self, object_path); ap = get_ap_by_supplicant_path (self, object_path);
if (ap) if (ap) {
gint32 now = nm_utils_get_monotonic_timestamp_s ();
gint32 last_seen = nm_ap_get_last_seen (ap);
/* We don't know when the supplicant last saw the AP's beacons,
* it could be two minutes or it could be 2 seconds. Because the
* supplicant doesn't send property change notifications if the
* AP's other properties don't change, our last-seen time may be
* much older the supplicant's, and the AP would be immediately
* removed from the list on the next cleanup. So update the
* last-seen time to ensure the AP sticks around for at least
* one more periodic scan.
*/
nm_ap_set_last_seen (ap, MAX (last_seen, now - SCAN_INTERVAL_MAX));
g_object_set_data (G_OBJECT (ap), WPAS_REMOVED_TAG, GUINT_TO_POINTER (TRUE)); g_object_set_data (G_OBJECT (ap), WPAS_REMOVED_TAG, GUINT_TO_POINTER (TRUE));
} }
}
static void static void
remove_supplicant_timeouts (NMDeviceWifi *self) remove_supplicant_timeouts (NMDeviceWifi *self)