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

ap: Use is_multicast_ether_addr() more

Browse source 
Various checks should use is_multicast_ether_addr() instead
of hardcoding the equivalent, change it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2016-08-16 15:06:59 +02:00 committed by Jouni Malinen
parent 647862eb60
commit 81372e347a
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/ap/ieee802_11.c
View file

@ -2557,8 +2557,9 @@ static int handle_action(struct hostapd_data *hapd,
"handle_action - unknown action category %d or invalid " "handle_action - unknown action category %d or invalid "
"frame", "frame",
mgmt->u.action.category); mgmt->u.action.category);
if (!(mgmt->da[0] & 0x01) && !(mgmt->u.action.category & 0x80) && if (!is_multicast_ether_addr(mgmt->da) &&
!(mgmt->sa[0] & 0x01)) { !(mgmt->u.action.category & 0x80) &&
!is_multicast_ether_addr(mgmt->sa)) {
struct ieee80211_mgmt *resp; struct ieee80211_mgmt *resp;
/* /*
@ -2901,7 +2902,7 @@ static void handle_deauth_cb(struct hostapd_data *hapd,
size_t len, int ok) size_t len, int ok)
{ {
struct sta_info *sta; struct sta_info *sta;
if (mgmt->da[0] & 0x01) if (is_multicast_ether_addr(mgmt->da))
return; return;
sta = ap_get_sta(hapd, mgmt->da); sta = ap_get_sta(hapd, mgmt->da);
if (!sta) { if (!sta) {
@ -2925,7 +2926,7 @@ static void handle_disassoc_cb(struct hostapd_data *hapd,
size_t len, int ok) size_t len, int ok)
{ {
struct sta_info *sta; struct sta_info *sta;
if (mgmt->da[0] & 0x01) if (is_multicast_ether_addr(mgmt->da))
return; return;
sta = ap_get_sta(hapd, mgmt->da); sta = ap_get_sta(hapd, mgmt->da);
if (!sta) { if (!sta) {
@ -3130,7 +3131,7 @@ void ieee802_11_rx_from_unknown(struct hostapd_data *hapd, const u8 *src,
wpa_printf(MSG_DEBUG, "Data/PS-poll frame from not associated STA " wpa_printf(MSG_DEBUG, "Data/PS-poll frame from not associated STA "
MACSTR, MAC2STR(src)); MACSTR, MAC2STR(src));
if (src[0] & 0x01) { if (is_multicast_ether_addr(src)) {
/* Broadcast bit set in SA?! Ignore the frame silently. */ /* Broadcast bit set in SA?! Ignore the frame silently. */
return; return;
} }