From f20a4432808cee548326c4b35c83071ca576a239 Mon Sep 17 00:00:00 2001 From: Irfan Sheriff Date: Mon, 16 Apr 2012 16:48:34 -0700 Subject: Add SSID in supplicant change event Change-Id: I67224e6765afad51b4b258b0df7d11d7ed3b9927 --- wpa_supplicant/ctrl_iface.c | 6 ++++-- wpa_supplicant/notify.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index 31a74487..caecf75c 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -1011,9 +1011,11 @@ static int wpa_supplicant_ctrl_iface_status(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, - wpa_s->wpa_state, MAC2STR(wpa_s->pending_bssid)); + wpa_s->wpa_state, + MAC2STR(wpa_s->pending_bssid), + wpa_s->current_ssid ? wpa_s->current_ssid->ssid : ""); if (wpa_s->wpa_state == WPA_COMPLETED) { struct wpa_ssid *ssid = wpa_s->current_ssid; wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_CONNECTED "- connection to " diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c index da98a14c..9689ed4c 100644 --- a/wpa_supplicant/notify.c +++ b/wpa_supplicant/notify.c @@ -90,9 +90,11 @@ 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->pending_bssid), + wpa_s->current_ssid ? wpa_s->current_ssid->ssid : ""); #endif /* ANDROID */ } -- cgit v1.2.3