WNM: Use defines for BSS Trans Mgmt field values

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

diff --git a/src/common/ieee802_11_defs.h b/src/common/ieee802_11_defs.h
index 0848590258b4b6a2032c728513eebdfa25956cd9..137c30909e5233274a0f3c4960d334ddaa488a23 100644 (file)
--- a/src/common/ieee802_11_defs.h
+++ b/src/common/ieee802_11_defs.h
@@ -1057,6 +1057,19 @@ enum wnm_action {
 #define WNM_BSS_TM_REQ_BSS_TERMINATION_INCLUDED BIT(3)
 #define WNM_BSS_TM_REQ_ESS_DISASSOC_IMMINENT BIT(4)
 
+/* IEEE Std 802.11-2012 - Table 8-253 */
+enum bss_trans_mgmt_status_code {
+       WNM_BSS_TM_ACCEPT = 0,
+       WNM_BSS_TM_REJECT_UNSPECIFIED = 1,
+       WNM_BSS_TM_REJECT_INSUFFICIENT_BEACON = 2,
+       WNM_BSS_TM_REJECT_INSUFFICIENT_CAPABITY = 3,
+       WNM_BSS_TM_REJECT_UNDESIRED = 4,
+       WNM_BSS_TM_REJECT_DELAY_REQUEST = 5,
+       WNM_BSS_TM_REJECT_STA_CANDIDATE_LIST_PROVIDED = 6,
+       WNM_BSS_TM_REJECT_NO_SUITABLE_CANDIDATES = 7,
+       WNM_BSS_TM_REJECT_LEAVING_ESS = 8
+};
+
 #define WNM_NEIGHBOR_TSF                         1
 #define WNM_NEIGHBOR_CONDENSED_COUNTRY_STRING    2
 #define WNM_NEIGHBOR_BSS_TRANSITION_CANDIDATE    3

diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c
index 7de96c541c2778d1ebd4da770ef347f70879586a..f679209b3b009dc73619bef7603b923b6eee3c04 100644 (file)
--- a/wpa_supplicant/wnm_sta.c
+++ b/wpa_supplicant/wnm_sta.c
@@ -491,9 +491,10 @@ static int compare_scan_neighbor_results(struct wpa_supplicant *wpa_s,
 }
 
 
-static void wnm_send_bss_transition_mgmt_resp(struct wpa_supplicant *wpa_s,
-                                             u8 dialog_token, u8 status,
-                                             u8 delay, const u8 *target_bssid)
+static void wnm_send_bss_transition_mgmt_resp(
+       struct wpa_supplicant *wpa_s, u8 dialog_token,
+       enum bss_trans_mgmt_status_code status, u8 delay,
+       const u8 *target_bssid)
 {
        u8 buf[1000], *pos;
        struct ieee80211_mgmt *mgmt;
@@ -559,7 +560,7 @@ void wnm_scan_response(struct wpa_supplicant *wpa_s,
                if (wpa_s->wnm_reply) {
                        wnm_send_bss_transition_mgmt_resp(wpa_s,
                                                  wpa_s->wnm_dialog_token,
-                                                 0, /* Accept */
+                                                 WNM_BSS_TM_ACCEPT,
                                                  0, NULL);
                }
 
@@ -575,7 +576,7 @@ send_bss_resp_fail:
        if (wpa_s->wnm_reply) {
                wnm_send_bss_transition_mgmt_resp(wpa_s,
                                                  wpa_s->wnm_dialog_token,
-                                                 1 /* Reject - unspecified */,
+                                                 WNM_BSS_TM_REJECT_UNSPECIFIED,
                                                  0, NULL);
        }
        return;
@@ -603,7 +604,7 @@ static void ieee802_11_rx_bss_trans_mgmt_req(struct wpa_supplicant *wpa_s,
 
        pos += 5;
 
-       if (wpa_s->wnm_mode & 0x08) {
+       if (wpa_s->wnm_mode & WNM_BSS_TM_REQ_BSS_TERMINATION_INCLUDED) {
                if (pos + 12 > end) {
                        wpa_printf(MSG_DEBUG, "WNM: Too short BSS TM Request");
                        return;
@@ -612,7 +613,7 @@ static void ieee802_11_rx_bss_trans_mgmt_req(struct wpa_supplicant *wpa_s,
                pos += 12; /* BSS Termination Duration */
        }
 
-       if (wpa_s->wnm_mode & 0x10) {
+       if (wpa_s->wnm_mode & WNM_BSS_TM_REQ_ESS_DISASSOC_IMMINENT) {
                char url[256];
                if (pos + 1 > end || pos + 1 + pos[0] > end) {
                        wpa_printf(MSG_DEBUG, "WNM: Invalid BSS Transition "
@@ -626,7 +627,7 @@ static void ieee802_11_rx_bss_trans_mgmt_req(struct wpa_supplicant *wpa_s,
                        "session_info_url=%s", url);
        }
 
-       if (wpa_s->wnm_mode & 0x04) {
+       if (wpa_s->wnm_mode & WNM_BSS_TM_REQ_DISASSOC_IMMINENT) {
                wpa_msg(wpa_s, MSG_INFO, "WNM: Disassociation Imminent - "
                        "Disassociation Timer %u", wpa_s->wnm_dissoc_timer);
                if (wpa_s->wnm_dissoc_timer && !wpa_s->scanning) {
@@ -637,7 +638,7 @@ static void ieee802_11_rx_bss_trans_mgmt_req(struct wpa_supplicant *wpa_s,
                }
        }
 
-       if (wpa_s->wnm_mode & 0x01) {
+       if (wpa_s->wnm_mode & WNM_BSS_TM_REQ_PREF_CAND_LIST_INCLUDED) {
                wpa_msg(wpa_s, MSG_INFO, "WNM: Preferred List Available");
                wpa_s->wnm_num_neighbor_report = 0;
                os_free(wpa_s->wnm_neighbor_report_elements);
@@ -675,7 +676,7 @@ static void ieee802_11_rx_bss_trans_mgmt_req(struct wpa_supplicant *wpa_s,
                        "Request Mode is zero");
                wnm_send_bss_transition_mgmt_resp(wpa_s,
                                                  wpa_s->wnm_dialog_token,
-                                                 1 /* Reject - unspecified */,
+                                                 WNM_BSS_TM_REJECT_UNSPECIFIED,
                                                  0, NULL);
        }
 }