diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-05-11 11:23:35 -0700 |
|---|---|---|
| committer | Irfan Sheriff <isheriff@google.com> | 2012-05-11 11:23:35 -0700 |
| commit | 1029477547084d210cb810e8e5463c628972b315 (patch) | |
| tree | ae3557ff36e175fd54aa5043fcef1f09198e6f7e | |
| parent | 2fb777c379ad560c309c54b96c2c13291da23f54 (diff) | |
| download | android_external_wpa_supplicant_8-1029477547084d210cb810e8e5463c628972b315.tar.gz android_external_wpa_supplicant_8-1029477547084d210cb810e8e5463c628972b315.tar.bz2 android_external_wpa_supplicant_8-1029477547084d210cb810e8e5463c628972b315.zip | |
Fix SSID printing in events
Bug: 6476830
Change-Id: I7909fb9fb56737d0d772921d1de2849ca1296679
| -rw-r--r-- | wpa_supplicant/ctrl_iface.c | 3 | ||||
| -rw-r--r-- | wpa_supplicant/notify.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index 06b725b2..f81f6f21 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -1015,7 +1015,8 @@ static int wpa_supplicant_ctrl_iface_status(struct wpa_supplicant *wpa_s, wpa_s->current_ssid ? wpa_s->current_ssid->id : -1, wpa_s->wpa_state, MAC2STR(wpa_s->pending_bssid), - wpa_s->current_ssid ? wpa_s->current_ssid->ssid : ""); + wpa_s->current_ssid ? wpa_ssid_txt(wpa_s->current_ssid->ssid, + wpa_s->current_ssid->ssid_len) : ""); 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 9689ed4c..9376c7a2 100644 --- a/wpa_supplicant/notify.c +++ b/wpa_supplicant/notify.c @@ -94,7 +94,8 @@ void wpas_notify_state_changed(struct wpa_supplicant *wpa_s, wpa_s->current_ssid ? wpa_s->current_ssid->id : -1, new_state, MAC2STR(wpa_s->pending_bssid), - wpa_s->current_ssid ? wpa_s->current_ssid->ssid : ""); + wpa_s->current_ssid ? wpa_ssid_txt(wpa_s->current_ssid->ssid, + wpa_s->current_ssid->ssid_len): ""); #endif /* ANDROID */ } |