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

WNM: Use defined macros for WNM-Sleep Mode Action Type values (AP)

Browse source 
Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2012-12-16 19:20:02 +02:00
parent c79938a584
commit 615a5d559d
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/ap/wnm_ap.c
View file

@ -56,8 +56,8 @@ static int ieee802_11_send_wnmsleep_resp(struct hostapd_data *hapd,
u16 wnmtfs_ie_len; u16 wnmtfs_ie_len;
u8 *pos; u8 *pos;
struct sta_info *sta; struct sta_info *sta;
enum wnm_oper tfs_oper = action_type == 0 ? WNM_SLEEP_TFS_RESP_IE_ADD : enum wnm_oper tfs_oper = action_type == WNM_SLEEP_MODE_ENTER ?
WNM_SLEEP_TFS_RESP_IE_NONE; WNM_SLEEP_TFS_RESP_IE_ADD : WNM_SLEEP_TFS_RESP_IE_NONE;
sta = ap_get_sta(hapd, addr); sta = ap_get_sta(hapd, addr);
if (sta == NULL) { if (sta == NULL) {
@ -104,7 +104,8 @@ static int ieee802_11_send_wnmsleep_resp(struct hostapd_data *hapd,
mgmt->u.action.u.wnm_sleep_resp.dialogtoken = dialog_token; mgmt->u.action.u.wnm_sleep_resp.dialogtoken = dialog_token;
pos = (u8 *)mgmt->u.action.u.wnm_sleep_resp.variable; pos = (u8 *)mgmt->u.action.u.wnm_sleep_resp.variable;
/* add key data if MFP is enabled */ /* add key data if MFP is enabled */
if (wpa_auth_uses_mfp(sta->wpa_sm) || action_type != 1){ if (wpa_auth_uses_mfp(sta->wpa_sm) ||
action_type != WNM_SLEEP_MODE_EXIT) {
mgmt->u.action.u.wnm_sleep_resp.keydata_len = 0; mgmt->u.action.u.wnm_sleep_resp.keydata_len = 0;
} else { } else {
gtk_elem_len = wpa_wnmsleep_gtk_subelem(sta->wpa_sm, pos); gtk_elem_len = wpa_wnmsleep_gtk_subelem(sta->wpa_sm, pos);
@ -151,7 +152,7 @@ static int ieee802_11_send_wnmsleep_resp(struct hostapd_data *hapd,
* WNM Sleep * WNM Sleep
*/ */
if (wnmsleep_ie.status == WNM_STATUS_SLEEP_ACCEPT && if (wnmsleep_ie.status == WNM_STATUS_SLEEP_ACCEPT &&
wnmsleep_ie.action_type == 0) { wnmsleep_ie.action_type == WNM_SLEEP_MODE_ENTER) {
hostapd_drv_wnm_oper(hapd, WNM_SLEEP_ENTER_CONFIRM, hostapd_drv_wnm_oper(hapd, WNM_SLEEP_ENTER_CONFIRM,
addr, NULL, NULL); addr, NULL, NULL);
wpa_set_wnmsleep(sta->wpa_sm, 1); wpa_set_wnmsleep(sta->wpa_sm, 1);
@ -162,11 +163,12 @@ static int ieee802_11_send_wnmsleep_resp(struct hostapd_data *hapd,
* 3. unpause the node in driver * 3. unpause the node in driver
*/ */
if (wnmsleep_ie.status == WNM_STATUS_SLEEP_ACCEPT && if (wnmsleep_ie.status == WNM_STATUS_SLEEP_ACCEPT &&
wnmsleep_ie.action_type == 1) { wnmsleep_ie.action_type == WNM_SLEEP_MODE_EXIT) {
wpa_set_wnmsleep(sta->wpa_sm, 0); wpa_set_wnmsleep(sta->wpa_sm, 0);
hostapd_drv_wnm_oper(hapd, WNM_SLEEP_EXIT_CONFIRM, hostapd_drv_wnm_oper(hapd, WNM_SLEEP_EXIT_CONFIRM,
addr, NULL, NULL); addr, NULL, NULL);
if (wpa_auth_uses_mfp(sta->wpa_sm) && action_type == 1) if (wpa_auth_uses_mfp(sta->wpa_sm) &&
action_type == WNM_SLEEP_MODE_EXIT)
wpa_wnmsleep_rekey_gtk(sta->wpa_sm); wpa_wnmsleep_rekey_gtk(sta->wpa_sm);
} }
} else } else
@ -214,8 +216,9 @@ static void ieee802_11_rx_wnmsleep_req(struct hostapd_data *hapd,
return; return;
} }
if (wnmsleep_ie->action_type == 0 && tfsreq_ie_start && if (wnmsleep_ie->action_type == WNM_SLEEP_MODE_ENTER &&
tfsreq_ie_end && tfsreq_ie_end - tfsreq_ie_start >= 0) { tfsreq_ie_start && tfsreq_ie_end &&
tfsreq_ie_end - tfsreq_ie_start >= 0) {
tfsreq_ie_len = (tfsreq_ie_end + tfsreq_ie_end[1] + 2) - tfsreq_ie_len = (tfsreq_ie_end + tfsreq_ie_end[1] + 2) -
tfsreq_ie_start; tfsreq_ie_start;
wpa_printf(MSG_DEBUG, "TFS Req IE(s) found"); wpa_printf(MSG_DEBUG, "TFS Req IE(s) found");
@ -230,7 +233,7 @@ static void ieee802_11_rx_wnmsleep_req(struct hostapd_data *hapd,
wnmsleep_ie->action_type, wnmsleep_ie->action_type,
wnmsleep_ie->intval); wnmsleep_ie->intval);
if (wnmsleep_ie->action_type == 1) { if (wnmsleep_ie->action_type == WNM_SLEEP_MODE_EXIT) {
/* clear the tfs after sending the resp frame */ /* clear the tfs after sending the resp frame */
ieee80211_11_set_tfs_ie(hapd, addr, tfsreq_ie_start, ieee80211_11_set_tfs_ie(hapd, addr, tfsreq_ie_start,
&tfsreq_ie_len, WNM_SLEEP_TFS_IE_DEL); &tfsreq_ie_len, WNM_SLEEP_TFS_IE_DEL);