diff options
| author | Ahmed ElArabawy <arabawy@google.com> | 2018-03-15 09:00:10 -0700 |
|---|---|---|
| committer | Ahmed ElArabawy <arabawy@google.com> | 2018-03-27 13:37:41 -0700 |
| commit | 9c86a7f3b4994b1346418f183a9e71c82c87de65 (patch) | |
| tree | 2796556745bee60c71847880545a66ac3948b24a /wpa_supplicant | |
| parent | d58139f6646bce2b7a7afe6d28037df8786898e8 (diff) | |
| download | wpa_supplicant_8-9c86a7f3b4994b1346418f183a9e71c82c87de65.tar.gz | |
Propagate the EAP method error code
In current implementaion, upon an EAP method failure, followed
by an EAP failure, the EAP Status is propagated up in wpa_supplicant
with a general failure parameter string "failure". This parameter is
used for a notification on the dbus.
This commit reports the EAP method failure error code in a separate
callback.
The solution in this commit is generic to all EAP methods, and can be
used by any method that need to pass its error code. However, this
commit only implements the reporting for EAP-SIM and EAP-AKA methods.
Bug: 64612561
Test: Manual
Change-Id: I27736fbaa5d92c4d9f0623ccd642177df2c49a0e
Signed-off-by: Ahmed ElArabawy <arabawy@google.com>
Diffstat (limited to 'wpa_supplicant')
| -rw-r--r-- | wpa_supplicant/notify.c | 5 | ||||
| -rw-r--r-- | wpa_supplicant/notify.h | 1 | ||||
| -rw-r--r-- | wpa_supplicant/wpas_glue.c | 7 |
3 files changed, 13 insertions, 0 deletions
diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c index a5db82c5..8b62a6d1 100644 --- a/wpa_supplicant/notify.c +++ b/wpa_supplicant/notify.c @@ -887,6 +887,11 @@ void wpas_notify_eap_status(struct wpa_supplicant *wpa_s, const char *status, status, parameter); } +void wpas_notify_eap_error(struct wpa_supplicant *wpa_s, int error_code) +{ + wpa_dbg(wpa_s, MSG_ERROR, + "EAP Error code = %d", error_code); +} void wpas_notify_network_bssid_set_changed(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid) diff --git a/wpa_supplicant/notify.h b/wpa_supplicant/notify.h index 26b07f52..c3ac3d15 100644 --- a/wpa_supplicant/notify.h +++ b/wpa_supplicant/notify.h @@ -138,6 +138,7 @@ void wpas_notify_preq(struct wpa_supplicant *wpa_s, const u8 *ie, size_t ie_len, u32 ssi_signal); void wpas_notify_eap_status(struct wpa_supplicant *wpa_s, const char *status, const char *parameter); +void wpas_notify_eap_error(struct wpa_supplicant *wpa_s, int error_code); void wpas_notify_network_bssid_set_changed(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid); void wpas_notify_network_type_changed(struct wpa_supplicant *wpa_s, diff --git a/wpa_supplicant/wpas_glue.c b/wpa_supplicant/wpas_glue.c index e44f6afa..e29f13ba 100644 --- a/wpa_supplicant/wpas_glue.c +++ b/wpa_supplicant/wpas_glue.c @@ -1037,6 +1037,12 @@ static void wpa_supplicant_status_cb(void *ctx, const char *status, wpas_notify_eap_status(wpa_s, status, parameter); } +static void wpa_supplicant_eap_error_cb(void *ctx, int error_code) +{ + struct wpa_supplicant *wpa_s = ctx; + + wpas_notify_eap_error(wpa_s, error_code); +} static void wpa_supplicant_set_anon_id(void *ctx, const u8 *id, size_t len) { @@ -1115,6 +1121,7 @@ int wpa_supplicant_init_eapol(struct wpa_supplicant *wpa_s) ctx->cert_cb = wpa_supplicant_cert_cb; ctx->cert_in_cb = wpa_s->conf->cert_in_cb; ctx->status_cb = wpa_supplicant_status_cb; + ctx->eap_error_cb = wpa_supplicant_eap_error_cb; ctx->set_anon_id = wpa_supplicant_set_anon_id; ctx->cb_ctx = wpa_s; wpa_s->eapol = eapol_sm_init(ctx); |