From 9a700ff9efadc7f817b6aea01f8bdaf363ccc29d Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 30 Nov 2014 15:42:26 +0200 Subject: [PATCH] Ignore auth/assoc timeout events in mesh configuration It was possible for auth/assoc timeout/failure event from the driver to result in unexpected processing during mesh group setup if that operation was started before the previously started driver operation to association/connect had completed. Since those events cannot happen in mesh cases, ignore them to avoid issues due to this corner case. For example, monitor_iface_unknown_sta followed by wpas_mesh_secure test case resulted in failure without this change. Signed-off-by: Jouni Malinen --- wpa_supplicant/events.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index 06b09ef3f..5ef64e65f 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -3110,10 +3110,24 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event, } break; case EVENT_AUTH_TIMED_OUT: + /* It is possible to get this event from earlier connection */ + if (wpa_s->current_ssid && + wpa_s->current_ssid->mode == WPAS_MODE_MESH) { + wpa_dbg(wpa_s, MSG_DEBUG, + "Ignore AUTH_TIMED_OUT in mesh configuration"); + break; + } if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME) sme_event_auth_timed_out(wpa_s, data); break; case EVENT_ASSOC_TIMED_OUT: + /* It is possible to get this event from earlier connection */ + if (wpa_s->current_ssid && + wpa_s->current_ssid->mode == WPAS_MODE_MESH) { + wpa_dbg(wpa_s, MSG_DEBUG, + "Ignore ASSOC_TIMED_OUT in mesh configuration"); + break; + } if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME) sme_event_assoc_timed_out(wpa_s, data); break;