fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-01-28 10:40:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'pollhup-fix' into 'main'

Browse source 
dbus-transport-socket: Handle _DBUS_POLLHUP case in socket_do_iteration

Closes #553

See merge request dbus/dbus!526
This commit is contained in:
Simon McVittie 2025-08-11 13:55:51 +00:00
commit a2ca9bc228
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
dbus/dbus-transport-socket.c
View file

@ -1208,8 +1208,15 @@ socket_do_iteration (DBusTransport *transport,
do_io_error (transport);
else
{
dbus_bool_t need_read = (poll_fd.revents & _DBUS_POLLIN) > 0;
dbus_bool_t need_write = (poll_fd.revents & _DBUS_POLLOUT) > 0;
/* FreeBSD does not deliver POLLERR when the other side gets disconnected.
* Instead it delivers POLLHUP that is not coupled with POLLIN nor POLLOUT.
* On the input side, treat this as equivalent to the POLLHUP|POLLIN we
* would see in this situation on Linux, so that we will enter
* do_reading() and detect the end-of-stream condition; and similarly,
* on the output side, treat it as equivalent to POLLHUP|POLLOUT.
*/
dbus_bool_t need_read = (poll_fd.revents & (_DBUS_POLLIN | _DBUS_POLLHUP)) > 0;
dbus_bool_t need_write = (poll_fd.revents & (_DBUS_POLLOUT | _DBUS_POLLHUP)) > 0;
dbus_bool_t authentication_completed;
_dbus_verbose ("in iteration, need_read=%d need_write=%d\n",