Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-12-21 03:32:42 +01:00
Code Releases Activity

wsc: Start walk timer

Browse Source 
PBC mode mandates a 120-second walk timer.  The PBC transaction must be
completed within that time or be aborted.
This commit is contained in:
Denis Kenzior 2016-09-22 11:32:18 -05:00
parent c64534135d
commit 47fa0435ba
1 changed files with 46 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/wsc.c
View File

@ -88,6 +88,15 @@ static struct l_dbus_message *wsc_error_not_reachable(
"unreachable"); "unreachable");
} }
static struct l_dbus_message *wsc_error_walk_time_expired(
struct l_dbus_message *msg)
{
return l_dbus_message_new_error(msg,
IWD_WSC_INTERFACE ".WalkTimeExpired",
"No APs in PushButton mode found in "
"the alloted time");
}
static void wsc_try_credentials(struct wsc *wsc) static void wsc_try_credentials(struct wsc *wsc)
{ {
unsigned int i; unsigned int i;
@ -390,6 +399,33 @@ static void wsc_connect(struct wsc *wsc, struct scan_bss *bss)
dbus_pending_reply(&wsc->pending, dbus_error_failed(wsc->pending)); dbus_pending_reply(&wsc->pending, dbus_error_failed(wsc->pending));
} }
static void wsc_cancel_scan(struct wsc *wsc)
{
l_free(wsc->wsc_ies);
wsc->wsc_ies = 0;
if (wsc->scan_id > 0) {
scan_cancel(device_get_ifindex(wsc->device), wsc->scan_id);
wsc->scan_id = 0;
}
if (wsc->walk_timer) {
l_timeout_remove(wsc->walk_timer);
wsc->walk_timer = NULL;
}
}
static void walk_timeout(struct l_timeout *timeout, void *user_data)
{
struct wsc *wsc = user_data;
wsc_cancel_scan(wsc);
if (wsc->pending)
dbus_pending_reply(&wsc->pending,
wsc_error_walk_time_expired(wsc->pending));
}
static bool scan_results(uint32_t wiphy_id, uint32_t ifindex, static bool scan_results(uint32_t wiphy_id, uint32_t ifindex,
struct l_queue *bss_list, void *userdata) struct l_queue *bss_list, void *userdata)
{ {
@ -486,9 +522,7 @@ static bool scan_results(uint32_t wiphy_id, uint32_t ifindex,
return false; return false;
} }
l_free(wsc->wsc_ies); wsc_cancel_scan(wsc);
wsc->wsc_ies = 0;
device_set_scan_results(wsc->device, bss_list); device_set_scan_results(wsc->device, bss_list);
l_debug("Found AP to connect to: %s", l_debug("Found AP to connect to: %s",
@ -498,12 +532,10 @@ static bool scan_results(uint32_t wiphy_id, uint32_t ifindex,
return true; return true;
session_overlap: session_overlap:
wsc_cancel_scan(wsc);
dbus_pending_reply(&wsc->pending, dbus_pending_reply(&wsc->pending,
wsc_error_session_overlap(wsc->pending)); wsc_error_session_overlap(wsc->pending));
l_free(wsc->wsc_ies);
wsc->wsc_ies = 0;
return false; return false;
} }
@ -559,20 +591,11 @@ static bool wsc_start_pushbutton(struct wsc *wsc)
wsc->scan_id = scan_active(device_get_ifindex(wsc->device), wsc->scan_id = scan_active(device_get_ifindex(wsc->device),
wsc->wsc_ies, wsc->wsc_ies_size, wsc->wsc_ies, wsc->wsc_ies_size,
NULL, scan_results, wsc, NULL); NULL, scan_results, wsc, NULL);
wsc->walk_timer = l_timeout_create(WALK_TIME, walk_timeout, wsc, NULL);
return true; return true;
} }
static void wsc_abort(struct wsc *wsc)
{
l_free(wsc->wsc_ies);
wsc->wsc_ies = 0;
if (wsc->scan_id > 0) {
scan_cancel(device_get_ifindex(wsc->device), wsc->scan_id);
wsc->scan_id = 0;
}
}
static struct l_dbus_message *wsc_push_button(struct l_dbus *dbus, static struct l_dbus_message *wsc_push_button(struct l_dbus *dbus,
struct l_dbus_message *message, struct l_dbus_message *message,
void *user_data) void *user_data)
@ -603,12 +626,11 @@ static struct l_dbus_message *wsc_cancel(struct l_dbus *dbus,
if (!wsc->pending) if (!wsc->pending)
return dbus_error_not_available(message); return dbus_error_not_available(message);
reply = l_dbus_message_new_method_return(message); wsc_cancel_scan(wsc);
l_dbus_message_set_arguments(reply, "");
dbus_pending_reply(&wsc->pending, dbus_error_aborted(wsc->pending)); dbus_pending_reply(&wsc->pending, dbus_error_aborted(wsc->pending));
wsc_abort(wsc); reply = l_dbus_message_new_method_return(message);
l_dbus_message_set_arguments(reply, "");
return reply; return reply;
} }
@ -625,13 +647,12 @@ static void wsc_free(void *userdata)
{ {
struct wsc *wsc = userdata; struct wsc *wsc = userdata;
if (wsc->pending) { wsc_cancel_scan(wsc);
if (wsc->pending)
dbus_pending_reply(&wsc->pending, dbus_pending_reply(&wsc->pending,
dbus_error_not_available(wsc->pending)); dbus_error_not_available(wsc->pending));
wsc_abort(wsc);
}
l_free(wsc); l_free(wsc);
} }