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

dpp: don't send StartEnrollee reply until offchannel starts

Browse Source 
IWD may be in the middle of some long operation, e.g. scanning.
If the URI is returned before IWD is ready, a configurator could
start sending frames and IWD either wont receive them, or will
be unable to respond quickly.
This commit is contained in:
James Prestwood 2022-01-11 16:55:51 -08:00 committed by Denis Kenzior
parent c78573b468
commit 0c8d3f106a
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/dpp.c
View File

@ -118,6 +118,8 @@ struct dpp_sm {
struct dpp_configuration *config; struct dpp_configuration *config;
uint32_t connect_scan_id; uint32_t connect_scan_id;
struct l_dbus_message *pending;
}; };
static void dpp_free_auth_data(struct dpp_sm *dpp) static void dpp_free_auth_data(struct dpp_sm *dpp)
@ -1257,6 +1259,15 @@ static void dpp_roc_started(void *user_data)
switch (dpp->state) { switch (dpp->state) {
case DPP_STATE_PRESENCE: case DPP_STATE_PRESENCE:
if (dpp->pending) {
struct l_dbus_message *reply =
l_dbus_message_new_method_return(dpp->pending);
l_dbus_message_set_arguments(reply, "s", dpp->uri);
dbus_pending_reply(&dpp->pending, reply);
}
dpp_presence_announce(dpp); dpp_presence_announce(dpp);
break; break;
case DPP_STATE_AUTHENTICATING: case DPP_STATE_AUTHENTICATING:
@ -1694,7 +1705,6 @@ static struct l_dbus_message *dpp_dbus_start_enrollee(struct l_dbus *dbus,
{ {
struct dpp_sm *dpp = user_data; struct dpp_sm *dpp = user_data;
uint32_t freq = band_channel_to_freq(6, BAND_FREQ_2_4_GHZ); uint32_t freq = band_channel_to_freq(6, BAND_FREQ_2_4_GHZ);
struct l_dbus_message *reply;
struct station *station = station_find(netdev_get_ifindex(dpp->netdev)); struct station *station = station_find(netdev_get_ifindex(dpp->netdev));
if (dpp->state != DPP_STATE_NOTHING) if (dpp->state != DPP_STATE_NOTHING)
@ -1720,6 +1730,8 @@ static struct l_dbus_message *dpp_dbus_start_enrollee(struct l_dbus *dbus,
l_debug("DPP Start Enrollee: %s", dpp->uri); l_debug("DPP Start Enrollee: %s", dpp->uri);
dpp->pending = l_dbus_message_ref(message);
/* /*
* Going off spec here. Select a single channel to send presence * Going off spec here. Select a single channel to send presence
* announcements on. This will be advertised in the URI. The full * announcements on. This will be advertised in the URI. The full
@ -1727,11 +1739,7 @@ static struct l_dbus_message *dpp_dbus_start_enrollee(struct l_dbus *dbus,
*/ */
dpp_start_presence(dpp, &freq, 1); dpp_start_presence(dpp, &freq, 1);
reply = l_dbus_message_new_method_return(message); return NULL;
l_dbus_message_set_arguments(reply, "s", dpp->uri);
return reply;
} }
static struct l_dbus_message *dpp_dbus_start_configurator(struct l_dbus *dbus, static struct l_dbus_message *dpp_dbus_start_configurator(struct l_dbus *dbus,