aboutsummaryrefslogtreecommitdiffstats
path: root/src/ap
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2016-12-29 22:23:10 (GMT)
committerJouni Malinen <j@w1.fi>2016-12-29 22:23:10 (GMT)
commit2977f5193a5652d9ffa7f6cb5f3579215228f641 (patch)
tree1630dea86f02d422fee20a8e70b9a3478e852c92 /src/ap
parent678dcebedd46fe8dca0170dc6cf43a2defa8d87a (diff)
downloadhostap-2977f5193a5652d9ffa7f6cb5f3579215228f641.zip
hostap-2977f5193a5652d9ffa7f6cb5f3579215228f641.tar.gz
hostap-2977f5193a5652d9ffa7f6cb5f3579215228f641.tar.bz2
GAS: Remove unnecessarily duplicate gas_frag_limit configuration
The actual BSS configuration parameter can be updated with the SET control interface command, so there is no need to maintain a separate per-BSS parameter and a separate control interface handling for this. Signed-off-by: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'src/ap')
-rw-r--r--src/ap/ap_config.c2
-rw-r--r--src/ap/ap_config.h2
-rw-r--r--src/ap/gas_serv.c9
-rw-r--r--src/ap/hostapd.h3
4 files changed, 6 insertions, 10 deletions
diff --git a/src/ap/ap_config.c b/src/ap/ap_config.c
index 3f5e58b..e417a12 100644
--- a/src/ap/ap_config.c
+++ b/src/ap/ap_config.c
@@ -96,6 +96,8 @@ void hostapd_config_defaults_bss(struct hostapd_bss_config *bss)
bss->sae_anti_clogging_threshold = 5;
+ bss->gas_frag_limit = 1400;
+
#ifdef CONFIG_FILS
dl_list_init(&bss->fils_realms);
#endif /* CONFIG_FILS */
diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
index 97ec0d4..075261c 100644
--- a/src/ap/ap_config.h
+++ b/src/ap/ap_config.h
@@ -515,7 +515,7 @@ struct hostapd_bss_config {
struct dl_list anqp_elem; /* list of struct anqp_element */
u16 gas_comeback_delay;
- int gas_frag_limit;
+ size_t gas_frag_limit;
int gas_address3;
u8 qos_map_set[16 + 2 * 21];
diff --git a/src/ap/gas_serv.c b/src/ap/gas_serv.c
index 72b0e6a..7595281 100644
--- a/src/ap/gas_serv.c
+++ b/src/ap/gas_serv.c
@@ -1245,7 +1245,7 @@ static void gas_serv_req_local_processing(struct hostapd_data *hapd,
}
#endif /* CONFIG_P2P */
- if (wpabuf_len(buf) > hapd->gas_frag_limit ||
+ if (wpabuf_len(buf) > hapd->conf->gas_frag_limit ||
hapd->conf->gas_comeback_delay) {
struct gas_dialog_info *di;
u16 comeback_delay = 1;
@@ -1449,8 +1449,8 @@ static void gas_serv_rx_gas_comeback_req(struct hostapd_data *hapd,
}
frag_len = wpabuf_len(dialog->sd_resp) - dialog->sd_resp_pos;
- if (frag_len > hapd->gas_frag_limit) {
- frag_len = hapd->gas_frag_limit;
+ if (frag_len > hapd->conf->gas_frag_limit) {
+ frag_len = hapd->conf->gas_frag_limit;
more = 1;
}
wpa_msg(hapd->msg_ctx, MSG_DEBUG, "GAS: resp frag_len %u",
@@ -1551,9 +1551,6 @@ int gas_serv_init(struct hostapd_data *hapd)
{
hapd->public_action_cb2 = gas_serv_rx_public_action;
hapd->public_action_cb2_ctx = hapd;
- hapd->gas_frag_limit = 1400;
- if (hapd->conf->gas_frag_limit > 0)
- hapd->gas_frag_limit = hapd->conf->gas_frag_limit;
return 0;
}
diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h
index fd5aaed..45176ed 100644
--- a/src/ap/hostapd.h
+++ b/src/ap/hostapd.h
@@ -260,9 +260,6 @@ struct hostapd_data {
int noa_start;
int noa_duration;
#endif /* CONFIG_P2P */
-#ifdef CONFIG_INTERWORKING
- size_t gas_frag_limit;
-#endif /* CONFIG_INTERWORKING */
#ifdef CONFIG_PROXYARP
struct l2_packet_data *sock_dhcp;
struct l2_packet_data *sock_ndisc;