pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-28 02:16:37 +02:00
Code Activity

Ignore nonblocking errnors on socket operations

Browse Source
This commit is contained in:
Adam
2014-02-05 15:26:03 -05:00
parent 2440514a7b
commit 66cc965fd7
4 changed files with 70 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sockets.cpp
+33 -5
View File
@@ -348,15 +348,17 @@ size_t cidr::hash::operator()(const cidr &s) const
int SocketIO::Recv(Socket *s, char *buf, size_t sz)
{
size_t i = recv(s->GetFD(), buf, sz, 0);
TotalRead += i;
int i = recv(s->GetFD(), buf, sz, 0);
if (i > 0)
TotalRead += i;
return i;
}
int SocketIO::Send(Socket *s, const char *buf, size_t sz)
{
size_t i = send(s->GetFD(), buf, sz, 0);
TotalWritten += i;
int i = send(s->GetFD(), buf, sz, 0);
if (i > 0)
TotalWritten += i;
return i;
}
@@ -402,7 +404,7 @@ void SocketIO::Connect(ConnectionSocket *s, const Anope::string &target, int por
int c = connect(s->GetFD(), &s->conaddr.sa, s->conaddr.size());
if (c == -1)
{
if (Anope::LastErrorCode() != EINPROGRESS)
if (!SocketEngine::IgnoreErrno())
s->OnError(Anope::LastError());
else
{
@@ -542,3 +544,29 @@ bool ListenSocket::ProcessRead()
return true;
}
int SocketEngine::GetLastError()
{
#ifndef _WIN32
return errno;
#else
return WSAGetLastError();
#endif
}
void SocketEngine::SetLastError(int err)
{
#ifndef _WIN32
errno = err;
#else
WSASetLastError(err);
#endif
}
bool SocketEngine::IgnoreErrno()
{
return GetLastError() == EAGAIN
|| GetLastError() == EWOULDBLOCK
|| GetLastError() == EINTR
|| GetLastError() == EINPROGRESS;
}