jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

TDLS: Disable link on various error cases

Browse source 
This is needed to be able to return back to AP path on error cases.
This commit is contained in:
Jouni Malinen 2011-10-27 23:13:54 +03:00 committed by Jouni Malinen
parent db9af0da70
commit c581201493
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/rsn_supp/tdls.c
View file

@ -1727,6 +1727,8 @@ static int wpa_tdls_process_tpk_m2(struct wpa_sm *sm, const u8 *src_addr,
if (status != WLAN_STATUS_SUCCESS) { if (status != WLAN_STATUS_SUCCESS) {
wpa_printf(MSG_INFO, "TDLS: Status code in TPK M2: %u", wpa_printf(MSG_INFO, "TDLS: Status code in TPK M2: %u",
status); status);
if (sm->tdls_external_setup)
wpa_sm_tdls_oper(sm, TDLS_DISABLE_LINK, src_addr);
return -1; return -1;
} }
@ -1867,6 +1869,8 @@ static int wpa_tdls_process_tpk_m2(struct wpa_sm *sm, const u8 *src_addr,
/* Discard the frame */ /* Discard the frame */
wpa_tdls_del_key(sm, peer); wpa_tdls_del_key(sm, peer);
wpa_tdls_peer_free(sm, peer); wpa_tdls_peer_free(sm, peer);
if (sm->tdls_external_setup)
wpa_sm_tdls_oper(sm, TDLS_DISABLE_LINK, src_addr);
return -1; return -1;
} }
@ -1886,6 +1890,8 @@ skip_rsn:
error: error:
wpa_tdls_send_error(sm, src_addr, WLAN_TDLS_SETUP_CONFIRM, dtoken, wpa_tdls_send_error(sm, src_addr, WLAN_TDLS_SETUP_CONFIRM, dtoken,
status); status);
if (sm->tdls_external_setup)
wpa_sm_tdls_oper(sm, TDLS_DISABLE_LINK, src_addr);
return -1; return -1;
} }
@ -1926,6 +1932,8 @@ static int wpa_tdls_process_tpk_m3(struct wpa_sm *sm, const u8 *src_addr,
if (status != 0) { if (status != 0) {
wpa_printf(MSG_INFO, "TDLS: Status code in TPK M3: %u", wpa_printf(MSG_INFO, "TDLS: Status code in TPK M3: %u",
status); status);
if (sm->tdls_external_setup)
wpa_sm_tdls_oper(sm, TDLS_DISABLE_LINK, src_addr);
return -1; return -1;
} }
pos += 2 /* status code */ + 1 /* dialog token */; pos += 2 /* status code */ + 1 /* dialog token */;
@ -1998,6 +2006,8 @@ static int wpa_tdls_process_tpk_m3(struct wpa_sm *sm, const u8 *src_addr,
if (lifetime != peer->lifetime) { if (lifetime != peer->lifetime) {
wpa_printf(MSG_INFO, "TDLS: Unexpected TPK lifetime %u in " wpa_printf(MSG_INFO, "TDLS: Unexpected TPK lifetime %u in "
"TPK M3 (expected %u)", lifetime, peer->lifetime); "TPK M3 (expected %u)", lifetime, peer->lifetime);
if (sm->tdls_external_setup)
wpa_sm_tdls_oper(sm, TDLS_DISABLE_LINK, src_addr);
return -1; return -1;
} }