Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2024-11-25 08:48:31 -05:00
Code Issues Projects Releases Wiki Activity

Remove some unnecessary EAPOL port (un)authorized callbacks

Browse Source 
If the port status did not change or would not need to get an update
after portEnabled changes, there is no need to try to set the driver to
use the same value it is already using based on the previous state.
Remove such calls to reduce number of operations during reassociation.
In addition, this cleans up the debug log by removing unnecessary
duplicated entries.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-01-02 23:28:28 +02:00
parent 949938aadf
commit 466bcf99c3
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/eapol_supp/eapol_supp_sm.c
View File

@ -137,6 +137,9 @@ struct eapol_sm {
Boolean cached_pmk; Boolean cached_pmk;
Boolean unicast_key_received, broadcast_key_received; Boolean unicast_key_received, broadcast_key_received;
Boolean force_authorized_update;
#ifdef CONFIG_EAP_PROXY #ifdef CONFIG_EAP_PROXY
Boolean use_eap_proxy; Boolean use_eap_proxy;
struct eap_proxy_sm *eap_proxy; struct eap_proxy_sm *eap_proxy;
@ -210,7 +213,6 @@ SM_STATE(SUPP_PAE, LOGOFF)
SM_ENTRY(SUPP_PAE, LOGOFF); SM_ENTRY(SUPP_PAE, LOGOFF);
eapol_sm_txLogoff(sm); eapol_sm_txLogoff(sm);
sm->logoffSent = TRUE; sm->logoffSent = TRUE;
sm->suppPortStatus = Unauthorized;
eapol_sm_set_port_unauthorized(sm); eapol_sm_set_port_unauthorized(sm);
} }
@ -221,7 +223,6 @@ SM_STATE(SUPP_PAE, DISCONNECTED)
sm->sPortMode = Auto; sm->sPortMode = Auto;
sm->startCount = 0; sm->startCount = 0;
sm->logoffSent = FALSE; sm->logoffSent = FALSE;
sm->suppPortStatus = Unauthorized;
eapol_sm_set_port_unauthorized(sm); eapol_sm_set_port_unauthorized(sm);
sm->suppAbort = TRUE; sm->suppAbort = TRUE;
@ -286,7 +287,6 @@ SM_STATE(SUPP_PAE, HELD)
SM_ENTRY(SUPP_PAE, HELD); SM_ENTRY(SUPP_PAE, HELD);
sm->heldWhile = sm->heldPeriod; sm->heldWhile = sm->heldPeriod;
eapol_enable_timer_tick(sm); eapol_enable_timer_tick(sm);
sm->suppPortStatus = Unauthorized;
eapol_sm_set_port_unauthorized(sm); eapol_sm_set_port_unauthorized(sm);
sm->cb_status = EAPOL_CB_FAILURE; sm->cb_status = EAPOL_CB_FAILURE;
} }
@ -295,7 +295,6 @@ SM_STATE(SUPP_PAE, HELD)
SM_STATE(SUPP_PAE, AUTHENTICATED) SM_STATE(SUPP_PAE, AUTHENTICATED)
{ {
SM_ENTRY(SUPP_PAE, AUTHENTICATED); SM_ENTRY(SUPP_PAE, AUTHENTICATED);
sm->suppPortStatus = Authorized;
eapol_sm_set_port_authorized(sm); eapol_sm_set_port_authorized(sm);
sm->cb_status = EAPOL_CB_SUCCESS; sm->cb_status = EAPOL_CB_SUCCESS;
} }
@ -311,7 +310,6 @@ SM_STATE(SUPP_PAE, RESTART)
SM_STATE(SUPP_PAE, S_FORCE_AUTH) SM_STATE(SUPP_PAE, S_FORCE_AUTH)
{ {
SM_ENTRY(SUPP_PAE, S_FORCE_AUTH); SM_ENTRY(SUPP_PAE, S_FORCE_AUTH);
sm->suppPortStatus = Authorized;
eapol_sm_set_port_authorized(sm); eapol_sm_set_port_authorized(sm);
sm->sPortMode = ForceAuthorized; sm->sPortMode = ForceAuthorized;
} }
@ -320,7 +318,6 @@ SM_STATE(SUPP_PAE, S_FORCE_AUTH)
SM_STATE(SUPP_PAE, S_FORCE_UNAUTH) SM_STATE(SUPP_PAE, S_FORCE_UNAUTH)
{ {
SM_ENTRY(SUPP_PAE, S_FORCE_UNAUTH); SM_ENTRY(SUPP_PAE, S_FORCE_UNAUTH);
sm->suppPortStatus = Unauthorized;
eapol_sm_set_port_unauthorized(sm); eapol_sm_set_port_unauthorized(sm);
sm->sPortMode = ForceUnauthorized; sm->sPortMode = ForceUnauthorized;
eapol_sm_txLogoff(sm); eapol_sm_txLogoff(sm);
@ -879,14 +876,24 @@ static void eapol_sm_step_timeout(void *eloop_ctx, void *timeout_ctx)
static void eapol_sm_set_port_authorized(struct eapol_sm *sm) static void eapol_sm_set_port_authorized(struct eapol_sm *sm)
{ {
if (sm->ctx->port_cb) int cb;
cb = sm->suppPortStatus != Authorized || sm->force_authorized_update;
sm->force_authorized_update = FALSE;
sm->suppPortStatus = Authorized;
if (cb && sm->ctx->port_cb)
sm->ctx->port_cb(sm->ctx->ctx, 1); sm->ctx->port_cb(sm->ctx->ctx, 1);
} }
static void eapol_sm_set_port_unauthorized(struct eapol_sm *sm) static void eapol_sm_set_port_unauthorized(struct eapol_sm *sm)
{ {
if (sm->ctx->port_cb) int cb;
cb = sm->suppPortStatus != Unauthorized || sm->force_authorized_update;
sm->force_authorized_update = FALSE;
sm->suppPortStatus = Unauthorized;
if (cb && sm->ctx->port_cb)
sm->ctx->port_cb(sm->ctx->ctx, 0); sm->ctx->port_cb(sm->ctx->ctx, 0);
} }
@ -1370,6 +1377,8 @@ void eapol_sm_notify_portEnabled(struct eapol_sm *sm, Boolean enabled)
return; return;
wpa_printf(MSG_DEBUG, "EAPOL: External notification - " wpa_printf(MSG_DEBUG, "EAPOL: External notification - "
"portEnabled=%d", enabled); "portEnabled=%d", enabled);
if (sm->portEnabled != enabled)
sm->force_authorized_update = TRUE;
sm->portEnabled = enabled; sm->portEnabled = enabled;
eapol_sm_step(sm); eapol_sm_step(sm);
} }
@ -1608,7 +1617,6 @@ static void eapol_sm_abort_cached(struct eapol_sm *sm)
return; return;
sm->cached_pmk = FALSE; sm->cached_pmk = FALSE;
sm->SUPP_PAE_state = SUPP_PAE_CONNECTING; sm->SUPP_PAE_state = SUPP_PAE_CONNECTING;
sm->suppPortStatus = Unauthorized;
eapol_sm_set_port_unauthorized(sm); eapol_sm_set_port_unauthorized(sm);
/* Make sure we do not start sending EAPOL-Start frames first, but /* Make sure we do not start sending EAPOL-Start frames first, but
@ -2002,6 +2010,7 @@ struct eapol_sm *eapol_sm_init(struct eapol_ctx *ctx)
#endif /* CONFIG_EAP_PROXY */ #endif /* CONFIG_EAP_PROXY */
/* Initialize EAPOL state machines */ /* Initialize EAPOL state machines */
sm->force_authorized_update = TRUE;
sm->initialize = TRUE; sm->initialize = TRUE;
eapol_sm_step(sm); eapol_sm_step(sm);
sm->initialize = FALSE; sm->initialize = FALSE;