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

Fix OLBC non-HT AP detection to check channel

Browse source 
A non-HT capable AP on any channel could have triggered us to enable
protection regardless of own operating channel if the driver delivered
Beacon frames from other channels. The channel detection in ap_list is
not exactly ideal, but most cases can be handled by checking ap->channel
against the currently configured channel (or secondary channel in case
of HT40).

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2013-03-30 18:05:18 +02:00
parent 69554d78f6
commit a5f61b2b87
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/ap/ap_list.c
View file

@ -200,6 +200,8 @@ void ap_list_process_beacon(struct hostapd_iface *iface,
if (elems->ds_params && elems->ds_params_len == 1) if (elems->ds_params && elems->ds_params_len == 1)
ap->channel = elems->ds_params[0]; ap->channel = elems->ds_params[0];
else if (elems->ht_operation && elems->ht_operation_len >= 1)
ap->channel = elems->ht_operation[0];
else if (fi) else if (fi)
ap->channel = fi->channel; ap->channel = fi->channel;
@ -221,17 +223,23 @@ void ap_list_process_beacon(struct hostapd_iface *iface,
if (!iface->olbc && if (!iface->olbc &&
ap_list_beacon_olbc(iface, ap)) { ap_list_beacon_olbc(iface, ap)) {
iface->olbc = 1; iface->olbc = 1;
wpa_printf(MSG_DEBUG, "OLBC AP detected: " MACSTR " - enable " wpa_printf(MSG_DEBUG, "OLBC AP detected: " MACSTR
"protection", MAC2STR(ap->addr)); " (channel %d) - enable protection",
MAC2STR(ap->addr), ap->channel);
set_beacon++; set_beacon++;
} }
#ifdef CONFIG_IEEE80211N #ifdef CONFIG_IEEE80211N
if (!iface->olbc_ht && !ap->ht_support) { if (!iface->olbc_ht && !ap->ht_support &&
(ap->channel == 0 ||
ap->channel == iface->conf->channel ||
ap->channel == iface->conf->channel +
iface->conf->secondary_channel * 4)) {
iface->olbc_ht = 1; iface->olbc_ht = 1;
hostapd_ht_operation_update(iface); hostapd_ht_operation_update(iface);
wpa_printf(MSG_DEBUG, "OLBC HT AP detected: " MACSTR wpa_printf(MSG_DEBUG, "OLBC HT AP detected: " MACSTR
" - enable protection", MAC2STR(ap->addr)); " (channel %d) - enable protection",
MAC2STR(ap->addr), ap->channel);
set_beacon++; set_beacon++;
} }
#endif /* CONFIG_IEEE80211N */ #endif /* CONFIG_IEEE80211N */