DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

DPP: Start a listen operation for GAS server if needed

Browse source 
Instead of depending on the TX-wait-response-time to be sufficient to
cover the full GAS exchange, start an ongoing listen operation on the
negotiation channel (if no such listen operation is already in place) to
allow the configuration exchange to take longer amount of time. This is
needed for cases where the conf=query is used to request Configurator
parameters from upper layers and that upper layer processing (e.g., user
interaction) takes significant amount of time.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
This commit is contained in:
Jouni Malinen 2022-02-03 11:30:06 +02:00 committed by Jouni Malinen
parent 3fb6b7fed6
commit a6d157b6f6
4 changed files with 40 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
wpa_supplicant/dpp_supplicant.c
View file

@ -777,6 +777,7 @@ int wpas_dpp_auth_init(struct wpa_supplicant *wpa_s, const char *cmd)
#endif /* CONFIG_DPP2 */
wpa_s->dpp_gas_client = 0;
wpa_s->dpp_gas_server = 0;
pos = os_strstr(cmd, " peer=");
if (!pos)
@ -1144,6 +1145,7 @@ static void wpas_dpp_rx_auth_req(struct wpa_supplicant *wpa_s, const u8 *src,
}
wpa_s->dpp_gas_client = 0;
wpa_s->dpp_gas_server = 0;
wpa_s->dpp_auth_ok_on_ack = 0;
wpa_s->dpp_auth = dpp_auth_req_rx(wpa_s->dpp, wpa_s,
wpa_s->dpp_allowed_roles,
@ -1181,9 +1183,33 @@ static void wpas_dpp_rx_auth_req(struct wpa_supplicant *wpa_s, const u8 *src,
}
void wpas_dpp_tx_wait_expire(struct wpa_supplicant *wpa_s)
{
struct dpp_authentication *auth = wpa_s->dpp_auth;
int freq;
if (!wpa_s->dpp_gas_server || !auth)
return;
freq = auth->neg_freq > 0 ? auth->neg_freq : auth->curr_freq;
if (wpa_s->dpp_listen_work || (int) wpa_s->dpp_listen_freq == freq)
return; /* listen state is already in progress */
wpa_printf(MSG_DEBUG, "DPP: Start listen on %u MHz for GAS", freq);
wpa_s->dpp_in_response_listen = 1;
wpas_dpp_listen_start(wpa_s, freq);
}
static void wpas_dpp_start_gas_server(struct wpa_supplicant *wpa_s)
{
/* TODO: stop wait and start ROC */
struct dpp_authentication *auth = wpa_s->dpp_auth;
wpa_printf(MSG_DEBUG,
"DPP: Starting GAS server (curr_freq=%d neg_freq=%d dpp_listen_freq=%d dpp_listen_work=%d)",
auth->curr_freq, auth->neg_freq, wpa_s->dpp_listen_freq,
!!wpa_s->dpp_listen_work);
wpa_s->dpp_gas_server = 1;
}
@ -1965,6 +1991,8 @@ static void wpas_dpp_rx_conf_result(struct wpa_supplicant *wpa_s, const u8 *src,
status = dpp_conf_result_rx(auth, hdr, buf, len);
if (status == DPP_STATUS_OK && auth->send_conn_status) {
int freq;
wpa_msg(wpa_s, MSG_INFO,
DPP_EVENT_CONF_SENT "wait_conn_status=1");
wpa_printf(MSG_DEBUG, "DPP: Wait for Connection Status Result");
@ -1977,8 +2005,10 @@ static void wpas_dpp_rx_conf_result(struct wpa_supplicant *wpa_s, const u8 *src,
wpas_dpp_conn_status_result_wait_timeout,
wpa_s, NULL);
offchannel_send_action_done(wpa_s);
wpas_dpp_listen_start(wpa_s, auth->neg_freq ? auth->neg_freq :
auth->curr_freq);
freq = auth->neg_freq ? auth->neg_freq : auth->curr_freq;
if (!wpa_s->dpp_in_response_listen ||
(int) wpa_s->dpp_listen_freq != freq)
wpas_dpp_listen_start(wpa_s, freq);
return;
}
offchannel_send_action_done(wpa_s);

1
wpa_supplicant/dpp_supplicant.h
View file

@ -24,6 +24,7 @@ void wpas_dpp_remain_on_channel_cb(struct wpa_supplicant *wpa_s,
unsigned int freq, unsigned int duration);
void wpas_dpp_cancel_remain_on_channel_cb(struct wpa_supplicant *wpa_s,
unsigned int freq);
void wpas_dpp_tx_wait_expire(struct wpa_supplicant *wpa_s);
void wpas_dpp_rx_action(struct wpa_supplicant *wpa_s, const u8 *src,
const u8 *buf, size_t len, unsigned int freq);
int wpas_dpp_configurator_sign(struct wpa_supplicant *wpa_s, const char *cmd);

5
wpa_supplicant/events.c
View file

@ -5738,6 +5738,11 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
case EVENT_UNPROT_BEACON:
wpas_event_unprot_beacon(wpa_s, &data->unprot_beacon);
break;
case EVENT_TX_WAIT_EXPIRE:
#ifdef CONFIG_DPP
wpas_dpp_tx_wait_expire(wpa_s);
#endif /* CONFIG_DPP */
break;
default:
wpa_msg(wpa_s, MSG_INFO, "Unknown event %d", event);
break;

1
wpa_supplicant/wpa_supplicant_i.h
View file

@ -1448,6 +1448,7 @@ struct wpa_supplicant {
int dpp_auth_ok_on_ack;
int dpp_in_response_listen;
int dpp_gas_client;
int dpp_gas_server;
int dpp_gas_dialog_token;
u8 dpp_intro_bssid[ETH_ALEN];
void *dpp_intro_network;