DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

dbus: Cleaned up initialization and integration with eloop

Browse source
This commit is contained in:
Jouni Malinen 2010-01-01 21:21:20 +02:00
parent c2b8c674cb
commit ccafcbed32
1 changed files with 35 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

119
wpa_supplicant/dbus/dbus_common.c
View file

@ -36,6 +36,14 @@
#endif #endif
static void dispatch_data(DBusConnection *con)
{
while (dbus_connection_get_dispatch_status(con) ==
DBUS_DISPATCH_DATA_REMAINS)
dbus_connection_dispatch(con);
}
/** /**
* dispatch_initial_dbus_messages - Dispatch initial dbus messages after * dispatch_initial_dbus_messages - Dispatch initial dbus messages after
* claiming bus name * claiming bus name
@ -49,10 +57,7 @@
static void dispatch_initial_dbus_messages(void *eloop_ctx, void *timeout_ctx) static void dispatch_initial_dbus_messages(void *eloop_ctx, void *timeout_ctx)
{ {
DBusConnection *con = eloop_ctx; DBusConnection *con = eloop_ctx;
dispatch_data(con);
while (dbus_connection_get_dispatch_status(con) ==
DBUS_DISPATCH_DATA_REMAINS)
dbus_connection_dispatch(con);
} }
@ -71,9 +76,7 @@ static void process_watch(struct wpas_dbus_priv *priv,
dbus_watch_handle(watch, DBUS_WATCH_ERROR); dbus_watch_handle(watch, DBUS_WATCH_ERROR);
if (priv->should_dispatch) { if (priv->should_dispatch) {
while (dbus_connection_get_dispatch_status(priv->con) == dispatch_data(priv->con);
DBUS_DISPATCH_DATA_REMAINS)
dbus_connection_dispatch(priv->con);
priv->should_dispatch = 0; priv->should_dispatch = 0;
} }
@ -99,14 +102,14 @@ static void process_watch_write(int sock, void *eloop_ctx, void *sock_ctx)
} }
static void connection_setup_add_watch(struct wpas_dbus_priv *priv, static dbus_bool_t add_watch(DBusWatch *watch, void *data)
DBusWatch *watch)
{ {
struct wpas_dbus_priv *priv = data;
unsigned int flags; unsigned int flags;
int fd; int fd;
if (!dbus_watch_get_enabled(watch)) if (!dbus_watch_get_enabled(watch))
return; return TRUE;
flags = dbus_watch_get_flags(watch); flags = dbus_watch_get_flags(watch);
fd = dbus_watch_get_unix_fd(watch); fd = dbus_watch_get_unix_fd(watch);
@ -124,11 +127,12 @@ static void connection_setup_add_watch(struct wpas_dbus_priv *priv,
} }
dbus_watch_set_data(watch, priv, NULL); dbus_watch_set_data(watch, priv, NULL);
return TRUE;
} }
static void connection_setup_remove_watch(struct wpas_dbus_priv *priv, static void remove_watch(DBusWatch *watch, void *data)
DBusWatch *watch)
{ {
unsigned int flags; unsigned int flags;
int fd; int fd;
@ -147,19 +151,6 @@ static void connection_setup_remove_watch(struct wpas_dbus_priv *priv,
} }
static dbus_bool_t add_watch(DBusWatch *watch, void *data)
{
connection_setup_add_watch(data, watch);
return TRUE;
}
static void remove_watch(DBusWatch *watch, void *data)
{
connection_setup_remove_watch(data, watch);
}
static void watch_toggled(DBusWatch *watch, void *data) static void watch_toggled(DBusWatch *watch, void *data)
{ {
if (dbus_watch_get_enabled(watch)) if (dbus_watch_get_enabled(watch))
@ -172,38 +163,20 @@ static void watch_toggled(DBusWatch *watch, void *data)
static void process_timeout(void *eloop_ctx, void *sock_ctx) static void process_timeout(void *eloop_ctx, void *sock_ctx)
{ {
DBusTimeout *timeout = sock_ctx; DBusTimeout *timeout = sock_ctx;
dbus_timeout_handle(timeout); dbus_timeout_handle(timeout);
} }
static void connection_setup_add_timeout(struct wpas_dbus_priv *priv,
DBusTimeout *timeout)
{
if (!dbus_timeout_get_enabled(timeout))
return;
eloop_register_timeout(0, dbus_timeout_get_interval(timeout) * 1000,
process_timeout, priv, timeout);
dbus_timeout_set_data(timeout, priv, NULL);
}
static void connection_setup_remove_timeout(struct wpas_dbus_priv *priv,
DBusTimeout *timeout)
{
eloop_cancel_timeout(process_timeout, priv, timeout);
dbus_timeout_set_data(timeout, NULL, NULL);
}
static dbus_bool_t add_timeout(DBusTimeout *timeout, void *data) static dbus_bool_t add_timeout(DBusTimeout *timeout, void *data)
{ {
struct wpas_dbus_priv *priv = data;
if (!dbus_timeout_get_enabled(timeout)) if (!dbus_timeout_get_enabled(timeout))
return TRUE; return TRUE;
connection_setup_add_timeout(data, timeout); eloop_register_timeout(0, dbus_timeout_get_interval(timeout) * 1000,
process_timeout, priv, timeout);
dbus_timeout_set_data(timeout, priv, NULL);
return TRUE; return TRUE;
} }
@ -211,7 +184,9 @@ static dbus_bool_t add_timeout(DBusTimeout *timeout, void *data)
static void remove_timeout(DBusTimeout *timeout, void *data) static void remove_timeout(DBusTimeout *timeout, void *data)
{ {
connection_setup_remove_timeout(data, timeout); struct wpas_dbus_priv *priv = data;
eloop_cancel_timeout(process_timeout, priv, timeout);
dbus_timeout_set_data(timeout, NULL, NULL);
} }
@ -259,55 +234,30 @@ static void wakeup_main(void *data)
} }
/**
* connection_setup_wakeup_main - Tell dbus about our wakeup_main function
* @priv: dbus control interface private data
* Returns: 0 on success, -1 on failure
*
* Register our wakeup_main handler with dbus
*/
static int connection_setup_wakeup_main(struct wpas_dbus_priv *priv)
{
if (eloop_register_signal(SIGPOLL, process_wakeup_main, priv))
return -1;
dbus_connection_set_wakeup_main_function(priv->con, wakeup_main,
priv, NULL);
return 0;
}
/** /**
* integrate_with_eloop - Register our mainloop integration with dbus * integrate_with_eloop - Register our mainloop integration with dbus
* @connection: connection to the system message bus * @connection: connection to the system message bus
* @priv: a dbus control interface data structure * @priv: a dbus control interface data structure
* Returns: 0 on success, -1 on failure * Returns: 0 on success, -1 on failure
*
* We register our mainloop integration functions with dbus here.
*/ */
static int integrate_with_eloop(struct wpas_dbus_priv *priv) static int integrate_with_eloop(struct wpas_dbus_priv *priv)
{ {
if (!dbus_connection_set_watch_functions(priv->con, add_watch, if (!dbus_connection_set_watch_functions(priv->con, add_watch,
remove_watch, watch_toggled, remove_watch, watch_toggled,
priv, NULL)) { priv, NULL) ||
wpa_printf(MSG_ERROR, "dbus: Not enough memory to set up"); !dbus_connection_set_timeout_functions(priv->con, add_timeout,
return -1;
}
if (!dbus_connection_set_timeout_functions(priv->con, add_timeout,
remove_timeout, remove_timeout,
timeout_toggled, priv, timeout_toggled, priv,
NULL)) { NULL)) {
wpa_printf(MSG_ERROR, "dbus: Not enough memory to set up"); wpa_printf(MSG_ERROR, "dbus: Failed to set callback "
"functions");
return -1; return -1;
} }
if (connection_setup_wakeup_main(priv) < 0) { if (eloop_register_signal(SIGPOLL, process_wakeup_main, priv))
wpa_printf(MSG_ERROR, "dbus: Could not setup main wakeup "
"function");
return -1; return -1;
} dbus_connection_set_wakeup_main_function(priv->con, wakeup_main,
priv, NULL);
return 0; return 0;
} }
@ -316,16 +266,17 @@ static int integrate_with_eloop(struct wpas_dbus_priv *priv)
static int wpas_dbus_init_common(struct wpas_dbus_priv *priv) static int wpas_dbus_init_common(struct wpas_dbus_priv *priv)
{ {
DBusError error; DBusError error;
int ret = 0;
/* Get a reference to the system bus */ /* Get a reference to the system bus */
dbus_error_init(&error); dbus_error_init(&error);
priv->con = dbus_bus_get(DBUS_BUS_SYSTEM, &error); priv->con = dbus_bus_get(DBUS_BUS_SYSTEM, &error);
dbus_error_free(&error);
if (!priv->con) { if (!priv->con) {
wpa_printf(MSG_ERROR, "dbus: Could not acquire the system " wpa_printf(MSG_ERROR, "dbus: Could not acquire the system "
"bus: %s", strerror(errno)); "bus: %s - %s", error.name, error.message);
return -1; ret = -1;
} }
dbus_error_free(&error);
return 0; return 0;
} }