diff options
author | sam <sam@FreeBSD.org> | 2005-06-13 17:07:31 +0000 |
---|---|---|
committer | sam <sam@FreeBSD.org> | 2005-06-13 17:07:31 +0000 |
commit | 8637a9a96a3234373c579f38823195a69b770e84 (patch) | |
tree | 0f94fc92605c2c3570cbf9c5d46a01c7fb65bbf6 /contrib/hostapd/eapol_sm.c | |
parent | ef42ed26e06c009171784bf0997f11217b9834eb (diff) | |
download | FreeBSD-src-8637a9a96a3234373c579f38823195a69b770e84.zip FreeBSD-src-8637a9a96a3234373c579f38823195a69b770e84.tar.gz |
resolve merge conflicts
Approved by: re (dwhite)
Diffstat (limited to 'contrib/hostapd/eapol_sm.c')
-rw-r--r-- | contrib/hostapd/eapol_sm.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/contrib/hostapd/eapol_sm.c b/contrib/hostapd/eapol_sm.c index 2ae1754..50c645a 100644 --- a/contrib/hostapd/eapol_sm.c +++ b/contrib/hostapd/eapol_sm.c @@ -767,22 +767,22 @@ restart: prev_ctrl_dir = sm->ctrl_dir.state; SM_STEP_RUN(AUTH_PAE); - if (!eapol_sm_sta_entry_alive(hapd, addr)) + if (!sm->initializing && !eapol_sm_sta_entry_alive(hapd, addr)) break; SM_STEP_RUN(BE_AUTH); - if (!eapol_sm_sta_entry_alive(hapd, addr)) + if (!sm->initializing && !eapol_sm_sta_entry_alive(hapd, addr)) break; SM_STEP_RUN(REAUTH_TIMER); - if (!eapol_sm_sta_entry_alive(hapd, addr)) + if (!sm->initializing && !eapol_sm_sta_entry_alive(hapd, addr)) break; SM_STEP_RUN(AUTH_KEY_TX); - if (!eapol_sm_sta_entry_alive(hapd, addr)) + if (!sm->initializing && !eapol_sm_sta_entry_alive(hapd, addr)) break; SM_STEP_RUN(KEY_RX); - if (!eapol_sm_sta_entry_alive(hapd, addr)) + if (!sm->initializing && !eapol_sm_sta_entry_alive(hapd, addr)) break; SM_STEP_RUN(CTRL_DIR); - if (!eapol_sm_sta_entry_alive(hapd, addr)) + if (!sm->initializing && !eapol_sm_sta_entry_alive(hapd, addr)) break; } while (prev_auth_pae != sm->auth_pae.state || prev_be_auth != sm->be_auth.state || @@ -803,12 +803,14 @@ restart: void eapol_sm_initialize(struct eapol_state_machine *sm) { + sm->initializing = TRUE; /* Initialize the state machines by asserting initialize and then * deasserting it after one step */ sm->initialize = TRUE; eapol_sm_step(sm); sm->initialize = FALSE; eapol_sm_step(sm); + sm->initializing = FALSE; /* Start one second tick for port timers state machine */ eloop_cancel_timeout(eapol_port_timers_tick, sm->hapd, sm); |