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

connection: don't reset fds on refill

Browse source 
Only reset fds when we finished reading the message
This commit is contained in:
Wim Taymans 2018-09-10 18:50:05 +02:00
parent 3c76b150c7
commit 28be82029b
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -136,6 +136,7 @@ static bool refill_buffer(struct pw_protocol_native_connection *conn, struct buf
struct msghdr msg = { 0 }; struct msghdr msg = { 0 };
struct iovec iov[1]; struct iovec iov[1];
char cmsgbuf[CMSG_SPACE(MAX_FDS * sizeof(int))]; char cmsgbuf[CMSG_SPACE(MAX_FDS * sizeof(int))];
int n_fds = 0;
iov[0].iov_base = buf->buffer_data + 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 = buf->buffer_maxsize - buf->buffer_size;
@ -160,17 +161,17 @@ static bool refill_buffer(struct pw_protocol_native_connection *conn, struct buf
buf->buffer_size += len; buf->buffer_size += len;
/* handle control messages */ /* handle control messages */
buf->n_fds = 0;
for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL; cmsg = CMSG_NXTHDR(&msg, cmsg)) { for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
if (cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS) if (cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS)
continue; continue;
buf->n_fds = n_fds =
(cmsg->cmsg_len - ((char *) CMSG_DATA(cmsg) - (char *) cmsg)) / sizeof(int); (cmsg->cmsg_len - ((char *) CMSG_DATA(cmsg) - (char *) cmsg)) / sizeof(int);
memcpy(buf->fds, CMSG_DATA(cmsg), buf->n_fds * sizeof(int)); memcpy(&buf->fds[buf->n_fds], CMSG_DATA(cmsg), n_fds * sizeof(int));
buf->n_fds += n_fds;
} }
pw_log_trace("connection %p: %d read %zd bytes and %d fds", conn, conn->fd, len, pw_log_trace("connection %p: %d read %zd bytes and %d fds", conn, conn->fd, len,
buf->n_fds); n_fds);
return true; return true;