GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added support for timeout when receiving data from a socket (POSIX platform).

Browse Source
This commit is contained in:
Vincent Richard 2012-10-15 11:48:14 +02:00
parent 2b09c6ea6c
commit 794afe9a1b
1 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/platforms/posix/posixSocket.cpp
View File

@ -336,7 +336,45 @@ void posixSocket::receive(vmime::string& buffer)
posixSocket::size_type posixSocket::receiveRaw(char* buffer, const size_type count)
{
const int ret = ::recv(m_desc, buffer, count, 0);
// Check whether data is available
fd_set fds;
FD_ZERO(&fds);
FD_SET(m_desc, &fds);
struct timeval tv;
tv.tv_sec = 1;
tv.tv_usec = 0;
int ret = ::select(m_desc + 1, &fds, NULL, NULL, &tv);
if (ret < 0)
{
if (errno != EAGAIN)
throwSocketError(errno);
// No data available at this time
// Check if we are timed out
if (m_timeoutHandler &&
m_timeoutHandler->isTimeOut())
{
if (!m_timeoutHandler->handleTimeOut())
{
// Server did not react within timeout delay
throwSocketError(errno);
}
else
{
// Reset timeout
m_timeoutHandler->resetTimeOut();
}
}
// Continue waiting for data
return 0;
}
// Read available data
ret = ::recv(m_desc, buffer, count, 0);
if (ret < 0)
{
@ -351,6 +389,12 @@ posixSocket::size_type posixSocket::receiveRaw(char* buffer, const size_type cou
// Host shutdown
throwSocketError(ENOTCONN);
}
else
{
// Data received, reset timeout
if (m_timeoutHandler)
m_timeoutHandler->resetTimeOut();
}
return ret;
}
@ -383,6 +427,10 @@ void posixSocket::sendRaw(const char* buffer, const size_type count)
size -= ret;
}
}
// Reset timeout
if (m_timeoutHandler)
m_timeoutHandler->resetTimeOut();
}