diff options
author | Dmitry Shmidt <dimitrysh%android.com@gtempaccount.com> | 2014-05-14 00:00:20 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-14 00:00:20 +0000 |
commit | 0eb0b4a31aa70754cf4c345220d1a0ae9a8d6a08 (patch) | |
tree | 67043a2af8d237b05ab13a1dea1c388b3f911e17 /wifi | |
parent | 9c599afbc0fffdb98a5c80f0dbe39cc56b29971e (diff) | |
parent | 384bd5d631a9d493d65afac4ce21a751e8cd2c68 (diff) | |
download | hardware_libhardware_legacy-0eb0b4a31aa70754cf4c345220d1a0ae9a8d6a08.zip hardware_libhardware_legacy-0eb0b4a31aa70754cf4c345220d1a0ae9a8d6a08.tar.gz hardware_libhardware_legacy-0eb0b4a31aa70754cf4c345220d1a0ae9a8d6a08.tar.bz2 |
am 384bd5d6: am 7b11946c: am 9739aeb2: Merge "Indicate WPA_EVENT_TERMINATING event on primary interface."
* commit '384bd5d631a9d493d65afac4ce21a751e8cd2c68':
Indicate WPA_EVENT_TERMINATING event on primary interface.
Diffstat (limited to 'wifi')
-rw-r--r-- | wifi/wifi.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/wifi/wifi.c b/wifi/wifi.c index 3bcc8be..bc8d33e 100644 --- a/wifi/wifi.c +++ b/wifi/wifi.c @@ -635,26 +635,30 @@ int wifi_wait_on_socket(char *buf, size_t buflen) char *match, *match2; if (monitor_conn == NULL) { - return snprintf(buf, buflen, WPA_EVENT_TERMINATING " - connection closed"); + return snprintf(buf, buflen, "IFNAME=%s %s - connection closed", + primary_iface, WPA_EVENT_TERMINATING); } result = wifi_ctrl_recv(buf, &nread); /* Terminate reception on exit socket */ if (result == -2) { - return snprintf(buf, buflen, WPA_EVENT_TERMINATING " - connection closed"); + return snprintf(buf, buflen, "IFNAME=%s %s - connection closed", + primary_iface, WPA_EVENT_TERMINATING); } if (result < 0) { ALOGD("wifi_ctrl_recv failed: %s\n", strerror(errno)); - return snprintf(buf, buflen, WPA_EVENT_TERMINATING " - recv error"); + return snprintf(buf, buflen, "IFNAME=%s %s - recv error", + primary_iface, WPA_EVENT_TERMINATING); } buf[nread] = '\0'; /* Check for EOF on the socket */ if (result == 0 && nread == 0) { /* Fabricate an event to pass up */ ALOGD("Received EOF on supplicant socket\n"); - return snprintf(buf, buflen, WPA_EVENT_TERMINATING " - signal 0 received"); + return snprintf(buf, buflen, "IFNAME=%s %s - signal 0 received", + primary_iface, WPA_EVENT_TERMINATING); } /* * Events strings are in the format |