aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <jouni@codeaurora.org>2018-12-07 11:07:36 (GMT)
committerJouni Malinen <j@w1.fi>2018-12-07 13:03:11 (GMT)
commit678d8410af4939a80fb6b09f99b11839888601e7 (patch)
tree32375bf51d62a52b0ea093486702714c850e3526
parent4c02242d04cd913c27fde022fb892307509bf4c9 (diff)
downloadhostap-678d8410af4939a80fb6b09f99b11839888601e7.zip
hostap-678d8410af4939a80fb6b09f99b11839888601e7.tar.gz
hostap-678d8410af4939a80fb6b09f99b11839888601e7.tar.bz2
Move send_probe_response parameter to BSS specific items
This can be more convenient for testing Multiple BSSID functionality. Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
-rw-r--r--hostapd/config_file.c2
-rw-r--r--src/ap/ap_config.c3
-rw-r--r--src/ap/ap_config.h3
-rw-r--r--src/ap/beacon.c2
4 files changed, 6 insertions, 4 deletions
diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index b26da71..1bc835a 100644
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -3148,7 +3148,7 @@ static int hostapd_config_fill(struct hostapd_config *conf,
line, val);
return 1;
}
- conf->send_probe_response = val;
+ bss->send_probe_response = val;
} else if (os_strcmp(buf, "supported_rates") == 0) {
if (hostapd_parse_intlist(&conf->supported_rates, pos)) {
wpa_printf(MSG_ERROR, "Line %d: invalid rate list",
diff --git a/src/ap/ap_config.c b/src/ap/ap_config.c
index f9b6f29..e6b1f10 100644
--- a/src/ap/ap_config.c
+++ b/src/ap/ap_config.c
@@ -131,6 +131,8 @@ void hostapd_config_defaults_bss(struct hostapd_bss_config *bss)
* This can be enabled by default once the implementation has been fully
* completed and tested with other implementations. */
bss->tls_flags = TLS_CONN_DISABLE_TLSv1_3;
+
+ bss->send_probe_response = 1;
}
@@ -193,7 +195,6 @@ struct hostapd_config * hostapd_config_defaults(void)
conf->beacon_int = 100;
conf->rts_threshold = -1; /* use driver default: 2347 */
conf->fragm_threshold = -1; /* user driver default: 2346 */
- conf->send_probe_response = 1;
/* Set to invalid value means do not add Power Constraint IE */
conf->local_pwr_constraint = -1;
diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
index 778366d..bd440af 100644
--- a/src/ap/ap_config.h
+++ b/src/ap/ap_config.h
@@ -686,6 +686,8 @@ struct hostapd_bss_config {
#endif /* CONFIG_OWE */
int coloc_intf_reporting;
+
+ u8 send_probe_response;
};
/**
@@ -717,7 +719,6 @@ struct hostapd_config {
u16 beacon_int;
int rts_threshold;
int fragm_threshold;
- u8 send_probe_response;
u8 channel;
u8 acs;
struct wpa_freq_range_list acs_ch_list;
diff --git a/src/ap/beacon.c b/src/ap/beacon.c
index 59bd4af..03cec3e 100644
--- a/src/ap/beacon.c
+++ b/src/ap/beacon.c
@@ -767,7 +767,7 @@ void handle_probe_req(struct hostapd_data *hapd,
ie, ie_len, ssi_signal) > 0)
return;
- if (!hapd->iconf->send_probe_response)
+ if (!hapd->conf->send_probe_response)
return;
if (ieee802_11_parse_elems(ie, ie_len, &elems, 0) == ParseFailed) {