jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

dbus: Check eloop registration failure in add_watch handler

Browse source 
Report failures at lower layer to the upper layer D-Bus handling of
socket registration to allow failures to be addressed more cleanly.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2020-11-04 19:39:08 +02:00 committed by Jouni Malinen
parent 56a1df71e5
commit aa06444f2c
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
wpa_supplicant/dbus/dbus_common.c
View file

@ -108,17 +108,18 @@ static dbus_bool_t add_watch(DBusWatch *watch, void *data)
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);
eloop_register_sock(fd, EVENT_TYPE_EXCEPTION, process_watch_exception, if (eloop_register_sock(fd, EVENT_TYPE_EXCEPTION,
priv, watch); process_watch_exception, priv, watch) < 0)
return FALSE;
if (flags & DBUS_WATCH_READABLE) { if ((flags & DBUS_WATCH_READABLE) &&
eloop_register_sock(fd, EVENT_TYPE_READ, process_watch_read, eloop_register_sock(fd, EVENT_TYPE_READ, process_watch_read,
priv, watch); priv, watch) < 0)
} return FALSE;
if (flags & DBUS_WATCH_WRITABLE) { if ((flags & DBUS_WATCH_WRITABLE) &&
eloop_register_sock(fd, EVENT_TYPE_WRITE, process_watch_write, eloop_register_sock(fd, EVENT_TYPE_WRITE, process_watch_write,
priv, watch); priv, watch) < 0)
} return FALSE;
dbus_watch_set_data(watch, priv, NULL); dbus_watch_set_data(watch, priv, NULL);