Browse Source

Add ctrl_interface event for association rejected

Jouni Malinen 14 years ago
parent
commit
ea78c315a2
2 changed files with 12 additions and 3 deletions
  1. 2 0
      src/common/wpa_ctrl.h
  2. 10 3
      wpa_supplicant/events.c

+ 2 - 0
src/common/wpa_ctrl.h

@@ -32,6 +32,8 @@ extern "C" {
 #define WPA_EVENT_CONNECTED "CTRL-EVENT-CONNECTED "
 /** Disconnected, data connection is not available */
 #define WPA_EVENT_DISCONNECTED "CTRL-EVENT-DISCONNECTED "
+/** Association rejected during connection attempt */
+#define WPA_EVENT_ASSOC_REJECT "CTRL-EVENT-ASSOC-REJECT "
 /** wpa_supplicant is exiting */
 #define WPA_EVENT_TERMINATING "CTRL-EVENT-TERMINATING "
 /** Password change was completed successfully */

+ 10 - 3
wpa_supplicant/events.c

@@ -1654,13 +1654,20 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
 		break;
 #endif /* CONFIG_IBSS_RSN */
 	case EVENT_ASSOC_REJECT:
-		sme_event_assoc_reject(wpa_s, data);
+		wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_ASSOC_REJECT "bssid=" MACSTR
+			" status_code=%u",
+			MAC2STR(data->assoc_reject.bssid),
+			data->assoc_reject.status_code);
+		if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME)
+			sme_event_assoc_reject(wpa_s, data);
 		break;
 	case EVENT_AUTH_TIMED_OUT:
-		sme_event_auth_timed_out(wpa_s, data);
+		if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME)
+			sme_event_auth_timed_out(wpa_s, data);
 		break;
 	case EVENT_ASSOC_TIMED_OUT:
-		sme_event_assoc_timed_out(wpa_s, data);
+		if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME)
+			sme_event_assoc_timed_out(wpa_s, data);
 		break;
 #ifdef CONFIG_AP
 	case EVENT_TX_STATUS: