On Thu, 2018-07-05 at 16:29 -0700, akhouderchah@xxxxxxxxxxxx wrote:
> From: Alex Khouderchah <akhouderchah@xxxxxxxxxxxx>
>
> wpa_supplicant currently logs CTRL-EVENT-AUTH-FAILED errors when
> authentication fails, but doesn't expose any property to the D-Bus
> interface related to this.
>
> This change adds the "AuthStatusCode" property to the interface,
> which contains the IEEE 802.11 status code of the last
> authentication.
The D-Bus part looks OK, but Jouni should weigh in on the "struct
wpa_supplicant" changes.
Dan
> Signed-off-by: Alex Khouderchah <akhouderchah@xxxxxxxxxxxx>
> ---
> doc/dbus.doxygen | 5 +++++
> wpa_supplicant/dbus/dbus_new.c | 9 +++++++++
> wpa_supplicant/dbus/dbus_new.h | 1 +
> wpa_supplicant/dbus/dbus_new_handlers.c | 21 +++++++++++++++++++++
> wpa_supplicant/dbus/dbus_new_handlers.h | 1 +
> wpa_supplicant/events.c | 2 ++
> wpa_supplicant/notify.c | 9 +++++++++
> wpa_supplicant/notify.h | 1 +
> wpa_supplicant/wpa_supplicant_i.h | 3 +++
> 9 files changed, 52 insertions(+)
>
> diff --git a/doc/dbus.doxygen b/doc/dbus.doxygen
> index 2ca40ae9b..4e54333d0 100644
> --- a/doc/dbus.doxygen
> +++ b/doc/dbus.doxygen
> @@ -764,6 +764,11 @@ fi.w1.wpa_supplicant1.CreateInterface.
> <p>The most recent IEEE 802.11 reason code for disconnect.
> Negative value indicates locally generated disconnection.</p>
> </li>
>
> + <li>
> + <h3>AuthStatusCode - i - (read)</h3>
> + <p>The most recent IEEE 802.11 status code for
> authentication.</p>
> + </li>
> +
> <li>
> <h3>AssocStatusCode - i - (read)</h3>
> <p>The most recent IEEE 802.11 status code for association
> rejection.</p>
> diff --git a/wpa_supplicant/dbus/dbus_new.c
> b/wpa_supplicant/dbus/dbus_new.c
> index e0f16bbda..b8e9154a9 100644
> --- a/wpa_supplicant/dbus/dbus_new.c
> +++ b/wpa_supplicant/dbus/dbus_new.c
> @@ -2158,6 +2158,10 @@ void wpas_dbus_signal_prop_changed(struct
> wpa_supplicant *wpa_s,
> prop = "DisconnectReason";
> flush = TRUE;
> break;
> + case WPAS_DBUS_PROP_AUTH_STATUS_CODE:
> + prop = "AuthStatusCode";
> + flush = TRUE;
> + break;
> case WPAS_DBUS_PROP_ASSOC_STATUS_CODE:
> prop = "AssocStatusCode";
> flush = TRUE;
> @@ -3484,6 +3488,11 @@ static const struct wpa_dbus_property_desc
> wpas_dbus_interface_properties[] = {
> NULL,
> NULL
> },
> + { "AuthStatusCode", WPAS_DBUS_NEW_IFACE_INTERFACE, "i",
> + wpas_dbus_getter_auth_status_code,
> + NULL,
> + NULL
> + },
> { "AssocStatusCode", WPAS_DBUS_NEW_IFACE_INTERFACE, "i",
> wpas_dbus_getter_assoc_status_code,
> NULL,
> diff --git a/wpa_supplicant/dbus/dbus_new.h
> b/wpa_supplicant/dbus/dbus_new.h
> index e68acb7a1..8f17a3148 100644
> --- a/wpa_supplicant/dbus/dbus_new.h
> +++ b/wpa_supplicant/dbus/dbus_new.h
> @@ -30,6 +30,7 @@ enum wpas_dbus_prop {
> WPAS_DBUS_PROP_CURRENT_AUTH_MODE,
> WPAS_DBUS_PROP_BSSS,
> WPAS_DBUS_PROP_DISCONNECT_REASON,
> + WPAS_DBUS_PROP_AUTH_STATUS_CODE,
> WPAS_DBUS_PROP_ASSOC_STATUS_CODE,
> };
>
> diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c
> b/wpa_supplicant/dbus/dbus_new_handlers.c
> index a3c98fadd..45bddef8b 100644
> --- a/wpa_supplicant/dbus/dbus_new_handlers.c
> +++ b/wpa_supplicant/dbus/dbus_new_handlers.c
> @@ -3137,6 +3137,27 @@ dbus_bool_t
> wpas_dbus_getter_disconnect_reason(
> }
>
>
> +/**
> + * wpas_dbus_getter_auth_status_code - Get most recent auth status
> code
> + * @iter: Pointer to incoming dbus message iter
> + * @error: Location to store error on failure
> + * @user_data: Function specific data
> + * Returns: TRUE on success, FALSE on failure
> + *
> + * Getter for "AuthStatusCode" property.
> + */
> +dbus_bool_t wpas_dbus_getter_auth_status_code(
> + const struct wpa_dbus_property_desc *property_desc,
> + DBusMessageIter *iter, DBusError *error, void *user_data)
> +{
> + struct wpa_supplicant *wpa_s = user_data;
> + dbus_int32_t reason = wpa_s->auth_status_code;
> +
> + return wpas_dbus_simple_property_getter(iter,
> DBUS_TYPE_INT32,
> + &reason, error);
> +}
> +
> +
> /**
> * wpas_dbus_getter_assoc_status_code - Get most recent failed assoc
> status code
> * @iter: Pointer to incoming dbus message iter
> diff --git a/wpa_supplicant/dbus/dbus_new_handlers.h
> b/wpa_supplicant/dbus/dbus_new_handlers.h
> index 26652ad3d..1483c2132 100644
> --- a/wpa_supplicant/dbus/dbus_new_handlers.h
> +++ b/wpa_supplicant/dbus/dbus_new_handlers.h
> @@ -147,6 +147,7 @@ DECLARE_ACCESSOR(wpas_dbus_getter_fast_reauth);
> DECLARE_ACCESSOR(wpas_dbus_setter_fast_reauth);
> DECLARE_ACCESSOR(wpas_dbus_getter_disconnect_reason);
> DECLARE_ACCESSOR(wpas_dbus_getter_disassociate_reason);
> +DECLARE_ACCESSOR(wpas_dbus_getter_auth_status_code);
> DECLARE_ACCESSOR(wpas_dbus_getter_assoc_status_code);
> DECLARE_ACCESSOR(wpas_dbus_getter_bss_expire_age);
> DECLARE_ACCESSOR(wpas_dbus_setter_bss_expire_age);
> diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
> index fb77f1dbd..6dc865e56 100644
> --- a/wpa_supplicant/events.c
> +++ b/wpa_supplicant/events.c
> @@ -4027,6 +4027,8 @@ void wpa_supplicant_event(void *ctx, enum
> wpa_event_type event,
> "FST: MB IEs updated from auth
> IE");
> #endif /* CONFIG_FST */
> sme_event_auth(wpa_s, data);
> + wpa_s->auth_status_code = data->auth.status_code;
> + wpas_notify_auth_status_code(wpa_s);
> break;
> case EVENT_ASSOC:
> #ifdef CONFIG_TESTING_OPTIONS
> diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c
> index 83df04f39..6afcd47ad 100644
> --- a/wpa_supplicant/notify.c
> +++ b/wpa_supplicant/notify.c
> @@ -140,6 +140,15 @@ void wpas_notify_disconnect_reason(struct
> wpa_supplicant *wpa_s)
> }
>
>
> +void wpas_notify_auth_status_code(struct wpa_supplicant *wpa_s)
> +{
> + if (wpa_s->p2p_mgmt)
> + return;
> +
> + wpas_dbus_signal_prop_changed(wpa_s,
> WPAS_DBUS_PROP_AUTH_STATUS_CODE);
> +}
> +
> +
> void wpas_notify_assoc_status_code(struct wpa_supplicant *wpa_s)
> {
> if (wpa_s->p2p_mgmt)
> diff --git a/wpa_supplicant/notify.h b/wpa_supplicant/notify.h
> index 3ca933c76..9801c2818 100644
> --- a/wpa_supplicant/notify.h
> +++ b/wpa_supplicant/notify.h
> @@ -23,6 +23,7 @@ void wpas_notify_state_changed(struct
> wpa_supplicant *wpa_s,
> enum wpa_states new_state,
> enum wpa_states old_state);
> void wpas_notify_disconnect_reason(struct wpa_supplicant *wpa_s);
> +void wpas_notify_auth_status_code(struct wpa_supplicant *wpa_s);
> void wpas_notify_assoc_status_code(struct wpa_supplicant *wpa_s);
> void wpas_notify_network_changed(struct wpa_supplicant *wpa_s);
> void wpas_notify_ap_scan_changed(struct wpa_supplicant *wpa_s);
> diff --git a/wpa_supplicant/wpa_supplicant_i.h
> b/wpa_supplicant/wpa_supplicant_i.h
> index 2b0dca0ef..8efba3f70 100644
> --- a/wpa_supplicant/wpa_supplicant_i.h
> +++ b/wpa_supplicant/wpa_supplicant_i.h
> @@ -1014,6 +1014,9 @@ struct wpa_supplicant {
> /* WLAN_REASON_* reason codes. Negative if locally
> generated. */
> int disconnect_reason;
>
> + /* WLAN_STATUS_* status codes from Authentication Response
> frame. */
> + u16 auth_status_code;
> +
> /* WLAN_STATUS_* status codes from (Re)Association Response
> frame. */
> u16 assoc_status_code;
>
_______________________________________________
Hostap mailing list
Hostap@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/hostap
