xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix use of unportable MSG_CMSG_CLOEXEC

Browse Source
This commit is contained in:
Maxime Coste 2020-05-17 21:27:56 +10:00
parent b44c4f41a6
commit 5fd548d5cf
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/remote.cc
View File

@ -294,7 +294,7 @@ private:
msg.msg_control = fdbuf; msg.msg_control = fdbuf;
msg.msg_controllen = sizeof(fdbuf); msg.msg_controllen = sizeof(fdbuf);
int res = recvmsg(sock, &msg, MSG_CMSG_CLOEXEC); int res = recvmsg(sock, &msg, 0);
if (res <= 0) if (res <= 0)
throw disconnected{format("socket read failed: {}", strerror(errno))}; throw disconnected{format("socket read failed: {}", strerror(errno))};
@ -305,6 +305,7 @@ private:
{ {
m_ancillary_fd.map(close); m_ancillary_fd.map(close);
memcpy(&m_ancillary_fd.emplace(), CMSG_DATA(cmsg), sizeof(int)); memcpy(&m_ancillary_fd.emplace(), CMSG_DATA(cmsg), sizeof(int));
fcntl(*m_ancillary_fd, F_SETFD, FD_CLOEXEC);
} }
} }