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

FST: Remove the IE header len/size macros

Browse source 
These are confusing when the style used with the couple of FST IE checks
differs from the rest of hostapd/wpa_supplicant implementation.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2015-07-17 18:36:03 +03:00 committed by Jouni Malinen
parent f5f1cc9307
commit 9721b083f4
3 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/common/ieee802_11_common.c
View file

@ -960,17 +960,14 @@ const char * fc2str(u16 fc)
} }
#define IE_HEADER_SIZE ((u8) (2 * sizeof(u8)))
#define IE_BUFFER_LENGTH(ie_len_val) ((ie_len_val) + IE_HEADER_SIZE)
int mb_ies_info_by_ies(struct mb_ies_info *info, const u8 *ies_buf, int mb_ies_info_by_ies(struct mb_ies_info *info, const u8 *ies_buf,
size_t ies_len) size_t ies_len)
{ {
os_memset(info, 0, sizeof(*info)); os_memset(info, 0, sizeof(*info));
while (ies_buf && ies_len >= IE_HEADER_SIZE && while (ies_buf && ies_len >= 2 &&
info->nof_ies < MAX_NOF_MB_IES_SUPPORTED) { info->nof_ies < MAX_NOF_MB_IES_SUPPORTED) {
size_t len = IE_BUFFER_LENGTH(ies_buf[1]); size_t len = 2 + ies_buf[1];
if (len > ies_len) { if (len > ies_len) {
wpa_hexdump(MSG_DEBUG, "Truncated IEs", wpa_hexdump(MSG_DEBUG, "Truncated IEs",
@ -980,7 +977,7 @@ int mb_ies_info_by_ies(struct mb_ies_info *info, const u8 *ies_buf,
if (ies_buf[0] == WLAN_EID_MULTI_BAND) { if (ies_buf[0] == WLAN_EID_MULTI_BAND) {
wpa_printf(MSG_DEBUG, "MB IE of %zu bytes found", len); wpa_printf(MSG_DEBUG, "MB IE of %zu bytes found", len);
info->ies[info->nof_ies].ie = ies_buf + IE_HEADER_SIZE; info->ies[info->nof_ies].ie = ies_buf + 2;
info->ies[info->nof_ies].ie_len = ies_buf[1]; info->ies[info->nof_ies].ie_len = ies_buf[1];
info->nof_ies++; info->nof_ies++;
} }
@ -1004,7 +1001,7 @@ struct wpabuf * mb_ies_by_info(struct mb_ies_info *info)
size_t mb_ies_size = 0; size_t mb_ies_size = 0;
for (i = 0; i < info->nof_ies; i++) for (i = 0; i < info->nof_ies; i++)
mb_ies_size += IE_BUFFER_LENGTH(info->ies[i].ie_len); mb_ies_size += 2 + info->ies[i].ie_len;
mb_ies = wpabuf_alloc(mb_ies_size); mb_ies = wpabuf_alloc(mb_ies_size);
if (mb_ies) { if (mb_ies) {

20
src/fst/fst_group.c
View file

@ -41,11 +41,11 @@ static void fst_dump_mb_ies(const char *group_id, const char *ifname,
const u8 *p = wpabuf_head(mbies); const u8 *p = wpabuf_head(mbies);
size_t s = wpabuf_len(mbies); size_t s = wpabuf_len(mbies);
while (s >= offsetof(struct multi_band_ie, mb_ctrl)) { while (s >= 2) {
const struct multi_band_ie *mbie = const struct multi_band_ie *mbie =
(const struct multi_band_ie *) p; (const struct multi_band_ie *) p;
WPA_ASSERT(mbie->eid == WLAN_EID_MULTI_BAND); WPA_ASSERT(mbie->eid == WLAN_EID_MULTI_BAND);
WPA_ASSERT(IE_BUFFER_LENGTH(mbie->len) >= sizeof(*mbie)); WPA_ASSERT(2 + mbie->len >= sizeof(*mbie));
fst_printf(MSG_WARNING, fst_printf(MSG_WARNING,
"%s: %s: mb_ctrl=%u band_id=%u op_class=%u chan=%u bssid=" "%s: %s: mb_ctrl=%u band_id=%u op_class=%u chan=%u bssid="
@ -61,8 +61,8 @@ static void fst_dump_mb_ies(const char *group_id, const char *ifname,
mbie->mb_connection_capability, mbie->mb_connection_capability,
mbie->fst_session_tmout); mbie->fst_session_tmout);
p += IE_BUFFER_LENGTH(mbie->len); p += 2 + mbie->len;
s -= IE_BUFFER_LENGTH(mbie->len); s -= 2 + mbie->len;
} }
} }
@ -81,7 +81,7 @@ static void fst_fill_mb_ie(struct wpabuf *buf, const u8 *bssid,
os_memset(mbie, 0, len); os_memset(mbie, 0, len);
mbie->eid = WLAN_EID_MULTI_BAND; mbie->eid = WLAN_EID_MULTI_BAND;
mbie->len = len - IE_HEADER_SIZE; mbie->len = len - 2;
#ifdef HOSTAPD #ifdef HOSTAPD
mbie->mb_ctrl = MB_STA_ROLE_AP; mbie->mb_ctrl = MB_STA_ROLE_AP;
mbie->mb_connection_capability = MB_CONNECTION_CAPABILITY_AP; mbie->mb_connection_capability = MB_CONNECTION_CAPABILITY_AP;
@ -211,7 +211,7 @@ static const u8 * fst_mbie_get_peer_addr(const struct multi_band_ie *mbie)
break; break;
case MB_STA_ROLE_NON_PCP_NON_AP: case MB_STA_ROLE_NON_PCP_NON_AP:
if (mbie->mb_ctrl & MB_CTRL_STA_MAC_PRESENT && if (mbie->mb_ctrl & MB_CTRL_STA_MAC_PRESENT &&
IE_BUFFER_LENGTH(mbie->len) >= sizeof(*mbie) + ETH_ALEN) (size_t) 2 + mbie->len >= sizeof(*mbie) + ETH_ALEN)
peer_addr = (const u8 *) &mbie[1]; peer_addr = (const u8 *) &mbie[1];
break; break;
default: default:
@ -229,12 +229,12 @@ fst_group_get_new_iface_by_mbie_and_band_id(struct fst_group *g,
u8 band_id, u8 band_id,
u8 *iface_peer_addr) u8 *iface_peer_addr)
{ {
while (mb_ies_size >= offsetof(struct multi_band_ie, mb_ctrl)) { while (mb_ies_size >= 2) {
const struct multi_band_ie *mbie = const struct multi_band_ie *mbie =
(const struct multi_band_ie *) mb_ies_buff; (const struct multi_band_ie *) mb_ies_buff;
if (mbie->eid != WLAN_EID_MULTI_BAND || if (mbie->eid != WLAN_EID_MULTI_BAND ||
IE_BUFFER_LENGTH(mbie->len) < sizeof(*mbie)) (size_t) 2 + mbie->len < sizeof(*mbie))
break; break;
if (mbie->band_id == band_id) { if (mbie->band_id == band_id) {
@ -255,8 +255,8 @@ fst_group_get_new_iface_by_mbie_and_band_id(struct fst_group *g,
break; break;
} }
mb_ies_buff += IE_BUFFER_LENGTH(mbie->len); mb_ies_buff += 2 + mbie->len;
mb_ies_size -= IE_BUFFER_LENGTH(mbie->len); mb_ies_size -= 2 + mbie->len;
} }
return NULL; return NULL;

3
src/fst/fst_internal.h
View file

@ -45,9 +45,6 @@ fst_hw_mode_to_band(enum hostapd_hw_mode mode)
} }
} }
#define IE_HEADER_SIZE ((u8) (2 * sizeof(u8)))
#define IE_BUFFER_LENGTH(ie_len_val) ((size_t) ((ie_len_val) + IE_HEADER_SIZE))
struct fst_ctrl_handle { struct fst_ctrl_handle {
struct fst_ctrl ctrl; struct fst_ctrl ctrl;
struct dl_list global_ctrls_lentry; struct dl_list global_ctrls_lentry;