From: Julien Massot <jmassot@aldebaran-robotics.com>
Date: Thu, 21 Feb 2013 17:23:07 +0000 (+0100)
Subject: gsupplicant: Set the scan callback in g_supplicant_interface_scan
X-Git-Tag: 1.12~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5230672c36edeb8ac49a365a10586fb1710071c4;p=platform%2Fupstream%2Fconnman.git

gsupplicant: Set the scan callback in g_supplicant_interface_scan

The callback is required to properly handle scanning errors reported
by wpa_supplicant through the scan_done signal.

Steps to reproduce:
1. Set a country code to the WiFi card which have more frequencies
   allowed than the world roaming allow.
2. Connect to a WiFi network not available in the world roaming setup.
3. Stop connman.
4. Change the country code to 00, be sure the frequencies use in step 2.
   is no longer allowed. Take care of cfg80211 authorize frequencies when
   beacons are received, I prefer using mac80211_hwsim from here to avoid
   side effects about beacon reception.
5. Start connman again.

Now ConnMan is stuck in scanning state as the scan_fast method of
plugins/wifi.c is called with a forbidden frequency.

wpa_supplicant returns an error received in "gsupplicant/supplicant.c:
signal_scan_done", where the code enters 'if (success == FALSE)' but
unfortunately scan_callback is NULL at this point as the scan_callback is
normally set in interface_scan_result().
---

diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c
index f33c2df..be5e72b 100644
--- a/gsupplicant/supplicant.c
+++ b/gsupplicant/supplicant.c
@@ -2886,6 +2886,9 @@ int g_supplicant_interface_scan(GSupplicantInterface *interface,
 	data->user_data = user_data;
 	data->scan_params = scan_data;
 
+        interface->scan_callback = callback;
+        interface->scan_data = user_data;
+
 	ret = supplicant_dbus_method_call(interface->path,
 			SUPPLICANT_INTERFACE ".Interface", "Scan",
 			interface_scan_params, interface_scan_result, data);