Skip to content

M
mpd
Commit 7a568371 authored by Max Kellermann's avatar Max Kellermann Committed by Max Kellermann
Browse files
Options

odbus/Watch: support DBUS_WATCH_{ERROR,HANGUP}

parent ed1caffc
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
src/lib/dbus/Watch.cxx
View file @ 7a568371
......@@ -48,7 +48,9 @@ static constexpr unsigned
DbusToLibevent(unsigned flags) noexcept
{
return ((flags & DBUS_WATCH_READABLE) != 0) * SocketEvent::READ |
((flags & DBUS_WATCH_WRITABLE) != 0) * SocketEvent::WRITE;
((flags & DBUS_WATCH_WRITABLE) != 0) * SocketEvent::WRITE |
((flags & DBUS_WATCH_ERROR) != 0) * SocketEvent::ERROR |
((flags & DBUS_WATCH_HANGUP) != 0) * SocketEvent::HANGUP;
}
void
......@@ -66,7 +68,9 @@ static constexpr unsigned
LibeventToDbus(unsigned flags) noexcept
{
return ((flags & SocketEvent::READ) != 0) * DBUS_WATCH_READABLE |
((flags & SocketEvent::WRITE) != 0) * DBUS_WATCH_WRITABLE;
((flags & SocketEvent::WRITE) != 0) * DBUS_WATCH_WRITABLE |
((flags & SocketEvent::ERROR) != 0) * DBUS_WATCH_ERROR |
((flags & SocketEvent::HANGUP) != 0) * DBUS_WATCH_HANGUP;
}
void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment