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

Call the callback on connectStream socket creation failure.

Browse source 
The callback must *always* be called at some point, because the generic async->sync logic in vibe-core otherwise has no way to know whether to expect a callback or not.
This commit is contained in:
Sönke Ludwig 2018-03-14 20:43:40 +01:00
parent 0044946413
commit 02de8341aa
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/eventcore/driver.d
View file

@ -570,6 +570,7 @@ enum ConnectStatus {
refused, refused,
timeout, timeout,
bindFailure, bindFailure,
socketCreateFailure,
unknownError unknownError
} }

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

@ -90,7 +90,10 @@ final class PosixEventDriverSockets(Loop : PosixEventLoop) : EventDriverSockets
assert(on_connect !is null); assert(on_connect !is null);
auto sockfd = createSocket(address.addressFamily, SOCK_STREAM); auto sockfd = createSocket(address.addressFamily, SOCK_STREAM);
if (sockfd == -1) return StreamSocketFD.invalid; if (sockfd == -1) {
on_connect(StreamSocketFD.invalid, ConnectStatus.socketCreateFailure);
return StreamSocketFD.invalid;
}
auto sock = cast(StreamSocketFD)sockfd; auto sock = cast(StreamSocketFD)sockfd;

4
source/eventcore/drivers/winapi/sockets.d
View file

@ -41,8 +41,10 @@ final class WinAPIEventDriverSockets : EventDriverSockets {
assert(m_tid == GetCurrentThreadId()); assert(m_tid == GetCurrentThreadId());
auto fd = WSASocketW(peer_address.addressFamily, SOCK_STREAM, IPPROTO_TCP, null, 0, WSA_FLAG_OVERLAPPED); auto fd = WSASocketW(peer_address.addressFamily, SOCK_STREAM, IPPROTO_TCP, null, 0, WSA_FLAG_OVERLAPPED);
if (fd == INVALID_SOCKET) if (fd == INVALID_SOCKET) {
on_connect(StreamSocketFD.invalid, ConnectStatus.socketCreateFailure);
return StreamSocketFD.invalid; return StreamSocketFD.invalid;
}
void invalidateSocket() @nogc @trusted nothrow { closesocket(fd); fd = INVALID_SOCKET; } void invalidateSocket() @nogc @trusted nothrow { closesocket(fd); fd = INVALID_SOCKET; }