aboutsummaryrefslogtreecommitdiffstats
path: root/hostapd
diff options
context:
space:
mode:
authorJouni Malinen <jouni.malinen@atheros.com>2011-01-28 17:21:59 (GMT)
committerJouni Malinen <j@w1.fi>2011-01-28 17:21:59 (GMT)
commit1161ff1ef5e4bdc0e1727a039d6b23ac74b863d0 (patch)
treec9f120472070c3a574321147170f82ad0610b9b1 /hostapd
parent9a994178f19a3632c7a12b892c508e323de18cdb (diff)
downloadhostap-1161ff1ef5e4bdc0e1727a039d6b23ac74b863d0.zip
hostap-1161ff1ef5e4bdc0e1727a039d6b23ac74b863d0.tar.gz
hostap-1161ff1ef5e4bdc0e1727a039d6b23ac74b863d0.tar.bz2
hostapd: Allow TDLS use to be prohibited in the BSS
tdls_prohibit=1 and tdls_prohibit_chan_switch=1 and now be used to disable use of TDLS or TDLS channel switching in the BSS using extended cabilities IE as defined in IEEE 802.11z.
Diffstat (limited to 'hostapd')
-rw-r--r--hostapd/config_file.c12
-rw-r--r--hostapd/hostapd.conf8
2 files changed, 20 insertions, 0 deletions
diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index 4938611..6d340d7 100644
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -2034,6 +2034,18 @@ struct hostapd_config * hostapd_config_read(const char *fname)
#endif /* CONFIG_P2P_MANAGER */
} else if (os_strcmp(buf, "disassoc_low_ack") == 0) {
bss->disassoc_low_ack = atoi(pos);
+ } else if (os_strcmp(buf, "tdls_prohibit") == 0) {
+ int val = atoi(pos);
+ if (val)
+ bss->tdls |= TDLS_PROHIBIT;
+ else
+ bss->tdls &= ~TDLS_PROHIBIT;
+ } else if (os_strcmp(buf, "tdls_prohibit_chan_switch") == 0) {
+ int val = atoi(pos);
+ if (val)
+ bss->tdls |= TDLS_PROHIBIT_CHAN_SWITCH;
+ else
+ bss->tdls &= ~TDLS_PROHIBIT_CHAN_SWITCH;
} else {
wpa_printf(MSG_ERROR, "Line %d: unknown configuration "
"item '%s'", line, buf);
diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf
index 2090e9f..3a79a94 100644
--- a/hostapd/hostapd.conf
+++ b/hostapd/hostapd.conf
@@ -995,6 +995,14 @@ own_ip_addr=127.0.0.1
# Allow cross connection
#allow_cross_connection=1
+#### TDLS (IEEE 802.11z-2010) #################################################
+
+# Prohibit use of TDLS in this BSS
+#tdls_prohibit=1
+
+# Prohibit use of TDLS Channel Switching in this BSS
+#tdls_prohibit_chan_switch=1
+
##### Multiple BSSID support ##################################################
#
# Above configuration is using the default interface (wlan#, or multi-SSID VLAN