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

Make hostapd_eid_wmm_valid() return more logical return values

Browse source 
Return 1/0 instead 0/-1 to indicate valid/invalid element so that
the if statement makes more sense with !wmm_valid().

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2011-12-17 12:41:00 +02:00
parent 5d06163714
commit c84b868a71
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ap/ieee802_11.c
View file

@ -555,7 +555,7 @@ static u16 check_wmm(struct hostapd_data *hapd, struct sta_info *sta,
if (wmm_ie && hapd->conf->wmm_enabled) { if (wmm_ie && hapd->conf->wmm_enabled) {
struct wmm_information_element *wmm; struct wmm_information_element *wmm;
if (hostapd_eid_wmm_valid(hapd, wmm_ie, wmm_ie_len)) { if (!hostapd_eid_wmm_valid(hapd, wmm_ie, wmm_ie_len)) {
hostapd_logger(hapd, sta->addr, hostapd_logger(hapd, sta->addr,
HOSTAPD_MODULE_WPA, HOSTAPD_MODULE_WPA,
HOSTAPD_LEVEL_DEBUG, HOSTAPD_LEVEL_DEBUG,

14
src/ap/wmm.c
View file

@ -98,9 +98,11 @@ u8 * hostapd_eid_wmm(struct hostapd_data *hapd, u8 *eid)
} }
/* This function is called when a station sends an association request with /*
* WMM info element. The function returns zero on success or non-zero on any * This function is called when a station sends an association request with
* error in WMM element. eid does not include Element ID and Length octets. */ * WMM info element. The function returns 1 on success or 0 on any error in WMM
* element. eid does not include Element ID and Length octets.
*/
int hostapd_eid_wmm_valid(struct hostapd_data *hapd, const u8 *eid, size_t len) int hostapd_eid_wmm_valid(struct hostapd_data *hapd, const u8 *eid, size_t len)
{ {
struct wmm_information_element *wmm; struct wmm_information_element *wmm;
@ -110,7 +112,7 @@ int hostapd_eid_wmm_valid(struct hostapd_data *hapd, const u8 *eid, size_t len)
if (len < sizeof(struct wmm_information_element)) { if (len < sizeof(struct wmm_information_element)) {
wpa_printf(MSG_DEBUG, "Too short WMM IE (len=%lu)", wpa_printf(MSG_DEBUG, "Too short WMM IE (len=%lu)",
(unsigned long) len); (unsigned long) len);
return -1; return 0;
} }
wmm = (struct wmm_information_element *) eid; wmm = (struct wmm_information_element *) eid;
@ -121,10 +123,10 @@ int hostapd_eid_wmm_valid(struct hostapd_data *hapd, const u8 *eid, size_t len)
if (wmm->oui_subtype != WMM_OUI_SUBTYPE_INFORMATION_ELEMENT || if (wmm->oui_subtype != WMM_OUI_SUBTYPE_INFORMATION_ELEMENT ||
wmm->version != WMM_VERSION) { wmm->version != WMM_VERSION) {
wpa_printf(MSG_DEBUG, "Unsupported WMM IE Subtype/Version"); wpa_printf(MSG_DEBUG, "Unsupported WMM IE Subtype/Version");
return -1; return 0;
} }
return 0; return 1;
} }