Fix ignore_broadcast_ssid behavior with SSID List and Short SSID List

ignore_broadcast_ssid=1 (or 2) were practically ignored if the Probe
Request frame included the SSID List or Short SSID List elements. Fix
this by requiring exact SSID match whenever ignore_broadcast_ssid is in
use regardless how SSID parameters are set in the Probe Request frame.

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/src/ap/beacon.c b/src/ap/beacon.c
index 793c10a4d622255e7813f3481aba54783694ccc2..6301c5d2f712ac12aa2dd5fa55dddd321d2101f9 100644 (file)
--- a/src/ap/beacon.c
+++ b/src/ap/beacon.c
@@ -896,6 +896,12 @@ void handle_probe_req(struct hostapd_data *hapd,
                return;
        }
 
+       if (hapd->conf->ignore_broadcast_ssid && res == WILDCARD_SSID_MATCH) {
+               wpa_printf(MSG_MSGDUMP, "Probe Request from " MACSTR " for "
+                          "broadcast SSID ignored", MAC2STR(mgmt->sa));
+               return;
+       }
+
 #ifdef CONFIG_INTERWORKING
        if (hapd->conf->interworking &&
            elems.interworking && elems.interworking_len >= 1) {