backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-02-08 21:03:54 +08:00
Code Issues Projects Releases Wiki Activity

fixed CTCPSocket::connect() to allow cancellation.

Browse Source
This commit is contained in:
crs
2002-06-21 16:19:08 +00:00
parent e2ee2371e0
commit 327af03d3d
4 changed files with 84 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
net/CTCPSocket.cpp
View File

@@ -109,13 +109,52 @@ CTCPSocket::close()
void
CTCPSocket::connect(const CNetworkAddress& addr)
{
CThread::testCancel();
// connect asynchronously so we can check for cancellation
CNetwork::setblocking(m_fd, false);
if (CNetwork::connect(m_fd, addr.getAddress(),
addr.getAddressLength()) == CNetwork::Error) {
CThread::testCancel();
throw XSocketConnect();
// check for failure
if (CNetwork::getsockerror() != CNetwork::kECONNECTING) {
CNetwork::setblocking(m_fd, true);
throw XSocketConnect();
}
// wait for connection or failure
CNetwork::PollEntry pfds[1];
pfds[0].fd = m_fd;
pfds[0].events = CNetwork::kPOLLOUT;
for (;;) {
CThread::testCancel();
const int status = CNetwork::poll(pfds, 1, 10);
if (status > 0) {
if ((pfds[0].revents & (CNetwork::kPOLLERR |
CNetwork::kPOLLNVAL)) != 0) {
// connection failed
CNetwork::setblocking(m_fd, true);
throw XSocketConnect();
}
if ((pfds[0].revents & CNetwork::kPOLLOUT) != 0) {
int error;
CNetwork::AddressLength size = sizeof(error);
if (CNetwork::getsockopt(m_fd, SOL_SOCKET, SO_ERROR,
reinterpret_cast<char*>(&error),
&size) == CNetwork::Error ||
error != 0) {
// connection failed
CNetwork::setblocking(m_fd, true);
throw XSocketConnect();
}
// connected!
break;
}
}
}
}
// back to blocking
CNetwork::setblocking(m_fd, true);
// start servicing the socket
m_connected = kReadWrite;
m_thread = new CThread(new TMethodJob<CTCPSocket>(