summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: aea855d)
raw | patch | inline | side by side (parent: aea855d)
author | Ben Greear <greearb@candelatech.com> | |
Sun, 13 Nov 2011 17:01:38 +0000 (19:01 +0200) | ||
committer | Jouni Malinen <j@w1.fi> | |
Sun, 13 Nov 2011 17:01:38 +0000 (19:01 +0200) |
This makes it easier to understand the event related logs.
Signed-hostap: Ben Greear <greearb@candelatech.com>
Signed-hostap: Ben Greear <greearb@candelatech.com>
src/drivers/driver.h | patch | blob | history | |
src/drivers/driver_common.c | patch | blob | history | |
wpa_supplicant/events.c | patch | blob | history |
diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index e84fe441051e52dc91517c3ae4d67bbfd6f41c0c..bd0c611784e5b38050bfe2d4d3bfaf6e6d455621 100644 (file)
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -3495,4 +3495,7 @@ static inline void drv_event_eapol_rx(void *ctx, const u8 *src, const u8 *data,
/* driver_common.c */
void wpa_scan_results_free(struct wpa_scan_results *res);
+/* Convert wpa_event_type to a string for logging */
+const char * event_to_string(enum wpa_event_type event);
+
#endif /* DRIVER_H */
index 3ea16e90acc99abec7bb99761e0be37e8268921e..d9e932d19f436bf0e6217bef093643ad55856587 100644 (file)
os_free(res->res);
os_free(res);
}
+
+
+const char * event_to_string(enum wpa_event_type event)
+{
+ switch (event) {
+ case EVENT_ASSOC: return "ASSOC";
+ case EVENT_DISASSOC: return "DISASSOC";
+ case EVENT_MICHAEL_MIC_FAILURE: return "MICHAEL_MIC_FAILURE";
+ case EVENT_SCAN_RESULTS: return "SCAN_RESULTS";
+ case EVENT_ASSOCINFO: return "ASSOCINFO";
+ case EVENT_INTERFACE_STATUS: return "INTERFACE_STATUS";
+ case EVENT_PMKID_CANDIDATE: return "PMKID_CANDIDATE";
+ case EVENT_STKSTART: return "STKSTART";
+ case EVENT_TDLS: return "TDLS";
+ case EVENT_FT_RESPONSE: return "FT_RESPONSE";
+ case EVENT_IBSS_RSN_START: return "IBSS_RSN_START";
+ case EVENT_AUTH: return "AUTH";
+ case EVENT_DEAUTH: return "DEAUTH";
+ case EVENT_ASSOC_REJECT: return "ASSOC_REJECT";
+ case EVENT_AUTH_TIMED_OUT: return "AUTH_TIMED_OUT";
+ case EVENT_ASSOC_TIMED_OUT: return "ASSOC_TIMED_OUT";
+ case EVENT_FT_RRB_RX: return "FT_RRB_RX";
+ case EVENT_WPS_BUTTON_PUSHED: return "WPS_BUTTON_PUSHED";
+ case EVENT_TX_STATUS: return "TX_STATUS";
+ case EVENT_RX_FROM_UNKNOWN: return "RX_FROM_UNKNOWN";
+ case EVENT_RX_MGMT: return "RX_MGMT";
+ case EVENT_RX_ACTION: return "RX_ACTION";
+ case EVENT_REMAIN_ON_CHANNEL: return "REMAIN_ON_CHANNEL";
+ case EVENT_CANCEL_REMAIN_ON_CHANNEL: return "CANCEL_ROC";
+ case EVENT_MLME_RX: return "MLME_RX";
+ case EVENT_RX_PROBE_REQ: return "RX_PROBE_REQ";
+ case EVENT_NEW_STA: return "NEW_STA";
+ case EVENT_EAPOL_RX: return "EAPOL_RX";
+ case EVENT_SIGNAL_CHANGE: return "SIGNAL_CHANGE";
+ case EVENT_INTERFACE_ENABLED: return "IFACE_ENABLED";
+ case EVENT_INTERFACE_DISABLED: return "IFACE_DISABLED";
+ case EVENT_CHANNEL_LIST_CHANGED: return "CHANNEL_LIST_CHANGED";
+ case EVENT_INTERFACE_UNAVAILABLE: return "INTERFACE_UNAVAILABLE";
+ case EVENT_BEST_CHANNEL: return "BEST_CHANNEL";
+ case EVENT_UNPROT_DEAUTH: return "UNPROT_DEAUTH";
+ case EVENT_UNPROT_DISASSOC: return "UNPROT_DISASSOC";
+ case EVENT_STATION_LOW_ACK: return "STA_LOW_ACK";
+ case EVENT_P2P_DEV_FOUND: return "P2P_DEV_FOUND";
+ case EVENT_P2P_GO_NEG_REQ_RX: return "P2P_GO_NEG_REQ_RX";
+ case EVENT_P2P_GO_NEG_COMPLETED: return "P2P_GO_NEG_COMPLETED";
+ case EVENT_P2P_PROV_DISC_REQUEST: return "P2P_PROV_DISC_REQUEST";
+ case EVENT_P2P_PROV_DISC_RESPONSE: return "P2P_PROV_DISC_RESPONSE";
+ case EVENT_P2P_SD_REQUEST: return "P2P_SD_REQUEST";
+ case EVENT_P2P_SD_RESPONSE: return "P2P_SD_RESPONSE";
+ case EVENT_IBSS_PEER_LOST: return "IBSS_PEER_LOST";
+ case EVENT_DRIVER_GTK_REKEY: return "DRIVER_GTK_REKEY";
+ case EVENT_SCHED_SCAN_STOPPED: return "SCHED_SCAN_STOPPED";
+ case EVENT_DRIVER_CLIENT_POLL_OK: return "CLIENT_POLL_OK";
+ }
+
+ return "UNKNOWN";
+}
index 9a0663b16503d69cd5f582ca2b22c18919823ff5..719555cb849d2d82c1f100d639aa7ffb34123dcf 100644 (file)
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
if (wpa_s->wpa_state == WPA_INTERFACE_DISABLED &&
event != EVENT_INTERFACE_ENABLED &&
event != EVENT_INTERFACE_STATUS) {
- wpa_dbg(wpa_s, MSG_DEBUG, "Ignore event %d while interface is "
- "disabled", event);
+ wpa_dbg(wpa_s, MSG_DEBUG,
+ "Ignore event %s (%d) while interface is disabled",
+ event_to_string(event), event);
return;
}
- wpa_dbg(wpa_s, MSG_DEBUG, "Event %d received on interface %s",
- event, wpa_s->ifname);
+ wpa_dbg(wpa_s, MSG_DEBUG, "Event %s (%d) received",
+ event_to_string(event), event);
switch (event) {
case EVENT_AUTH: