From 8b8d4f4eb4cd92c157611325b5156d0e5d22ae06 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Wed, 30 Dec 2015 19:02:33 +0200 Subject: [PATCH] P2P: Do not accept any BSS entry for join if SSID is already known Use wpa_bss_get() with the specific Group SSID instead of wpa_bss_get_bssid_latest() if the SSID is already known. This makes the P2P join operations more robust in case the frequency of the group was not yet known and the same P2P Interface Address may have been used in multiple group instances with an older group entry still present in the cached scan results. Signed-off-by: Jouni Malinen --- wpa_supplicant/p2p_supplicant.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index 4040e6197..7b976515e 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -5091,8 +5091,13 @@ static int wpas_p2p_join_start(struct wpa_supplicant *wpa_s, int freq, res.ssid_len = ssid_len; os_memcpy(res.ssid, ssid, ssid_len); } else { - bss = wpa_bss_get_bssid_latest(wpa_s, - wpa_s->pending_join_iface_addr); + if (ssid && ssid_len) { + bss = wpa_bss_get(wpa_s, wpa_s->pending_join_iface_addr, + ssid, ssid_len); + } else { + bss = wpa_bss_get_bssid_latest( + wpa_s, wpa_s->pending_join_iface_addr); + } if (bss) { res.freq = bss->freq; res.ssid_len = bss->ssid_len;