summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2014-02-08 18:37:05 +0100
committerDavid Herrmann <dh.herrmann@gmail.com>2014-02-08 18:37:05 +0100
commit115747f840dbcaaadd2ab604144d3850fff6723f (patch)
tree0568a09eab3f4c80648b7912f98f18442476112c
parentcc5ca615a72a0c69d4958559a9d1eb38bbab34f2 (diff)
wpa: add CTRL-EVENT-TERMINATING parser
Parse the TERMINATING event that is sent by wpa-supplicant on shutdown. This way we can cleanly react to shutdowns instead of waiting for a PING-timeout/refused. Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
-rw-r--r--src/libwfd.h1
-rw-r--r--src/wpa_parser.c1
-rw-r--r--test/test_wpa.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/src/libwfd.h b/src/libwfd.h
index 457308d..9ada501 100644
--- a/src/libwfd.h
+++ b/src/libwfd.h
@@ -556,6 +556,7 @@ int wfd_wpa_ctrl_request_ok(struct wfd_wpa_ctrl *wpa, const void *cmd,
enum wfd_wpa_event_type {
WFD_WPA_EVENT_UNKNOWN,
WFD_WPA_EVENT_CTRL_EVENT_SCAN_STARTED,
+ WFD_WPA_EVENT_CTRL_EVENT_TERMINATING,
WFD_WPA_EVENT_AP_STA_CONNECTED,
WFD_WPA_EVENT_AP_STA_DISCONNECTED,
WFD_WPA_EVENT_P2P_DEVICE_FOUND,
diff --git a/src/wpa_parser.c b/src/wpa_parser.c
index 25ab31e..ae44d4b 100644
--- a/src/wpa_parser.c
+++ b/src/wpa_parser.c
@@ -81,6 +81,7 @@ static const struct event_type {
EVENT("AP-STA-CONNECTED", AP_STA_CONNECTED),
EVENT("AP-STA-DISCONNECTED", AP_STA_DISCONNECTED),
EVENT("CTRL-EVENT-SCAN-STARTED", CTRL_EVENT_SCAN_STARTED),
+ EVENT("CTRL-EVENT-TERMINATING", CTRL_EVENT_TERMINATING),
EVENT("P2P-DEVICE-FOUND", P2P_DEVICE_FOUND),
EVENT("P2P-DEVICE-LOST", P2P_DEVICE_LOST),
EVENT("P2P-FIND-STOPPED", P2P_FIND_STOPPED),
diff --git a/test/test_wpa.c b/test/test_wpa.c
index eb199cb..3eb11c9 100644
--- a/test/test_wpa.c
+++ b/test/test_wpa.c
@@ -40,6 +40,7 @@ static const char *event_list[] = {
[WFD_WPA_EVENT_AP_STA_CONNECTED] = "AP-STA-CONNECTED 00:00:00:00:00:00",
[WFD_WPA_EVENT_AP_STA_DISCONNECTED] = "AP-STA-DISCONNECTED 00:00:00:00:00:00",
[WFD_WPA_EVENT_CTRL_EVENT_SCAN_STARTED] = "CTRL-EVENT-SCAN-STARTED",
+ [WFD_WPA_EVENT_CTRL_EVENT_TERMINATING] = "CTRL-EVENT-TERMINATING",
[WFD_WPA_EVENT_P2P_DEVICE_FOUND] = "P2P-DEVICE-FOUND 00:00:00:00:00:00 name=some-name",
[WFD_WPA_EVENT_P2P_DEVICE_LOST] = "P2P-DEVICE-LOST p2p_dev_addr=00:00:00:00:00:00",
[WFD_WPA_EVENT_P2P_FIND_STOPPED] = "P2P-FIND-STOPPED",