Patchwork Export disconnect reason code to dbus

login
register
mail settings
Submitter Gary Morain
Date Feb. 24, 2012, 7:10 p.m.
Message ID <20120423215743.6F95480B32@gary-pc2.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/154549/
State Accepted
Headers show

Comments

Gary Morain - Feb. 24, 2012, 7:10 p.m.
This patch contains the changes you suggested.

In the properties changed signal, added a new propery "DisconnectReason",
which carries the IEEE 802.11 reason code of the most recent
disassociation or deauthentication event.  The reason code is negative
if it is locally generated.  The property is sent to the DBUS
immediately so as to prevent it from being coalesced with other
disconnect events.

Signed-off-by: Gary Morain <gmorain@chromium.org>
---
 wpa_supplicant/dbus/dbus_new.c          |   14 ++++++++++++++
 wpa_supplicant/dbus/dbus_new.h          |    1 +
 wpa_supplicant/dbus/dbus_new_handlers.c |   20 ++++++++++++++++++++
 wpa_supplicant/dbus/dbus_new_handlers.h |    4 ++++
 wpa_supplicant/events.c                 |    5 +++++
 wpa_supplicant/notify.c                 |    6 ++++++
 wpa_supplicant/notify.h                 |    1 +
 wpa_supplicant/wpa_supplicant_i.h       |    3 +++
 8 files changed, 54 insertions(+), 0 deletions(-)
Jouni Malinen - June 30, 2012, 1:45 p.m.
On Fri, Feb 24, 2012 at 11:10:16AM -0800, Gary Morain wrote:
> This patch contains the changes you suggested.
> 
> In the properties changed signal, added a new propery "DisconnectReason",
> which carries the IEEE 802.11 reason code of the most recent
> disassociation or deauthentication event.  The reason code is negative
> if it is locally generated.  The property is sent to the DBUS
> immediately so as to prevent it from being coalesced with other
> disconnect events.

Thanks! Applied.

Patch

diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
index 0c89d14..34282fa 100644
--- a/wpa_supplicant/dbus/dbus_new.c
+++ b/wpa_supplicant/dbus/dbus_new.c
@@ -1700,10 +1700,12 @@  void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s,
 				   enum wpas_dbus_prop property)
 {
 	char *prop;
+	dbus_bool_t flush;
 
 	if (wpa_s->dbus_new_path == NULL)
 		return; /* Skip signal since D-Bus setup is not yet ready */
 
+	flush = FALSE;
 	switch (property) {
 	case WPAS_DBUS_PROP_AP_SCAN:
 		prop = "ApScan";
@@ -1726,6 +1728,10 @@  void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s,
 	case WPAS_DBUS_PROP_CURRENT_AUTH_MODE:
 		prop = "CurrentAuthMode";
 		break;
+	case WPAS_DBUS_PROP_DISCONNECT_REASON:
+		prop = "DisconnectReason";
+		flush = TRUE;
+		break;
 	default:
 		wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d",
 			   __func__, property);
@@ -1735,6 +1741,10 @@  void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s,
 	wpa_dbus_mark_property_changed(wpa_s->global->dbus,
 				       wpa_s->dbus_new_path,
 				       WPAS_DBUS_NEW_IFACE_INTERFACE, prop);
+	if (flush)
+		wpa_dbus_flush_object_changed_properties(wpa_s->global->dbus->con,
+							 wpa_s->dbus_new_path);
+
 }
 
 
@@ -2702,6 +2712,10 @@  static const struct wpa_dbus_property_desc wpas_dbus_interface_properties[] = {
 	  NULL
 	},
 #endif /* CONFIG_P2P */
+	{ "DisconnectReason", WPAS_DBUS_NEW_IFACE_INTERFACE, "i",
+	  wpas_dbus_getter_disconnect_reason,
+	  NULL
+	},
 	{ NULL, NULL, NULL, NULL, NULL }
 };
 
diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h
index a2d7011..f4a4d2c 100644
--- a/wpa_supplicant/dbus/dbus_new.h
+++ b/wpa_supplicant/dbus/dbus_new.h
@@ -34,6 +34,7 @@  enum wpas_dbus_prop {
 	WPAS_DBUS_PROP_CURRENT_NETWORK,
 	WPAS_DBUS_PROP_CURRENT_AUTH_MODE,
 	WPAS_DBUS_PROP_BSSS,
+	WPAS_DBUS_PROP_DISCONNECT_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 3a5bcab..d6a6f9a 100644
--- a/wpa_supplicant/dbus/dbus_new_handlers.c
+++ b/wpa_supplicant/dbus/dbus_new_handlers.c
@@ -2298,6 +2298,26 @@  dbus_bool_t wpas_dbus_setter_fast_reauth(DBusMessageIter *iter,
 	return TRUE;
 }
 
+/**
+ * wpas_dbus_getter_disconnect_reason - Get most recent reason for disconect
+ * @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 "DisconnectReason" property.  The reason is negative if it is
+ * locally generated.
+ */
+dbus_bool_t wpas_dbus_getter_disconnect_reason(DBusMessageIter *iter,
+                                               DBusError *error,
+                                               void *user_data)
+{
+	struct wpa_supplicant *const wpa_s = user_data;
+	dbus_int32_t reason = wpa_s->disconnect_reason;
+	return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_INT32,
+						&reason, error);
+}
+
 
 /**
  * wpas_dbus_getter_bss_expire_age - Get BSS entry expiration age
diff --git a/wpa_supplicant/dbus/dbus_new_handlers.h b/wpa_supplicant/dbus/dbus_new_handlers.h
index d78aa20..ff49c80 100644
--- a/wpa_supplicant/dbus/dbus_new_handlers.h
+++ b/wpa_supplicant/dbus/dbus_new_handlers.h
@@ -147,6 +147,10 @@  dbus_bool_t wpas_dbus_setter_fast_reauth(DBusMessageIter *iter,
 					 DBusError *error,
 					 void *user_data);
 
+dbus_bool_t wpas_dbus_getter_disconnect_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 8fdc544..b75fb07 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -1659,6 +1659,11 @@  static void wpa_supplicant_event_disassoc(struct wpa_supplicant *wpa_s,
 	if (wpa_s->wpa_state >= WPA_AUTHENTICATING)
 		wpas_connection_failed(wpa_s, bssid);
 	wpa_sm_notify_disassoc(wpa_s->wpa);
+	wpa_s->disconnect_reason = reason_code;
+        if (locally_generated) {
+        	wpa_s->disconnect_reason = -wpa_s->disconnect_reason;
+        }
+        wpas_notify_disconnect_reason(wpa_s);
 	if (!is_zero_ether_addr(bssid) ||
 	    wpa_s->wpa_state >= WPA_AUTHENTICATING) {
 		wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_DISCONNECTED "bssid=" MACSTR
diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c
index d471dfb..bb9b0db 100644
--- a/wpa_supplicant/notify.c
+++ b/wpa_supplicant/notify.c
@@ -97,6 +97,12 @@  void wpas_notify_state_changed(struct wpa_supplicant *wpa_s,
 }
 
 
+void wpas_notify_disconnect_reason(struct wpa_supplicant *wpa_s)
+{
+	wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_DISCONNECT_REASON);
+}
+
+
 void wpas_notify_network_changed(struct wpa_supplicant *wpa_s)
 {
 	wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_CURRENT_NETWORK);
diff --git a/wpa_supplicant/notify.h b/wpa_supplicant/notify.h
index 0c483bc..9cfdd4f 100644
--- a/wpa_supplicant/notify.h
+++ b/wpa_supplicant/notify.h
@@ -22,6 +22,7 @@  void wpas_notify_iface_removed(struct wpa_supplicant *wpa_s);
 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_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 b25116e..086c207 100644
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -548,6 +548,9 @@  struct wpa_supplicant {
 	} hw;
 
 	int pno;
+
+	/* WLAN_REASON_* reason codes.  Negative if locally generated. */
+	int disconnect_reason;
 };