Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

sae: add counter for associate retries 

If there is an associate timeout, retry a few times in case
it was just a fluke. At this point SAE is fully negotiated
so it makes sense to attempt to save the connection.
This commit is contained in:
James Prestwood 2021-03-29 13:43:50 -07:00 committed by Denis Kenzior
parent 90485cb2ee
commit a04d4423f8
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/sae.c
View File

@ -37,6 +37,7 @@
#define SAE_RETRANSMIT_TIMEOUT 2 #define SAE_RETRANSMIT_TIMEOUT 2
#define SAE_SYNC_MAX 3 #define SAE_SYNC_MAX 3
#define SAE_MAX_ASSOC_RETRY 3
enum sae_state { enum sae_state {
SAE_STATE_NOTHING = 0, SAE_STATE_NOTHING = 0,
@ -73,6 +74,7 @@ struct sae_sm {
uint16_t rc; uint16_t rc;
/* remote peer */ /* remote peer */
uint8_t peer[6]; uint8_t peer[6];
uint8_t assoc_retry;
sae_tx_authenticate_func_t tx_auth; sae_tx_authenticate_func_t tx_auth;
sae_tx_associate_func_t tx_assoc; sae_tx_associate_func_t tx_assoc;
@ -670,7 +672,7 @@ static bool sae_send_commit(struct sae_sm *sm, bool retry)
return true; return true;
} }
static bool sae_timeout(struct auth_proto *ap) static bool sae_auth_timeout(struct auth_proto *ap)
{ {
struct sae_sm *sm = l_container_of(ap, struct sae_sm, ap); struct sae_sm *sm = l_container_of(ap, struct sae_sm, ap);
@ -699,6 +701,20 @@ static bool sae_timeout(struct auth_proto *ap)
return true; return true;
} }
static bool sae_assoc_timeout(struct auth_proto *ap)
{
struct sae_sm *sm = l_container_of(ap, struct sae_sm, ap);
if (sm->assoc_retry >= SAE_MAX_ASSOC_RETRY)
return false;
sm->assoc_retry++;
sm->tx_assoc(sm->user_data);
return true;
}
/* /*
* 802.11-2016 - Section 12.4.8.6.4 * 802.11-2016 - Section 12.4.8.6.4
* If the Status code is ANTI_CLOGGING_TOKEN_REQUIRED, a new SAE Commit message * If the Status code is ANTI_CLOGGING_TOKEN_REQUIRED, a new SAE Commit message
@ -1178,7 +1194,8 @@ struct auth_proto *sae_sm_new(struct handshake_state *hs,
sm->ap.free = sae_free; sm->ap.free = sae_free;
sm->ap.rx_authenticate = sae_rx_authenticate; sm->ap.rx_authenticate = sae_rx_authenticate;
sm->ap.rx_associate = sae_rx_associate; sm->ap.rx_associate = sae_rx_associate;
sm->ap.auth_timeout = sae_timeout; sm->ap.auth_timeout = sae_auth_timeout;
sm->ap.assoc_timeout = sae_assoc_timeout;
return &sm->ap; return &sm->ap;
} }