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

mka: Share a single delete mka implementation

Browse source 
Share mka deletion implementation in ieee802_1x_participant_timer() for
the cak_life and mka_life expiration cases.

Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
This commit is contained in:
Sabrina Dubroca 2016-08-15 11:43:42 +02:00 committed by Jouni Malinen
parent 0dabf79b5d
commit 34dbe90ac5
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/pae/ieee802_1x_kay.c
View file

@ -2359,27 +2359,16 @@ static void ieee802_1x_participant_timer(void *eloop_ctx, void *timeout_ctx)
participant = (struct ieee802_1x_mka_participant *)eloop_ctx; participant = (struct ieee802_1x_mka_participant *)eloop_ctx;
kay = participant->kay; kay = participant->kay;
if (participant->cak_life) { if (participant->cak_life) {
if (now > participant->cak_life) { if (now > participant->cak_life)
kay->authenticated = FALSE; goto delete_mka;
kay->secured = FALSE;
kay->failed = TRUE;
ieee802_1x_kay_delete_mka(kay, &participant->ckn);
return;
}
} }
/* should delete MKA instance if there are not live peers /* should delete MKA instance if there are not live peers
* when the MKA life elapsed since its creating */ * when the MKA life elapsed since its creating */
if (participant->mka_life) { if (participant->mka_life) {
if (dl_list_empty(&participant->live_peers)) { if (dl_list_empty(&participant->live_peers)) {
if (now > participant->mka_life) { if (now > participant->mka_life)
kay->authenticated = FALSE; goto delete_mka;
kay->secured = FALSE;
kay->failed = TRUE;
ieee802_1x_kay_delete_mka(kay,
&participant->ckn);
return;
}
} else { } else {
participant->mka_life = 0; participant->mka_life = 0;
} }
@ -2467,6 +2456,14 @@ static void ieee802_1x_participant_timer(void *eloop_ctx, void *timeout_ctx)
eloop_register_timeout(MKA_HELLO_TIME / 1000, 0, eloop_register_timeout(MKA_HELLO_TIME / 1000, 0,
ieee802_1x_participant_timer, ieee802_1x_participant_timer,
participant, NULL); participant, NULL);
return;
delete_mka:
kay->authenticated = FALSE;
kay->secured = FALSE;
kay->failed = TRUE;
ieee802_1x_kay_delete_mka(kay, &participant->ckn);
} }