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

cancelConnectStream for Posix

Browse source
This commit is contained in:
Boris-Barboris 2017-11-11 01:14:54 +00:00
parent 8d7c1e3c96
commit 0cac9d56e0
4 changed files with 38 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -95,7 +95,7 @@ final class PosixEventDriverSockets(Loop : PosixEventLoop) : EventDriverSockets
m_loop.registerFD(sock, EventMask.read|EventMask.write|EventMask.status);
m_loop.m_fds[sock].specific = StreamSocketSlot.init;
m_loop.setNotifyCallback!(EventType.status)(sock, &onConnectError);
releaseRef(sock); // setNotifyCallback adds a reference, but waiting for status/disconnect should not affect the ref count
releaseRef(sock); // onConnectError callback is weak reference
auto ret = () @trusted { return connect(cast(sock_t)sock, address.name, address.nameLen); } ();
if (ret == 0) {
@ -113,14 +113,32 @@ final class PosixEventDriverSockets(Loop : PosixEventLoop) : EventDriverSockets
m_loop.clearFD(sock);
m_loop.unregisterFD(sock, EventMask.read|EventMask.write|EventMask.status);
invalidateSocket();
on_connect(sock, ConnectStatus.unknownError);
return sock;
on_connect(StreamSocketFD.invalid, ConnectStatus.unknownError);
return StreamSocketFD.invalid;
}
}
return sock;
}
final override void cancelConnectStream(StreamSocketFD sock)
{
assert(sock != StreamSocketFD.invalid, "Invalid socket descriptor");
with (m_loop.m_fds[sock].streamSocket)
{
assert(state == ConnectionState.connecting,
"Unable to cancel connect on the socket that is not in connecting state");
state = ConnectionState.closed;
auto cb = connectCallback;
connectCallback = null;
m_loop.clearFD(sock);
m_loop.unregisterFD(sock, EventMask.read|EventMask.write|EventMask.status);
closeSocket(cast(sock_t)sock.value);
if (cb)
cb(StreamSocketFD.invalid, ConnectStatus.cancelled);
}
}
final override StreamSocketFD adoptStream(int socket)
{
auto fd = StreamSocketFD(socket);
@ -226,7 +244,7 @@ final class PosixEventDriverSockets(Loop : PosixEventLoop) : EventDriverSockets
m_loop.m_fds[fd].streamSocket.state = ConnectionState.connected;
m_loop.registerFD(fd, EventMask.read|EventMask.write|EventMask.status);
m_loop.setNotifyCallback!(EventType.status)(fd, &onConnectError);
releaseRef(fd); // setNotifyCallback adds a reference, but waiting for status/disconnect should not affect the ref count
releaseRef(fd); // onConnectError callback is weak reference
//print("accept %d", sockfd);
scope RefAddress addrc = new RefAddress(() @trusted { return cast(sockaddr*)&addr; } (), addr_len);
m_loop.m_fds[listenfd].streamListen.acceptCallback(cast(StreamListenSocketFD)listenfd, fd, addrc);
@ -889,4 +907,3 @@ private int getSocketError()
version (Windows) return WSAGetLastError();
else return errno;
}