Android: Add state message sent after 'status' command
authorDmitry Shmidt <dimitrysh@google.com>
Mon, 11 Nov 2013 20:52:59 +0000 (12:52 -0800)
committerJouni Malinen <j@w1.fi>
Sun, 17 Nov 2013 14:47:56 +0000 (16:47 +0200)
This triggers re-transmission of CTRL-EVENT-STATE-CHANGE and
CTRL-EVENT-CONNECTED events on STATUS command for Android framework
specific processing.

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
wpa_supplicant/ctrl_iface.c

index 615a972..798c55b 100644 (file)
@@ -1629,6 +1629,26 @@ static int wpa_supplicant_ctrl_iface_status(struct wpa_supplicant *wpa_s,
        if (res >= 0)
                pos += res;
 
+#ifdef ANDROID
+       wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_STATE_CHANGE
+                    "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->bssid),
+                    wpa_s->current_ssid && wpa_s->current_ssid->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 " MACSTR
+                            " completed %s [id=%d id_str=%s]",
+                            MAC2STR(wpa_s->bssid), "(auth)",
+                            ssid ? ssid->id : -1,
+                            ssid && ssid->id_str ? ssid->id_str : "");
+       }
+#endif /* ANDROID */
+
        return pos - buf;
 }