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

Fixed MFP Association Comeback mechanism to use Timeout Interval IE

Browse source 
The separate Association Comeback Time IE was removed from IEEE 802.11w
and the Timeout Interval IE (from IEEE 802.11r) is used instead. The
editing on this is still somewhat incomplete in IEEE 802.11w/D7.0, but
still, the use of Timeout Interval IE is the expected mechanism.
This commit is contained in:
Jouni Malinen 2009-01-19 18:42:10 +02:00 committed by Jouni Malinen
parent 476621644c
commit adddffd129
5 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
hostapd/ieee802_11.c
View file

@ -301,8 +301,9 @@ static u8 * hostapd_eid_assoc_comeback_time(struct hostapd_data *hapd,
u32 timeout, tu; u32 timeout, tu;
struct os_time now, passed; struct os_time now, passed;
*pos++ = WLAN_EID_ASSOC_COMEBACK_TIME; *pos++ = WLAN_EID_TIMEOUT_INTERVAL;
*pos++ = 4; *pos++ = 5;
*pos++ = WLAN_TIMEOUT_ASSOC_COMEBACK;
os_get_time(&now); os_get_time(&now);
os_time_sub(&now, &sta->sa_query_start, &passed); os_time_sub(&now, &sta->sa_query_start, &passed);
tu = (passed.sec * 1000000 + passed.usec) / 1024; tu = (passed.sec * 1000000 + passed.usec) / 1024;

8
src/common/ieee802_11_common.c
View file

@ -219,6 +219,10 @@ ParseRes ieee802_11_parse_elems(u8 *start, size_t len,
elems->ftie = pos; elems->ftie = pos;
elems->ftie_len = elen; elems->ftie_len = elen;
break; break;
case WLAN_EID_TIMEOUT_INTERVAL:
elems->timeout_int = pos;
elems->timeout_int_len = elen;
break;
case WLAN_EID_HT_CAP: case WLAN_EID_HT_CAP:
elems->ht_capabilities = pos; elems->ht_capabilities = pos;
elems->ht_capabilities_len = elen; elems->ht_capabilities_len = elen;
@ -227,10 +231,6 @@ ParseRes ieee802_11_parse_elems(u8 *start, size_t len,
elems->ht_operation = pos; elems->ht_operation = pos;
elems->ht_operation_len = elen; elems->ht_operation_len = elen;
break; break;
case WLAN_EID_ASSOC_COMEBACK_TIME:
elems->assoc_comeback = pos;
elems->assoc_comeback_len = elen;
break;
default: default:
unknown++; unknown++;
if (!show_errors) if (!show_errors)

4
src/common/ieee802_11_common.h
View file

@ -55,12 +55,12 @@ struct ieee802_11_elems {
u8 mdie_len; u8 mdie_len;
u8 *ftie; u8 *ftie;
u8 ftie_len; u8 ftie_len;
u8 *timeout_int;
u8 timeout_int_len;
u8 *ht_capabilities; u8 *ht_capabilities;
u8 ht_capabilities_len; u8 ht_capabilities_len;
u8 *ht_operation; u8 *ht_operation;
u8 ht_operation_len; u8 ht_operation_len;
u8 *assoc_comeback;
u8 assoc_comeback_len;
u8 *vendor_ht_cap; u8 *vendor_ht_cap;
u8 vendor_ht_cap_len; u8 vendor_ht_cap_len;
}; };

6
src/common/ieee802_11_defs.h
View file

@ -203,7 +203,6 @@
#define WLAN_EID_20_40_BSS_INTOLERANT 73 #define WLAN_EID_20_40_BSS_INTOLERANT 73
#define WLAN_EID_OVERLAPPING_BSS_SCAN_PARAMS 74 #define WLAN_EID_OVERLAPPING_BSS_SCAN_PARAMS 74
#define WLAN_EID_MMIE 76 #define WLAN_EID_MMIE 76
#define WLAN_EID_ASSOC_COMEBACK_TIME 77
#define WLAN_EID_VENDOR_SPECIFIC 221 #define WLAN_EID_VENDOR_SPECIFIC 221
@ -223,6 +222,11 @@
#define WLAN_SA_QUERY_TR_ID_LEN 16 #define WLAN_SA_QUERY_TR_ID_LEN 16
/* Timeout Interval Type */
#define WLAN_TIMEOUT_REASSOC_DEADLINE 1
#define WLAN_TIMEOUT_KEY_LIFETIME 2
#define WLAN_TIMEOUT_ASSOC_COMEBACK 3
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma pack(push, 1) #pragma pack(push, 1)

5
wpa_supplicant/mlme.c
View file

@ -1087,9 +1087,10 @@ static void ieee80211_rx_mgmt_assoc_resp(struct wpa_supplicant *wpa_s,
status_code); status_code);
#ifdef CONFIG_IEEE80211W #ifdef CONFIG_IEEE80211W
if (status_code == WLAN_STATUS_ASSOC_REJECTED_TEMPORARILY && if (status_code == WLAN_STATUS_ASSOC_REJECTED_TEMPORARILY &&
elems.assoc_comeback && elems.assoc_comeback_len == 4) { elems.timeout_int && elems.timeout_int_len == 5 &&
elems.timeout_int[0] == WLAN_TIMEOUT_ASSOC_COMEBACK) {
u32 tu, ms; u32 tu, ms;
tu = WPA_GET_LE32(elems.assoc_comeback); tu = WPA_GET_LE32(elems.timeout_int + 1);
ms = tu * 1024 / 1000; ms = tu * 1024 / 1000;
wpa_printf(MSG_DEBUG, "MLME: AP rejected association " wpa_printf(MSG_DEBUG, "MLME: AP rejected association "
"temporarily; comeback duration %u TU " "temporarily; comeback duration %u TU "