DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

MSCS: Use a define for the MSCS Descriptor element fixed field length

Browse source 
Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2024-01-14 11:06:06 +02:00
parent 6aa16abbe4
commit db036b5345
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
wpa_supplicant/robust_av.c
View file

@ -664,6 +664,10 @@ void free_up_scs_desc(struct scs_robust_av_data *data)
} }
/* Element ID Extension(1) + Request Type(1) + User Priority Control(2) +
* Stream Timeout(4) */
#define MSCS_DESCRIPTOR_FIXED_LEN 8
void wpas_handle_robust_av_recv_action(struct wpa_supplicant *wpa_s, void wpas_handle_robust_av_recv_action(struct wpa_supplicant *wpa_s,
const u8 *src, const u8 *buf, size_t len) const u8 *src, const u8 *buf, size_t len)
{ {
@ -700,13 +704,12 @@ void wpas_handle_assoc_resp_mscs(struct wpa_supplicant *wpa_s, const u8 *bssid,
return; return;
mscs_desc_ie = get_ie_ext(ies, ies_len, WLAN_EID_EXT_MSCS_DESCRIPTOR); mscs_desc_ie = get_ie_ext(ies, ies_len, WLAN_EID_EXT_MSCS_DESCRIPTOR);
if (!mscs_desc_ie || mscs_desc_ie[1] <= 8) if (!mscs_desc_ie || mscs_desc_ie[1] <= MSCS_DESCRIPTOR_FIXED_LEN)
return; return;
/* Subelements start after (ie_id(1) + ie_len(1) + ext_id(1) + /* Subelements start after element header and fixed fields */
* request type(1) + upc(2) + stream timeout(4) =) 10. mscs_status = get_ie(&mscs_desc_ie[2 + MSCS_DESCRIPTOR_FIXED_LEN],
*/ mscs_desc_ie[1] - MSCS_DESCRIPTOR_FIXED_LEN,
mscs_status = get_ie(&mscs_desc_ie[10], mscs_desc_ie[1] - 8,
MCSC_SUBELEM_STATUS); MCSC_SUBELEM_STATUS);
if (!mscs_status || mscs_status[1] < 2) if (!mscs_status || mscs_status[1] < 2)
return; return;