Allow RSNXE to be removed from Beacon frames for testing purposes

[thirdparty/hostap.git] / src / ap / beacon.c

diff --git a/src/ap/beacon.c b/src/ap/beacon.c
index f5de1774721bc478ef2131e0b942db592c79f1e6..ff760a0d1a9e772ace6f4da02f7f9b99ea96634c 100644 (file)
--- a/src/ap/beacon.c
+++ b/src/ap/beacon.c
@@ -323,6 +323,12 @@ static u8 * hostapd_get_rsnxe(struct hostapd_data *hapd, u8 *pos, size_t len)
 {
        const u8 *ie;
 
+#ifdef CONFIG_TESTING_OPTIONS
+       if (hapd->conf->no_beacon_rsnxe) {
+               wpa_printf(MSG_INFO, "TESTING: Do not add RSNXE into Beacon");
+               return pos;
+       }
+#endif /* CONFIG_TESTING_OPTIONS */
        ie = hostapd_wpa_ie(hapd, WLAN_EID_RSNX);
        if (!ie || 2U + ie[1] > len)
                return pos;
@@ -1360,10 +1366,13 @@ int ieee802_11_build_ap_params(struct hostapd_data *hapd,
        params->key_mgmt_suites = hapd->conf->wpa_key_mgmt;
        params->auth_algs = hapd->conf->auth_algs;
        params->wpa_version = hapd->conf->wpa;
-       params->privacy = hapd->conf->ssid.wep.keys_set || hapd->conf->wpa ||
+       params->privacy = hapd->conf->wpa;
+#ifdef CONFIG_WEP
+       params->privacy |= hapd->conf->ssid.wep.keys_set ||
                (hapd->conf->ieee802_1x &&
                 (hapd->conf->default_wep_key_len ||
                  hapd->conf->individual_wep_key_len));
+#endif /* CONFIG_WEP */
        switch (hapd->conf->ignore_broadcast_ssid) {
        case 0:
                params->hide_ssid = NO_SSID_HIDING;