oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

odbus/Watch: support DBUS_WATCH_{ERROR,HANGUP}

This commit is contained in:
Max Kellermann 2020-12-14 09:00:41 +01:00 committed by Max Kellermann
parent ed1caffc79
commit 7a56837141
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/dbus/Watch.cxx
View File

@ -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