diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-04-16 19:24:40 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-16 19:24:40 -0700 |
| commit | 3eb807eec9a305f9a2bc87964925ec81bfc4eb1e (patch) | |
| tree | 26c9615fa647b2baf908af6b3e520c390b26b31b | |
| parent | 9e07767d5d76159ef38a241da00eb0d9f3bc6420 (diff) | |
| parent | f20a4432808cee548326c4b35c83071ca576a239 (diff) | |
| download | external_wpa_supplicant_8-3eb807eec9a305f9a2bc87964925ec81bfc4eb1e.zip external_wpa_supplicant_8-3eb807eec9a305f9a2bc87964925ec81bfc4eb1e.tar.gz external_wpa_supplicant_8-3eb807eec9a305f9a2bc87964925ec81bfc4eb1e.tar.bz2 | |
Merge "Add SSID in supplicant change event"
| -rw-r--r-- | wpa_supplicant/ctrl_iface.c | 6 | ||||
| -rw-r--r-- | 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 31a7448..caecf75 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 da98a14..9689ed4 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 */ } |