[PATCH v2] Adding disassociate reason as property in dbus
Dan Williams
dcbw
Wed Jul 1 09:53:13 PDT 2015
It gives disassoc_bssid as string and disassoc_reason as integer.
This patch is updated according to the suggestions given by Dan Williams.
(whitespace and other fixes also by Dan Williams)
Signed-off-by: Avichal Agarwal <avichal.a at samsung.com>
---
Avichal: I took the liberty of fixing a few things:
1) whitespace; your mail client replaced all tabs with 4 spaces and the
patch didn't cleanly apply
2) I also fixed some mistakes in my original suggestion dealing with 'iter' vs.
'struct_iter' and 'variant_iter'. Also, I forgot that D-Bus wants the
address to a char* for strings, so added a temp variable to handle that.
3) I changed the hardcoded '20' to sizeof(wpa_s->disassoc_bssid) to ensure
that if the size of that struct gets changed, it only needs to happen in
one place.
If you submit further patches, can you save your mail message as a text file,
then use 'git apply' to make sure that they apply cleanly to the git repo?
That will make less work for the wpa_supplicant maintainers. Thanks!
wpa_supplicant/dbus/dbus_new.c | 8 +++++++
wpa_supplicant/dbus/dbus_new.h | 1 +
wpa_supplicant/dbus/dbus_new_handlers.c | 37 +++++++++++++++++++++++++++++++++
wpa_supplicant/dbus/dbus_new_handlers.h | 4 ++++
wpa_supplicant/events.c | 11 ++++++++--
wpa_supplicant/notify.c | 6 ++++++
wpa_supplicant/notify.h | 1 +
wpa_supplicant/wpa_supplicant_i.h | 4 ++++
8 files changed, 70 insertions(+), 2 deletions(-)
diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
index 1959ea7..76bdf42 100644
--- a/wpa_supplicant/dbus/dbus_new.c
+++ b/wpa_supplicant/dbus/dbus_new.c
@@ -1904,6 +1904,10 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s,
prop = "DisconnectReason";
flush = TRUE;
break;
+ case WPAS_DBUS_PROP_DISASSOCIATE_REASON:
+ prop = "DisassociateReason";
+ flush = TRUE;
+ break;
default:
wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d",
__func__, property);
@@ -3020,6 +3024,10 @@ static const struct wpa_dbus_property_desc wpas_dbus_interface_properties[] = {
wpas_dbus_getter_disconnect_reason,
NULL
},
+ { "DisassociateReason", WPAS_DBUS_NEW_IFACE_INTERFACE, "(is)",
+ wpas_dbus_getter_disassociate_reason,
+ NULL
+ },
{ NULL, NULL, NULL, NULL, NULL }
};
diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h
index 7503348..febbdf0 100644
--- a/wpa_supplicant/dbus/dbus_new.h
+++ b/wpa_supplicant/dbus/dbus_new.h
@@ -29,6 +29,7 @@ enum wpas_dbus_prop {
WPAS_DBUS_PROP_CURRENT_AUTH_MODE,
WPAS_DBUS_PROP_BSSS,
WPAS_DBUS_PROP_DISCONNECT_REASON,
+ WPAS_DBUS_PROP_DISASSOCIATE_REASON,
};
enum wpas_dbus_bss_prop {
diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c
index 1c04e92..d50207a 100644
--- a/wpa_supplicant/dbus/dbus_new_handlers.c
+++ b/wpa_supplicant/dbus/dbus_new_handlers.c
@@ -2797,6 +2797,43 @@ dbus_bool_t wpas_dbus_getter_disconnect_reason(DBusMessageIter *iter,
/**
+ * wpas_dbus_getter_disassociate_reason - Get bssid(string) with status code(int) for ASSOC_REJECT
+ * @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 "DisassociateReason" property.
+ */
+dbus_bool_t wpas_dbus_getter_disassociate_reason(DBusMessageIter *iter,
+ DBusError *error,
+ void *user_data)
+{
+ struct wpa_supplicant *wpa_s = user_data;
+ DBusMessageIter variant_iter;
+ DBusMessageIter struct_iter;
+ const char *bssid = wpa_s->disassoc_reason ? wpa_s->disassoc_bssid : "";
+
+ if (!dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT,
+ "(is)", &variant_iter) ||
+ !dbus_message_iter_open_container(&variant_iter, DBUS_TYPE_STRUCT,
+ NULL, &struct_iter) ||
+ !dbus_message_iter_append_basic(&struct_iter, DBUS_TYPE_INT32,
+ &wpa_s->disassoc_reason) ||
+ !dbus_message_iter_append_basic(&struct_iter, DBUS_TYPE_STRING,
+ &bssid) ||
+ !dbus_message_iter_close_container(&variant_iter, &struct_iter) ||
+ !dbus_message_iter_close_container(iter, &variant_iter)) {
+ dbus_set_error(error, DBUS_ERROR_FAILED,
+ "%s: error constructing reply variant", __func__);
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+
+/**
* wpas_dbus_getter_bss_expire_age - Get BSS entry expiration age
* @iter: Pointer to incoming dbus message iter
* @error: Location to store error on failure
diff --git a/wpa_supplicant/dbus/dbus_new_handlers.h b/wpa_supplicant/dbus/dbus_new_handlers.h
index 50f72ec..9b6fbd7 100644
--- a/wpa_supplicant/dbus/dbus_new_handlers.h
+++ b/wpa_supplicant/dbus/dbus_new_handlers.h
@@ -173,6 +173,10 @@ dbus_bool_t wpas_dbus_getter_disconnect_reason(DBusMessageIter *iter,
DBusError *error,
void *user_data);
+dbus_bool_t wpas_dbus_getter_disassociate_reason(DBusMessageIter *iter,
+ DBusError *error,
+ void *user_data);
+
dbus_bool_t wpas_dbus_getter_bss_expire_age(DBusMessageIter *iter,
DBusError *error, void *user_data);
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index aa171ef..f2c4b06 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -3328,15 +3328,22 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
break;
#endif /* CONFIG_IBSS_RSN */
case EVENT_ASSOC_REJECT:
- if (data->assoc_reject.bssid)
+ wpa_s->disassoc_reason = data->assoc_reject.status_code;
+ os_memset(wpa_s->disassoc_bssid, 0, sizeof(wpa_s->disassoc_bssid));
+ if (data->assoc_reject.bssid) {
+ os_snprintf(wpa_s->disassoc_bssid,
+ sizeof(wpa_s->disassoc_bssid),
+ MACSTR, MAC2STR(data->assoc_reject.bssid));
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);
- else
+ } else {
wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_ASSOC_REJECT
"status_code=%u",
data->assoc_reject.status_code);
+ }
+ wpas_notify_diassociate_reason(wpa_s);
if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME)
sme_event_assoc_reject(wpa_s, data);
else {
diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c
index 822db74..37a1d5b 100644
--- a/wpa_supplicant/notify.c
+++ b/wpa_supplicant/notify.c
@@ -117,6 +117,12 @@ void wpas_notify_disconnect_reason(struct wpa_supplicant *wpa_s)
}
+void wpas_notify_diassociate_reason(struct wpa_supplicant *wpa_s)
+{
+ wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_DISASSOCIATE_REASON);
+}
+
+
void wpas_notify_network_changed(struct wpa_supplicant *wpa_s)
{
if (wpa_s->p2p_mgmt)
diff --git a/wpa_supplicant/notify.h b/wpa_supplicant/notify.h
index 1aeec47..f7afe35 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_diassociate_reason(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);
void wpas_notify_bssid_changed(struct wpa_supplicant *wpa_s);
diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
index dd5b245..27f1901 100644
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -912,6 +912,10 @@ struct wpa_supplicant {
/* WLAN_REASON_* reason codes. Negative if locally generated. */
int disconnect_reason;
+ /* ASSOC_REJECT status code and bssid */
+ char disassoc_bssid[20];
+ int disassoc_reason;
+
struct ext_password_data *ext_pw;
struct wpabuf *last_gas_resp, *prev_gas_resp;
--
2.1.0
More information about the Hostap
mailing list