aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/dbus
diff options
context:
space:
mode:
authorDaniel Gnoutcheff <daniel@gnoutcheff.name>2013-05-16 17:47:28 (GMT)
committerJouni Malinen <j@w1.fi>2013-05-16 17:47:28 (GMT)
commitd7692b8d1c39db55055db39e4c56aa0426271c52 (patch)
treed9766d750baa7f7e9b5a70ac303089e14bdeb20a /wpa_supplicant/dbus
parente2396a684e96e7a3a0befd087c6ae7664cbff4ce (diff)
downloadhostap-d7692b8d1c39db55055db39e4c56aa0426271c52.zip
hostap-d7692b8d1c39db55055db39e4c56aa0426271c52.tar.gz
hostap-d7692b8d1c39db55055db39e4c56aa0426271c52.tar.bz2
dbus: Terminate cleanly on messagebus shutdown
By default, dbus_connection_dispatch() will call _exit() if the bus connection has been closed. This caused wpa_supplicant to terminate without properly cleaning up after itself. To ensure that we terminate cleanly when the messagebus terminates, override the exit_on_disconnect behavior and install a filter to handle libdbus's "Disconnected" signal. [Bug 474] Signed-hostap: Daniel Gnoutcheff <daniel@gnoutcheff.name>
Diffstat (limited to 'wpa_supplicant/dbus')
-rw-r--r--wpa_supplicant/dbus/dbus_common.c25
1 files changed, 24 insertions, 1 deletions
diff --git a/wpa_supplicant/dbus/dbus_common.c b/wpa_supplicant/dbus/dbus_common.c
index 5d0e31e..6caf740 100644
--- a/wpa_supplicant/dbus/dbus_common.c
+++ b/wpa_supplicant/dbus/dbus_common.c
@@ -17,6 +17,7 @@
#include "dbus_common_i.h"
#include "dbus_new.h"
#include "dbus_old.h"
+#include "../wpa_supplicant_i.h"
#ifndef SIGPOLL
@@ -257,6 +258,22 @@ static int integrate_with_eloop(struct wpas_dbus_priv *priv)
}
+static DBusHandlerResult disconnect_filter(DBusConnection *conn,
+ DBusMessage *message, void *data)
+{
+ struct wpas_dbus_priv *priv = data;
+
+ if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL,
+ "Disconnected")) {
+ wpa_printf(MSG_DEBUG, "dbus: bus disconnected, terminating");
+ dbus_connection_set_exit_on_disconnect(conn, FALSE);
+ wpa_supplicant_terminate_proc(priv->global);
+ return DBUS_HANDLER_RESULT_HANDLED;
+ } else
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
+
static int wpas_dbus_init_common(struct wpas_dbus_priv *priv)
{
DBusError error;
@@ -265,7 +282,10 @@ static int wpas_dbus_init_common(struct wpas_dbus_priv *priv)
/* Get a reference to the system bus */
dbus_error_init(&error);
priv->con = dbus_bus_get(DBUS_BUS_SYSTEM, &error);
- if (!priv->con) {
+ if (priv->con) {
+ dbus_connection_add_filter(priv->con, disconnect_filter, priv,
+ NULL);
+ } else {
wpa_printf(MSG_ERROR, "dbus: Could not acquire the system "
"bus: %s - %s", error.name, error.message);
ret = -1;
@@ -304,6 +324,9 @@ static void wpas_dbus_deinit_common(struct wpas_dbus_priv *priv)
NULL, NULL, NULL);
dbus_connection_set_timeout_functions(priv->con, NULL, NULL,
NULL, NULL, NULL);
+ dbus_connection_remove_filter(priv->con, disconnect_filter,
+ priv);
+
dbus_connection_unref(priv->con);
}