Revert "[wpa_supplicant] Cumulative patch from c4e90da6d"
This reverts commit 39bc25d3a79c1375de430a7918d949c1a86f70c6.
Test: Compilation
Change-Id: Iae7670429466958911b5296cb1359bceecc0b03e
Exempt-From-Owner-Approval: Revert since it's breaking the build
diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index aeec1d9..b26da71 100644
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -37,7 +37,7 @@
const char *fname)
{
FILE *f;
- char buf[128], *pos, *pos2, *pos3;
+ char buf[128], *pos, *pos2;
int line = 0, vlan_id;
struct hostapd_vlan *vlan;
@@ -82,10 +82,7 @@
pos2 = pos;
while (*pos2 != ' ' && *pos2 != '\t' && *pos2 != '\0')
pos2++;
-
- if (*pos2 != '\0')
- *(pos2++) = '\0';
-
+ *pos2 = '\0';
if (*pos == '\0' || os_strlen(pos) > IFNAMSIZ) {
wpa_printf(MSG_ERROR, "Invalid VLAN ifname at line %d "
"in '%s'", line, fname);
@@ -93,13 +90,6 @@
return -1;
}
- while (*pos2 == ' ' || *pos2 == '\t')
- pos2++;
- pos3 = pos2;
- while (*pos3 != ' ' && *pos3 != '\t' && *pos3 != '\0')
- pos3++;
- *pos3 = '\0';
-
vlan = os_zalloc(sizeof(*vlan));
if (vlan == NULL) {
wpa_printf(MSG_ERROR, "Out of memory while reading "
@@ -112,7 +102,6 @@
vlan->vlan_desc.untagged = vlan_id;
vlan->vlan_desc.notempty = !!vlan_id;
os_strlcpy(vlan->ifname, pos, sizeof(vlan->ifname));
- os_strlcpy(vlan->bridge, pos2, sizeof(vlan->bridge));
vlan->next = bss->vlan;
bss->vlan = vlan;
}
@@ -1379,14 +1368,6 @@
#endif /* CONFIG_IEEE80211AC */
-#ifdef CONFIG_IEEE80211AX
-static u8 set_he_cap(int val, u8 mask)
-{
- return (u8) (mask & (val << ffs(mask)));
-}
-#endif /* CONFIG_IEEE80211AX */
-
-
#ifdef CONFIG_INTERWORKING
static int parse_roaming_consortium(struct hostapd_bss_config *bss, char *pos,
int line)
@@ -2273,16 +2254,10 @@
flags |= TLS_CONN_DISABLE_TIME_CHECKS;
if (os_strstr(val, "[DISABLE-TLSv1.0]"))
flags |= TLS_CONN_DISABLE_TLSv1_0;
- if (os_strstr(val, "[ENABLE-TLSv1.0]"))
- flags |= TLS_CONN_ENABLE_TLSv1_0;
if (os_strstr(val, "[DISABLE-TLSv1.1]"))
flags |= TLS_CONN_DISABLE_TLSv1_1;
- if (os_strstr(val, "[ENABLE-TLSv1.1]"))
- flags |= TLS_CONN_ENABLE_TLSv1_1;
if (os_strstr(val, "[DISABLE-TLSv1.2]"))
flags |= TLS_CONN_DISABLE_TLSv1_2;
- if (os_strstr(val, "[ENABLE-TLSv1.2]"))
- flags |= TLS_CONN_ENABLE_TLSv1_2;
if (os_strstr(val, "[DISABLE-TLSv1.3]"))
flags |= TLS_CONN_DISABLE_TLSv1_3;
if (os_strstr(val, "[ENABLE-TLSv1.3]"))
@@ -2503,10 +2478,6 @@
bss->private_key_passwd = os_strdup(pos);
} else if (os_strcmp(buf, "check_crl") == 0) {
bss->check_crl = atoi(pos);
- } else if (os_strcmp(buf, "check_crl_strict") == 0) {
- bss->check_crl_strict = atoi(pos);
- } else if (os_strcmp(buf, "crl_reload_interval") == 0) {
- bss->crl_reload_interval = atoi(pos);
} else if (os_strcmp(buf, "tls_session_lifetime") == 0) {
bss->tls_session_lifetime = atoi(pos);
} else if (os_strcmp(buf, "tls_flags") == 0) {
@@ -2523,9 +2494,6 @@
} else if (os_strcmp(buf, "openssl_ciphers") == 0) {
os_free(bss->openssl_ciphers);
bss->openssl_ciphers = os_strdup(pos);
- } else if (os_strcmp(buf, "openssl_ecdh_curves") == 0) {
- os_free(bss->openssl_ecdh_curves);
- bss->openssl_ecdh_curves = os_strdup(pos);
} else if (os_strcmp(buf, "fragment_size") == 0) {
bss->fragment_size = atoi(pos);
#ifdef EAP_SERVER_FAST
@@ -3180,7 +3148,7 @@
line, val);
return 1;
}
- bss->send_probe_response = val;
+ conf->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",
@@ -3348,12 +3316,6 @@
return 1;
}
#endif /* CONFIG_IEEE80211W */
-#ifdef CONFIG_OCV
- } else if (os_strcmp(buf, "ocv") == 0) {
- bss->ocv = atoi(pos);
- if (bss->ocv && !bss->ieee80211w)
- bss->ieee80211w = 1;
-#endif /* CONFIG_OCV */
#ifdef CONFIG_IEEE80211N
} else if (os_strcmp(buf, "ieee80211n") == 0) {
conf->ieee80211n = atoi(pos);
@@ -3407,90 +3369,6 @@
conf->he_op.he_twt_required = atoi(pos);
} else if (os_strcmp(buf, "he_rts_threshold") == 0) {
conf->he_op.he_rts_threshold = atoi(pos);
- } else if (os_strcmp(buf, "he_mu_edca_qos_info_param_count") == 0) {
- conf->he_mu_edca.he_qos_info |=
- set_he_cap(atoi(pos), HE_QOS_INFO_EDCA_PARAM_SET_COUNT);
- } else if (os_strcmp(buf, "he_mu_edca_qos_info_q_ack") == 0) {
- conf->he_mu_edca.he_qos_info |=
- set_he_cap(atoi(pos), HE_QOS_INFO_Q_ACK);
- } else if (os_strcmp(buf, "he_mu_edca_qos_info_queue_request") == 0) {
- conf->he_mu_edca.he_qos_info |=
- set_he_cap(atoi(pos), HE_QOS_INFO_QUEUE_REQUEST);
- } else if (os_strcmp(buf, "he_mu_edca_qos_info_txop_request") == 0) {
- conf->he_mu_edca.he_qos_info |=
- set_he_cap(atoi(pos), HE_QOS_INFO_TXOP_REQUEST);
- } else if (os_strcmp(buf, "he_mu_edca_ac_be_aifsn") == 0) {
- conf->he_mu_edca.he_mu_ac_be_param[HE_MU_AC_PARAM_ACI_IDX] |=
- set_he_cap(atoi(pos), HE_MU_AC_PARAM_AIFSN);
- } else if (os_strcmp(buf, "he_mu_edca_ac_be_acm") == 0) {
- conf->he_mu_edca.he_mu_ac_be_param[HE_MU_AC_PARAM_ACI_IDX] |=
- set_he_cap(atoi(pos), HE_MU_AC_PARAM_ACM);
- } else if (os_strcmp(buf, "he_mu_edca_ac_be_aci") == 0) {
- conf->he_mu_edca.he_mu_ac_be_param[HE_MU_AC_PARAM_ACI_IDX] |=
- set_he_cap(atoi(pos), HE_MU_AC_PARAM_ACI);
- } else if (os_strcmp(buf, "he_mu_edca_ac_be_ecwmin") == 0) {
- conf->he_mu_edca.he_mu_ac_be_param[HE_MU_AC_PARAM_ECW_IDX] |=
- set_he_cap(atoi(pos), HE_MU_AC_PARAM_ECWMIN);
- } else if (os_strcmp(buf, "he_mu_edca_ac_be_ecwmax") == 0) {
- conf->he_mu_edca.he_mu_ac_be_param[HE_MU_AC_PARAM_ECW_IDX] |=
- set_he_cap(atoi(pos), HE_MU_AC_PARAM_ECWMAX);
- } else if (os_strcmp(buf, "he_mu_edca_ac_be_timer") == 0) {
- conf->he_mu_edca.he_mu_ac_be_param[HE_MU_AC_PARAM_TIMER_IDX] =
- atoi(pos) & 0xff;
- } else if (os_strcmp(buf, "he_mu_edca_ac_bk_aifsn") == 0) {
- conf->he_mu_edca.he_mu_ac_bk_param[HE_MU_AC_PARAM_ACI_IDX] |=
- set_he_cap(atoi(pos), HE_MU_AC_PARAM_AIFSN);
- } else if (os_strcmp(buf, "he_mu_edca_ac_bk_acm") == 0) {
- conf->he_mu_edca.he_mu_ac_bk_param[HE_MU_AC_PARAM_ACI_IDX] |=
- set_he_cap(atoi(pos), HE_MU_AC_PARAM_ACM);
- } else if (os_strcmp(buf, "he_mu_edca_ac_bk_aci") == 0) {
- conf->he_mu_edca.he_mu_ac_bk_param[HE_MU_AC_PARAM_ACI_IDX] |=
- set_he_cap(atoi(pos), HE_MU_AC_PARAM_ACI);
- } else if (os_strcmp(buf, "he_mu_edca_ac_bk_ecwmin") == 0) {
- conf->he_mu_edca.he_mu_ac_bk_param[HE_MU_AC_PARAM_ECW_IDX] |=
- set_he_cap(atoi(pos), HE_MU_AC_PARAM_ECWMIN);
- } else if (os_strcmp(buf, "he_mu_edca_ac_bk_ecwmax") == 0) {
- conf->he_mu_edca.he_mu_ac_bk_param[HE_MU_AC_PARAM_ECW_IDX] |=
- set_he_cap(atoi(pos), HE_MU_AC_PARAM_ECWMAX);
- } else if (os_strcmp(buf, "he_mu_edca_ac_bk_timer") == 0) {
- conf->he_mu_edca.he_mu_ac_bk_param[HE_MU_AC_PARAM_TIMER_IDX] =
- atoi(pos) & 0xff;
- } else if (os_strcmp(buf, "he_mu_edca_ac_vi_aifsn") == 0) {
- conf->he_mu_edca.he_mu_ac_vi_param[HE_MU_AC_PARAM_ACI_IDX] |=
- set_he_cap(atoi(pos), HE_MU_AC_PARAM_AIFSN);
- } else if (os_strcmp(buf, "he_mu_edca_ac_vi_acm") == 0) {
- conf->he_mu_edca.he_mu_ac_vi_param[HE_MU_AC_PARAM_ACI_IDX] |=
- set_he_cap(atoi(pos), HE_MU_AC_PARAM_ACM);
- } else if (os_strcmp(buf, "he_mu_edca_ac_vi_aci") == 0) {
- conf->he_mu_edca.he_mu_ac_vi_param[HE_MU_AC_PARAM_ACI_IDX] |=
- set_he_cap(atoi(pos), HE_MU_AC_PARAM_ACI);
- } else if (os_strcmp(buf, "he_mu_edca_ac_vi_ecwmin") == 0) {
- conf->he_mu_edca.he_mu_ac_vi_param[HE_MU_AC_PARAM_ECW_IDX] |=
- set_he_cap(atoi(pos), HE_MU_AC_PARAM_ECWMIN);
- } else if (os_strcmp(buf, "he_mu_edca_ac_vi_ecwmax") == 0) {
- conf->he_mu_edca.he_mu_ac_vi_param[HE_MU_AC_PARAM_ECW_IDX] |=
- set_he_cap(atoi(pos), HE_MU_AC_PARAM_ECWMAX);
- } else if (os_strcmp(buf, "he_mu_edca_ac_vi_timer") == 0) {
- conf->he_mu_edca.he_mu_ac_vi_param[HE_MU_AC_PARAM_TIMER_IDX] =
- atoi(pos) & 0xff;
- } else if (os_strcmp(buf, "he_mu_edca_ac_vo_aifsn") == 0) {
- conf->he_mu_edca.he_mu_ac_vo_param[HE_MU_AC_PARAM_ACI_IDX] |=
- set_he_cap(atoi(pos), HE_MU_AC_PARAM_AIFSN);
- } else if (os_strcmp(buf, "he_mu_edca_ac_vo_acm") == 0) {
- conf->he_mu_edca.he_mu_ac_vo_param[HE_MU_AC_PARAM_ACI_IDX] |=
- set_he_cap(atoi(pos), HE_MU_AC_PARAM_ACM);
- } else if (os_strcmp(buf, "he_mu_edca_ac_vo_aci") == 0) {
- conf->he_mu_edca.he_mu_ac_vo_param[HE_MU_AC_PARAM_ACI_IDX] |=
- set_he_cap(atoi(pos), HE_MU_AC_PARAM_ACI);
- } else if (os_strcmp(buf, "he_mu_edca_ac_vo_ecwmin") == 0) {
- conf->he_mu_edca.he_mu_ac_vo_param[HE_MU_AC_PARAM_ECW_IDX] |=
- set_he_cap(atoi(pos), HE_MU_AC_PARAM_ECWMIN);
- } else if (os_strcmp(buf, "he_mu_edca_ac_vo_ecwmax") == 0) {
- conf->he_mu_edca.he_mu_ac_vo_param[HE_MU_AC_PARAM_ECW_IDX] |=
- set_he_cap(atoi(pos), HE_MU_AC_PARAM_ECWMAX);
- } else if (os_strcmp(buf, "he_mu_edca_ac_vo_timer") == 0) {
- conf->he_mu_edca.he_mu_ac_vo_param[HE_MU_AC_PARAM_TIMER_IDX] =
- atoi(pos) & 0xff;
#endif /* CONFIG_IEEE80211AX */
} else if (os_strcmp(buf, "max_listen_interval") == 0) {
bss->max_listen_interval = atoi(pos);
@@ -3839,16 +3717,6 @@
#ifdef CONFIG_HS20
} else if (os_strcmp(buf, "hs20") == 0) {
bss->hs20 = atoi(pos);
- } else if (os_strcmp(buf, "hs20_release") == 0) {
- int val = atoi(pos);
-
- if (val < 1 || val > (HS20_VERSION >> 4) + 1) {
- wpa_printf(MSG_ERROR,
- "Line %d: Unsupported hs20_release: %s",
- line, pos);
- return 1;
- }
- bss->hs20_release = val;
} else if (os_strcmp(buf, "disable_dgaf") == 0) {
bss->disable_dgaf = atoi(pos);
} else if (os_strcmp(buf, "na_mcast_to_ucast") == 0) {
@@ -3939,9 +3807,6 @@
} else if (os_strcmp(buf, "hs20_t_c_server_url") == 0) {
os_free(bss->t_c_server_url);
bss->t_c_server_url = os_strdup(pos);
- } else if (os_strcmp(buf, "hs20_sim_provisioning_url") == 0) {
- os_free(bss->hs20_sim_provisioning_url);
- bss->hs20_sim_provisioning_url = os_strdup(pos);
#endif /* CONFIG_HS20 */
#ifdef CONFIG_MBO
} else if (os_strcmp(buf, "mbo") == 0) {
@@ -4246,22 +4111,6 @@
} else if (os_strcmp(buf, "coloc_intf_reporting") == 0) {
bss->coloc_intf_reporting = atoi(pos);
#endif /* CONFIG_OWE */
- } else if (os_strcmp(buf, "multi_ap") == 0) {
- int val = atoi(pos);
-
- if (val < 0 || val > 3) {
- wpa_printf(MSG_ERROR, "Line %d: Invalid multi_ap '%s'",
- line, buf);
- return -1;
- }
-
- bss->multi_ap = val;
- } else if (os_strcmp(buf, "rssi_reject_assoc_rssi") == 0) {
- conf->rssi_reject_assoc_rssi = atoi(pos);
- } else if (os_strcmp(buf, "rssi_reject_assoc_timeout") == 0) {
- conf->rssi_reject_assoc_timeout = atoi(pos);
- } else if (os_strcmp(buf, "pbss") == 0) {
- bss->pbss = atoi(pos);
} else {
wpa_printf(MSG_ERROR,
"Line %d: unknown configuration item '%s'",