oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

system/EventPipe: use class UniqueSocketDescriptor in PoorSocketPair()

Browse Source
This commit is contained in:
Max Kellermann
2017-08-11 08:39:59 +02:00
parent bcd5190f1d
commit 2119e4fd3e
1 changed files with 13 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/system/EventPipe.cxx
View File

@@ -29,9 +29,9 @@
#ifdef WIN32 #ifdef WIN32
#include "net/IPv4Address.hxx" #include "net/IPv4Address.hxx"
#include "net/StaticSocketAddress.hxx"
#include "net/UniqueSocketDescriptor.hxx"
#include "net/SocketError.hxx" #include "net/SocketError.hxx"
#include <winsock2.h>
#endif #endif
#ifdef WIN32 #ifdef WIN32
@@ -88,13 +88,6 @@ EventPipe::Write()
#ifdef WIN32 #ifdef WIN32
static void SafeCloseSocket(SOCKET s)
{
int error = WSAGetLastError();
closesocket(s);
WSASetLastError(error);
}
/* Our poor man's socketpair() implementation /* Our poor man's socketpair() implementation
* Due to limited protocol/address family support * Due to limited protocol/address family support
* it's better to keep this as a private implementation detail of EventPipe * it's better to keep this as a private implementation detail of EventPipe
@@ -105,61 +98,29 @@ PoorSocketPair(int fd[2])
{ {
assert (fd != nullptr); assert (fd != nullptr);
SOCKET listen_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); UniqueSocketDescriptor listen_socket;
if (listen_socket == INVALID_SOCKET) if (!listen_socket.CreateNonBlock(AF_INET, SOCK_STREAM, IPPROTO_TCP))
throw MakeSocketError("Failed to create socket"); throw MakeSocketError("Failed to create socket");
AtScopeExit(listen_socket) { if (!listen_socket.Bind(IPv4Address(IPv4Address::Loopback(), 0)))
closesocket(listen_socket);
};
IPv4Address address(IPv4Address::Loopback(), 0);
int ret = bind(listen_socket,
SocketAddress(address).GetAddress(), sizeof(address));
if (ret < 0)
throw MakeSocketError("Failed to create socket"); throw MakeSocketError("Failed to create socket");
ret = listen(listen_socket, 1); if (!listen_socket.Listen(1))
if (ret < 0)
throw MakeSocketError("Failed to listen on socket"); throw MakeSocketError("Failed to listen on socket");
int address_len = sizeof(address); UniqueSocketDescriptor socket0;
ret = getsockname(listen_socket, if (!socket0.CreateNonBlock(AF_INET, SOCK_STREAM, IPPROTO_TCP))
reinterpret_cast<sockaddr*>(&address),
&address_len);
if (ret < 0)
throw MakeSocketError("Failed to obtain socket bind address");
SOCKET socket0 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
if (socket0 == INVALID_SOCKET)
throw MakeSocketError("Failed to create socket"); throw MakeSocketError("Failed to create socket");
ret = connect(socket0, if (!socket0.Connect(listen_socket.GetLocalAddress()))
reinterpret_cast<sockaddr*>(&address),
sizeof(address));
if (ret < 0) {
SafeCloseSocket(socket0);
throw MakeSocketError("Failed to connect socket"); throw MakeSocketError("Failed to connect socket");
}
SOCKET socket1 = accept(listen_socket, nullptr, nullptr); auto socket1 = listen_socket.AcceptNonBlock();
if (socket1 == INVALID_SOCKET) { if (!socket1.IsDefined())
SafeCloseSocket(socket0);
throw MakeSocketError("Failed to accept connection"); throw MakeSocketError("Failed to accept connection");
}
u_long non_block = 1; fd[0] = socket0.Steal();
if (ioctlsocket(socket0, FIONBIO, &non_block) < 0 fd[1] = socket1.Steal();
|| ioctlsocket(socket1, FIONBIO, &non_block) < 0) {
SafeCloseSocket(socket0);
SafeCloseSocket(socket1);
throw MakeSocketError("Failed to enable non-blocking mode on socket");
}
fd[0] = static_cast<int>(socket0);
fd[1] = static_cast<int>(socket1);
} }
#endif #endif