aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Zaborowski <andrew.zaborowski@intel.com>2020-03-19 22:12:13 +0100
committerDenis Kenzior <denkenz@gmail.com>2020-03-20 10:17:04 -0500
commit4abafd8eea59de1acf5be07bcbf2d80faa616696 (patch)
tree2e337e0136280943f7890bc2ca9a20c0e68027e3
parent485cb4d375e17d7dde17cba07d373f44c7152cf1 (diff)
downloadiwd-4abafd8eea59de1acf5be07bcbf2d80faa616696.tar.gz
wsc: Don't start connections until Cancel finishes
Return busy from StartPin and PushButton if the Cancel method is still running.
-rw-r--r--src/wsc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wsc.c b/src/wsc.c
index 393e8d8d7..e9ebe5f5a 100644
--- a/src/wsc.c
+++ b/src/wsc.c
@@ -1111,7 +1111,7 @@ static struct l_dbus_message *wsc_push_button(struct l_dbus *dbus,
if (!l_dbus_message_get_arguments(message, ""))
return dbus_error_invalid_args(message);
- if (wsc->pending_connect)
+ if (wsc->pending_connect || wsc->pending_cancel)
return dbus_error_busy(message);
wsc->pending_connect = l_dbus_message_ref(message);
@@ -1150,7 +1150,7 @@ static struct l_dbus_message *wsc_start_pin(struct l_dbus *dbus,
l_debug("");
- if (wsc->pending_connect)
+ if (wsc->pending_connect || wsc->pending_cancel)
return dbus_error_busy(message);
if (!l_dbus_message_get_arguments(message, "s", &pin))