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

Do not use country_code default (was: US)

Browse source 
If country_code is not included in hostapd.conf, refuse to enable IEEE
802.11d and do not try to set the regulatory domain in kernel.
This commit is contained in:
Jouni Malinen 2009-01-30 12:43:19 +02:00 committed by Jouni Malinen
parent c5e1522f9a
commit 6f4071c084
3 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hostapd/config.c
View file

@ -250,8 +250,6 @@ static struct hostapd_config * hostapd_config_defaults(void)
conf->send_probe_response = 1;
conf->bridge_packets = INTERNAL_BRIDGE_DO_NOT_CONTROL;
os_memcpy(conf->country, "US ", 3);
for (i = 0; i < NUM_TX_QUEUES; i++)
conf->tx_queue[i].aifs = -1; /* use hw default */
@ -970,6 +968,12 @@ static int hostapd_config_check(struct hostapd_config *conf)
{
size_t i;
if (conf->ieee80211d && (!conf->country[0] || !conf->country[1])) {
wpa_printf(MSG_ERROR, "Cannot enable IEEE 802.11d without "
"setting the country_code");
return -1;
}
for (i = 0; i < conf->num_bss; i++) {
if (hostapd_config_check_bss(&conf->bss[i], conf))
return -1;

12
hostapd/hostapd.c
View file

@ -1478,11 +1478,13 @@ static int setup_interface(struct hostapd_iface *iface)
OP_MODE_PURE);
#endif /* CONFIG_IEEE80211N */
os_memcpy(country, hapd->iconf->country, 3);
country[3] = '\0';
if (hostapd_set_country(hapd, country) < 0) {
wpa_printf(MSG_ERROR, "Failed to set country code");
return -1;
if (hapd->iconf->country[0] && hapd->iconf->country[1]) {
os_memcpy(country, hapd->iconf->country, 3);
country[3] = '\0';
if (hostapd_set_country(hapd, country) < 0) {
wpa_printf(MSG_ERROR, "Failed to set country code");
return -1;
}
}
if (hapd->iconf->ieee80211d &&

5
hostapd/hostapd.conf
View file

@ -77,10 +77,9 @@ ctrl_interface_group=0
# SSID to be used in IEEE 802.11 management frames
ssid=test
# Country code (ISO/IEC 3166-1). Used to set regulatory domain.
# Modify as needed to indicate country in which device is operating.
# Country code (ISO/IEC 3166-1). Used to set regulatory domain.
# Set as needed to indicate country in which device is operating.
# This can limit available channels and transmit power.
# (default: US)
#country_code=US
# Enable IEEE 802.11d. This advertises the country_code and the set of allowed