mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

protocol-native: also handle 0 recvmsg as EOF

Browse source 
When recvmsg returns 0, also handle it like an EOF and close to
connection otherwise we keep spinning forever.
This commit is contained in:
Wim Taymans 2019-05-13 10:08:30 +02:00
parent a2bf4ce96e
commit 795b14f48b
2 changed files with 27 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/modules/module-protocol-native/connection.c
View file

@ -147,9 +147,12 @@ static int refill_buffer(struct pw_protocol_native_connection *conn, struct buff
struct iovec iov[1];
char cmsgbuf[CMSG_SPACE(MAX_FDS_MSG * sizeof(int))];
int n_fds = 0;
size_t avail;
avail = buf->buffer_maxsize - buf->buffer_size;
iov[0].iov_base = buf->buffer_data + buf->buffer_size;
iov[0].iov_len = buf->buffer_maxsize - buf->buffer_size;
iov[0].iov_len = avail;
msg.msg_iov = iov;
msg.msg_iovlen = 1;
msg.msg_control = cmsgbuf;
@ -158,7 +161,9 @@ static int refill_buffer(struct pw_protocol_native_connection *conn, struct buff
while (true) {
len = recvmsg(conn->fd, &msg, msg.msg_flags);
if (len <= 0) {
if (len == 0 && avail != 0)
return -EPIPE;
else if (len < 0) {
if (errno == EINTR)
continue;
if (errno != EAGAIN || errno != EWOULDBLOCK)