Android: Add SSID in supplicant change event

In addition, change wpa_s->pending_bssid to wpa_s->bssid for the BSSID
value in the event.

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

diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c
index 40cffdfff258549a026f8dc6d31d7f7de60b99f3..a82fbf3a9a81f71ed0bb233de07664097c267f7c 100644 (file)
--- a/wpa_supplicant/notify.c
+++ b/wpa_supplicant/notify.c
@@ -90,9 +90,13 @@ void wpas_notify_state_changed(struct wpa_supplicant *wpa_s,
 
 #ifdef ANDROID
        wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_STATE_CHANGE
-                    "id=%d state=%d BSSID=" MACSTR,
+                    "id=%d state=%d BSSID=" MACSTR " SSID=%s",
                     wpa_s->current_ssid ? wpa_s->current_ssid->id : -1,
-                    new_state, MAC2STR(wpa_s->pending_bssid));
+                    new_state,
+                    MAC2STR(wpa_s->bssid),
+                    wpa_s->current_ssid && wpa_s->current_ssid->ssid ?
+                    wpa_ssid_txt(wpa_s->current_ssid->ssid,
+                                 wpa_s->current_ssid->ssid_len) : "");
 #endif /* ANDROID */
 }