Add scan debug messages (temporarily)

Change-Id: I8f675d0d6e2922168f22835ea94ddac5644e90f4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index 2d22e08..4182fb2 100644 (file)
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -1633,6 +1633,8 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
        int ctrl_rsp = 0;
        int reply_len;
 
+       wpa_printf(MSG_DEBUG, "CMD = %s", buf);
+
        if (os_strncmp(buf, WPA_CTRL_RSP, os_strlen(WPA_CTRL_RSP)) == 0 ||
            os_strncmp(buf, "SET_NETWORK ", 12) == 0) {
                wpa_hexdump_ascii_key(MSG_DEBUG, "RX ctrl_iface",
@@ -1759,6 +1761,7 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
                wpa_s->disconnected = 1;
                wpa_supplicant_disassociate(wpa_s, WLAN_REASON_DEAUTH_LEAVING);
        } else if (os_strcmp(buf, "SCAN") == 0) {
+               wpa_printf(MSG_ERROR, "Framework Scan request");
 #ifdef ANDROID
                if (!wpa_s->scanning && ((wpa_s->wpa_state <= WPA_SCANNING) ||
                        (wpa_s->wpa_state >= WPA_COMPLETED))) {

diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index c4da038..4b15d22 100644 (file)
--- a/wpa_supplicant/scan.c
+++ b/wpa_supplicant/scan.c
@@ -92,7 +92,7 @@ static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx)
        enum wps_request_type req_type = WPS_REQ_ENROLLEE_INFO;
 #endif /* CONFIG_WPS */
 
-       wpa_printf(MSG_DEBUG, "%s: scan_req = %d, ap_scan = %d", __func__,
+       wpa_printf(MSG_ERROR, "%s: scan_req = %d, ap_scan = %d", __func__,
                wpa_s->scan_req, wpa_s->conf->ap_scan);
 
        if (wpa_s->disconnected && !wpa_s->scan_req) {

diff --git a/wpa_supplicant/src/drivers/driver_wext.c b/wpa_supplicant/src/drivers/driver_wext.c
index 9dab2d7..b7aef16 100644 (file)
--- a/wpa_supplicant/src/drivers/driver_wext.c
+++ b/wpa_supplicant/src/drivers/driver_wext.c
@@ -1139,6 +1139,8 @@ int wpa_driver_wext_scan(void *priv, const u8 *ssid, size_t ssid_len)
        int scan_probe_flag = 0;
 #endif
 
+       wpa_printf(MSG_ERROR, "%s: Start", __func__);
+
        if (ssid_len > IW_ESSID_MAX_SIZE) {
                wpa_printf(MSG_DEBUG, "%s: too long SSID (%lu)",
                           __FUNCTION__, (unsigned long) ssid_len);
@@ -1203,11 +1205,11 @@ int wpa_driver_wext_combo_scan(void *priv, struct wpa_ssid **ssid_ptr,
        int scan_probe_flag = 0;
 
        if (!drv->driver_is_started) {
-               wpa_printf(MSG_DEBUG, "%s: Driver stopped", __func__);
+               wpa_printf(MSG_ERROR, "%s: Driver stopped", __func__);
                return -1;
        }
 
-       wpa_printf(MSG_DEBUG, "%s: Start", __func__);
+       wpa_printf(MSG_ERROR, "%s: Start", __func__);
 
        /* Set list of SSIDs */
        ssid_orig = (*ssid_ptr);
@@ -1253,7 +1255,7 @@ int wpa_driver_wext_combo_scan(void *priv, struct wpa_ssid **ssid_ptr,
        if ((ret = ioctl(drv->ioctl_sock, SIOCSIWPRIV, &iwr)) < 0) {
                wpa_printf(MSG_ERROR, "ioctl[SIOCSIWPRIV] (cscan): %d", ret);
                *ssid_ptr = ssid_orig;
-               goto old_scan;
+               /* goto old_scan; */
        }
 
        wpa_driver_wext_set_scan_timeout(priv);