Merge lp:~phablet-team/network-manager/lp1480877-wifi-rm-dup-scan-signals-vivid into lp:~phablet-team/network-manager/vivid-phone-overlay

[Tony Espy]

This change fixes a problem where duplicate (2-3x) AccessPoint 'LastSeen' PropertiesChanged signals are generated each time a WiFi scan completes. This can be seen by running:

dbus-monitor --system --profile "type='signal',sender='org.freedesktop.NetworkManager'"

...and waiting for a scan to occur. You'll see 2-3 PropsChanged for each AccessPoint after a scan. From then on, you'll only see changes for AccessPoint/0 until the next scan happens.

The change makes cull_scan_list the function responsible for updating an AP's last-seen property, and ensures that scan_done_cb is the only function that calls cull_scan_list. It also removes the bss_updated_cb function, as its only purpose was to update the last-seen property and schedule yet another scanlist cull.

[lp:~phablet-team/network-manager/lp1480877-wifi-rm-dup-scan-signals-vivid]

969. By Tony Espy on 2015-10-01

d/p/0002-wifi-cull-the-scan-list-before-signalling-ScanDone-b.patch:
Fix duplicate 'LastSeen' PropertiesChanged signals being emitted
after scanning (LP: #1480877).

[Mathieu Trudel-Lapierre (cyphermox)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-13 15:26:03 +0000
+++ debian/changelog	2015-10-01 20:47:33 +0000
@@ -1,3 +1,11 @@
+network-manager (0.9.10.0-4ubuntu15.1.8) UNRELEASED; urgency=medium
+
+  * d/p/0002-wifi-cull-the-scan-list-before-signalling-ScanDone-b.patch:
+    Fix duplicate 'LastSeen' PropertiesChanged signals being emitted
+    after scanning (LP: #1480877).
+
+ -- Tony Espy <[e-mail]>  Thu, 01 Oct 2015 16:30:19 -0400
+
 network-manager (0.9.10.0-4ubuntu15.1.7) vivid; urgency=medium
 
   * d/p/0002-wifi-cull-the-scan-list-before-signalling-ScanDone-b.patch:
 
=== modified file 'debian/patches/0002-wifi-cull-the-scan-list-before-signalling-ScanDone-b.patch'
--- debian/patches/0002-wifi-cull-the-scan-list-before-signalling-ScanDone-b.patch	2015-08-05 16:23:18 +0000
+++ debian/patches/0002-wifi-cull-the-scan-list-before-signalling-ScanDone-b.patch	2015-10-01 20:47:33 +0000
@@ -18,29 +18,66 @@
 ===================================================================
 --- network-manager-0.9.10.0.orig/src/devices/wifi/nm-device-wifi.c
 +++ network-manager-0.9.10.0/src/devices/wifi/nm-device-wifi.c
-@@ -183,6 +183,10 @@ static void supplicant_iface_notify_scan
+@@ -129,7 +129,6 @@ struct _NMDeviceWifiPrivate {
+ 	gint32            scheduled_scan_time;
+ 	guint8            scan_interval; /* seconds */
+ 	guint             pending_scan_id;
+-	guint             scanlist_cull_id;
+ 	gboolean          requested_scan;
+ 
+ 	NMSupplicantManager   *sup_mgr;
+@@ -166,11 +165,6 @@ static void supplicant_iface_new_bss_cb
+                                          GHashTable *properties,
+                                          NMDeviceWifi * self);
+ 
+-static void supplicant_iface_bss_updated_cb (NMSupplicantInterface *iface,
+-                                             const char *object_path,
+-                                             GHashTable *properties,
+-                                             NMDeviceWifi *self);
+-
+ static void supplicant_iface_bss_removed_cb (NMSupplicantInterface *iface,
+                                              const char *object_path,
+                                              NMDeviceWifi *self);
+@@ -183,7 +177,7 @@ static void supplicant_iface_notify_scan
                                                   GParamSpec * pspec,
                                                   NMDeviceWifi * self);
  
-+static void remove_outstanding_scanlist_cull(NMDeviceWifi *self);
-+
+-static void schedule_scanlist_cull (NMDeviceWifi *self);
 +static gboolean cull_scan_list(NMDeviceWifi *self);
-+
- static void schedule_scanlist_cull (NMDeviceWifi *self);
  
  static gboolean request_wireless_scan (gpointer user_data);
-@@ -1609,14 +1613,22 @@ supplicant_iface_scan_done_cb (NMSupplic
+ 
+@@ -278,10 +272,6 @@ supplicant_interface_acquire (NMDeviceWi
+ 	                  G_CALLBACK (supplicant_iface_new_bss_cb),
+ 	                  self);
+ 	g_signal_connect (priv->sup_iface,
+-	                  NM_SUPPLICANT_INTERFACE_BSS_UPDATED,
+-	                  G_CALLBACK (supplicant_iface_bss_updated_cb),
+-	                  self);
+-	g_signal_connect (priv->sup_iface,
+ 	                  NM_SUPPLICANT_INTERFACE_BSS_REMOVED,
+ 	                  G_CALLBACK (supplicant_iface_bss_removed_cb),
+ 	                  self);
+@@ -314,11 +304,6 @@ supplicant_interface_release (NMDeviceWi
+ 	            nm_device_get_iface (NM_DEVICE (self)),
+ 	            priv->scan_interval);
+ 
+-	if (priv->scanlist_cull_id) {
+-		g_source_remove (priv->scanlist_cull_id);
+-		priv->scanlist_cull_id = 0;
+-	}
+-
+ 	if (priv->sup_iface) {
+ 		remove_supplicant_interface_error_handler (self);
+ 
+@@ -1609,14 +1594,17 @@ supplicant_iface_scan_done_cb (NMSupplic
  	            nm_device_get_iface (NM_DEVICE (self)),
  	            success ? "successful" : "failed");
  
 -	g_signal_emit (self, signals[SCAN_DONE], 0, NULL);
 -
 -	schedule_scan (self, success);
-+	/* Make sure that scheduled and not yet run scanlist cull
-+	 * requests are aborted.
-+	 */
-+	remove_outstanding_scanlist_cull (self);
- 
+-
  	/* Ensure that old APs get removed, which otherwise only
  	 * happens when there are new BSSes.
  	 */
@@ -56,7 +93,16 @@
  
  	if (priv->requested_scan) {
  		priv->requested_scan = FALSE;
-@@ -1793,8 +1805,10 @@ cull_scan_list (NMDeviceWifi *self)
+@@ -1767,8 +1755,6 @@ cull_scan_list (NMDeviceWifi *self)
+ 	GSList *elt;
+ 	guint32 removed = 0, total = 0;
+ 
+-	priv->scanlist_cull_id = 0;
+-
+ 	nm_log_dbg (LOGD_WIFI_SCAN, "(%s): checking scan list for outdated APs",
+ 	            nm_device_get_iface (NM_DEVICE (self)));
+ 
+@@ -1793,8 +1779,10 @@ cull_scan_list (NMDeviceWifi *self)
  		 * supplicant in the last scan.
  		 */
  		if (   nm_ap_get_supplicant_path (ap)
@@ -68,27 +114,58 @@
  
  		last_seen = nm_ap_get_last_seen (ap);
  		if (!last_seen || last_seen + prune_interval_s < boottime_now)
-@@ -1836,13 +1850,22 @@ cull_scan_list (NMDeviceWifi *self)
+@@ -1836,17 +1824,6 @@ cull_scan_list (NMDeviceWifi *self)
  }
  
  static void
 -schedule_scanlist_cull (NMDeviceWifi *self)
-+remove_outstanding_scanlist_cull (NMDeviceWifi *self)
- {
- 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
- 
- 	/* Cull the scan list after the last request for it has come in */
- 	if (priv->scanlist_cull_id)
- 		g_source_remove (priv->scanlist_cull_id);
-+}
-+
-+static void
-+schedule_scanlist_cull (NMDeviceWifi *self)
-+{
-+	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
-+
-+	remove_outstanding_scanlist_cull(self);
-+
- 	priv->scanlist_cull_id = g_timeout_add_seconds (4, (GSourceFunc) cull_scan_list, self);
+-{
+-	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
+-
+-	/* Cull the scan list after the last request for it has come in */
+-	if (priv->scanlist_cull_id)
+-		g_source_remove (priv->scanlist_cull_id);
+-	priv->scanlist_cull_id = g_timeout_add_seconds (4, (GSourceFunc) cull_scan_list, self);
+-}
+-
+-static void
+ supplicant_iface_new_bss_cb (NMSupplicantInterface *iface,
+                              const char *object_path,
+                              GHashTable *properties,
+@@ -1877,36 +1854,6 @@ supplicant_iface_new_bss_cb (NMSupplican
+ 		nm_log_warn (LOGD_WIFI_SCAN, "(%s): invalid AP properties received",
+ 		             nm_device_get_iface (NM_DEVICE (self)));
+ 	}
+-
+-	/* Remove outdated access points */
+-	schedule_scanlist_cull (self);
+-}
+-
+-static void
+-supplicant_iface_bss_updated_cb (NMSupplicantInterface *iface,
+-                                 const char *object_path,
+-                                 GHashTable *properties,
+-                                 NMDeviceWifi *self)
+-{
+-	NMDeviceState state;
+-	NMAccessPoint *ap;
+-
+-	g_return_if_fail (self != NULL);
+-	g_return_if_fail (object_path != NULL);
+-	g_return_if_fail (properties != NULL);
+-
+-	/* Ignore new APs when unavailable or unamnaged */
+-	state = nm_device_get_state (NM_DEVICE (self));
+-	if (state <= NM_DEVICE_STATE_UNAVAILABLE)
+-		return;
+-
+-	/* Update the AP's last-seen property */
+-	ap = get_ap_by_supplicant_path (self, object_path);
+-	if (ap)
+-		nm_ap_update_last_seen (ap);
+-
+-	/* Remove outdated access points */
+-	schedule_scanlist_cull (self);
  }
  
+ static void