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

Fix cancellation of connectTCP in case of early errors.

Browse source 
Certain errors will result in an invalid handle to be returned from eventDriver.sockets.connectStream. In that case it is invalid to call cancelConnect.

Also adds an additional debug log message including a stack trace in case of exceptions thrown from connection handlers.
This commit is contained in:
Sönke Ludwig 2018-03-18 12:13:13 +01:00
parent 88bcae036c
commit e2eef799f8
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/vibe/core/net.d
View file

@ -39,6 +39,7 @@ NetworkAddress resolveHost(string host, ushort address_family, bool use_dns = tr
else import core.sys.posix.netinet.in_ : sockaddr_in, sockaddr_in6; else import core.sys.posix.netinet.in_ : sockaddr_in, sockaddr_in6;
enforce(host.length > 0, "Host name must not be empty."); enforce(host.length > 0, "Host name must not be empty.");
// FIXME: this check needs to be more specific to not disallow valid DNS names
if (host[0] == ':' || host[0] >= '0' && host[0] <= '9') { if (host[0] == ':' || host[0] >= '0' && host[0] <= '9') {
auto addr = parseAddress(host); auto addr = parseAddress(host);
enforce(address_family == AddressFamily.UNSPEC || addr.addressFamily == address_family); enforce(address_family == AddressFamily.UNSPEC || addr.addressFamily == address_family);
@ -135,6 +136,7 @@ TCPListener listenTCP(ushort port, void delegate(TCPConnection) connection_callb
catch (Exception e) { catch (Exception e) {
logError("Handling of connection failed: %s", e.msg); logError("Handling of connection failed: %s", e.msg);
conn.close(); conn.close();
logDebug("Full error: %s", e);
} }
}, address, options); }, address, options);
} }
@ -204,7 +206,8 @@ TCPConnection connectTCP(NetworkAddress addr, NetworkAddress bind_address = anyA
cb => eventDriver.sockets.connectStream(uaddr, baddr, cb), cb => eventDriver.sockets.connectStream(uaddr, baddr, cb),
(cb, sock_fd) { (cb, sock_fd) {
cancelled = true; cancelled = true;
eventDriver.sockets.cancelConnectStream(sock_fd); if (sock_fd != SocketFD.invalid)
eventDriver.sockets.cancelConnectStream(sock_fd);
}, },
(fd, st) { sock = fd; status = st; } (fd, st) { sock = fd; status = st; }
); );