debian-packages/eventcore
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix accidental resetting of O_NONBLOCK and set O_CLOEXEC on outgoing sockets, too.

Browse source
This commit is contained in:
Sönke Ludwig 2017-12-18 13:26:29 +01:00
parent 50fe0b28b5
commit 8528b4ec00
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
source/eventcore/drivers/posix/sockets.d
View file

@ -246,8 +246,7 @@ final class PosixEventDriverSockets(Loop : PosixEventLoop) : EventDriverSockets
} else { } else {
() @trusted { sockfd = accept(cast(sock_t)listenfd, () @trusted { return cast(sockaddr*)&addr; } (), &addr_len); } (); () @trusted { sockfd = accept(cast(sock_t)listenfd, () @trusted { return cast(sockaddr*)&addr; } (), &addr_len); } ();
if (sockfd == -1) return; if (sockfd == -1) return;
setSocketNonBlocking(cast(SocketFD)sockfd); setSocketNonBlocking(cast(SocketFD)sockfd, true);
setSocketCloseOnExec(cast(SocketFD)sockfd);
} }
auto fd = cast(StreamSocketFD)sockfd; auto fd = cast(StreamSocketFD)sockfd;
m_loop.initFD(fd, FDFlags.none); m_loop.initFD(fd, FDFlags.none);
@ -862,12 +861,12 @@ final class PosixEventDriverSockets(Loop : PosixEventLoop) : EventDriverSockets
{ {
sock_t sock; sock_t sock;
version (linux) { version (linux) {
() @trusted { sock = socket(family, type | SOCK_NONBLOCK, 0); } (); () @trusted { sock = socket(family, type | SOCK_NONBLOCK | SOCK_CLOEXEC, 0); } ();
if (sock == -1) return -1; if (sock == -1) return -1;
} else { } else {
() @trusted { sock = socket(family, type, 0); } (); () @trusted { sock = socket(family, type, 0); } ();
if (sock == -1) return -1; if (sock == -1) return -1;
setSocketNonBlocking(cast(SocketFD)sock); setSocketNonBlocking(cast(SocketFD)sock, true);
} }
return sock; return sock;
} }
@ -929,20 +928,15 @@ private void closeSocket(sock_t sockfd)
else close(sockfd); else close(sockfd);
} }
private void setSocketNonBlocking(SocketFD sockfd) private void setSocketNonBlocking(SocketFD sockfd, bool close_on_exec = false)
@nogc nothrow { @nogc nothrow {
version (Windows) { version (Windows) {
uint enable = 1; uint enable = 1;
() @trusted { ioctlsocket(sockfd, FIONBIO, &enable); } (); () @trusted { ioctlsocket(sockfd, FIONBIO, &enable); } ();
} else { } else {
() @trusted { fcntl(cast(int)sockfd, F_SETFL, O_NONBLOCK, 1); } (); int f = O_NONBLOCK;
} if (close_on_exec) f |= O_CLOEXEC;
} () @trusted { fcntl(cast(int)sockfd, F_SETFL, f); } ();
private void setSocketCloseOnExec(SocketFD sockfd)
@nogc nothrow {
version (Windows) {} else {
() @trusted { fcntl(cast(int)sockfd, F_SETFL, O_CLOEXEC, 1); } ();
} }
} }