From: Jouni Malinen <j@w1.fi>
Date: Sat, 28 Dec 2019 21:19:44 +0000 (+0200)
Subject: Fix ignore_broadcast_ssid behavior with SSID List and Short SSID List
X-Git-Tag: hostap_2_10~2061
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=974f84bb73a9571ee48f93cf5fe69f0cd04da183;p=thirdparty%2Fhostap.git

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 793c10a4d..6301c5d2f 100644
--- 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) {