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

Replace SSID_LEN with SSID_MAX_LEN 

This makes source code more consistent.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2015-04-07 12:59:29 +03:00 committed by Jouni Malinen
parent eaa8eefed1
commit d6c3067d32
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ap/wpa_auth.h
View File

@ -12,6 +12,7 @@
#include "common/defs.h" #include "common/defs.h"
#include "common/eapol_common.h" #include "common/eapol_common.h"
#include "common/wpa_common.h" #include "common/wpa_common.h"
#include "common/ieee802_11_defs.h"
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma pack(push, 1) #pragma pack(push, 1)
@ -146,8 +147,7 @@ struct wpa_auth_config {
int group_mgmt_cipher; int group_mgmt_cipher;
#endif /* CONFIG_IEEE80211W */ #endif /* CONFIG_IEEE80211W */
#ifdef CONFIG_IEEE80211R #ifdef CONFIG_IEEE80211R
#define SSID_LEN 32 u8 ssid[SSID_MAX_LEN];
u8 ssid[SSID_LEN];
size_t ssid_len; size_t ssid_len;
u8 mobility_domain[MOBILITY_DOMAIN_ID_LEN]; u8 mobility_domain[MOBILITY_DOMAIN_ID_LEN];
u8 r0_key_holder[FT_R0KH_ID_MAX_LEN]; u8 r0_key_holder[FT_R0KH_ID_MAX_LEN];

4
src/ap/wpa_auth_glue.c
View File

@ -54,8 +54,8 @@ static void hostapd_wpa_auth_conf(struct hostapd_bss_config *conf,
#endif /* CONFIG_IEEE80211W */ #endif /* CONFIG_IEEE80211W */
#ifdef CONFIG_IEEE80211R #ifdef CONFIG_IEEE80211R
wconf->ssid_len = conf->ssid.ssid_len; wconf->ssid_len = conf->ssid.ssid_len;
if (wconf->ssid_len > SSID_LEN) if (wconf->ssid_len > SSID_MAX_LEN)
wconf->ssid_len = SSID_LEN; wconf->ssid_len = SSID_MAX_LEN;
os_memcpy(wconf->ssid, conf->ssid.ssid, wconf->ssid_len); os_memcpy(wconf->ssid, conf->ssid.ssid, wconf->ssid_len);
os_memcpy(wconf->mobility_domain, conf->mobility_domain, os_memcpy(wconf->mobility_domain, conf->mobility_domain,
MOBILITY_DOMAIN_ID_LEN); MOBILITY_DOMAIN_ID_LEN);