github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-22 06:12:32 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

*Socket: Fix in error handling

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@3287 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2011-03-19 13:31:46 +00:00
parent 6b310e4db5
commit 60913c260d
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
uppsrc/Web/socket.cpp
View file

@ -193,7 +193,6 @@ bool Socket::Data::OpenClient(const char *host, int port, bool nodelay, dword *m
SLOG("Socket::Data::OpenClient(" << host << ':' << port << ", timeout " << timeout << ", block " << block << ')');
int ticks = msecs();
static StaticCriticalSection host_lock;
sockaddr_in sin;
sockaddr_in addr;
@ -224,7 +223,7 @@ bool Socket::Data::OpenClient(const char *host, int port, bool nodelay, dword *m
NoDelay();
while(bind(socket, (const sockaddr *)&sin, sizeof(sin))) {
if(GetLastError() != SOCKERR(EINPROGRESS) || !IsNull(timeout) && msecs(ticks) >= timeout) {
if(Socket::GetErrorCode() != SOCKERR(EINPROGRESS) || !IsNull(timeout) && msecs(ticks) >= timeout) {
SetSockError(NFormat("bind(host=%s, port=%d)", FormatIP(Peek32be(&addr.sin_addr)), port));
return false;
}
@ -243,7 +242,7 @@ bool Socket::Data::OpenClient(const char *host, int port, bool nodelay, dword *m
if(!connect(socket, (sockaddr *)&addr, sizeof(addr)))
return true;
int err = GetLastError();
int err = Socket::GetErrorCode();
#ifdef PLATFORM_WIN32
if(err != SOCKERR(EWOULDBLOCK))
#else
@ -321,7 +320,7 @@ int Socket::Data::Read(void *buf, int amount)
#endif
if(res == 0)
is_eof = true;
else if(res < 0 && GetLastError() != IS_BLOCKED)
else if(res < 0 && Socket::GetErrorCode() != IS_BLOCKED)
SetSockError("recv");
return res;
}
@ -329,7 +328,7 @@ int Socket::Data::Read(void *buf, int amount)
int Socket::Data::Write(const void *buf, int amount)
{
int res = send(socket, (const char *)buf, amount, 0);
if(res == 0 || res < 0 && GetLastError() != IS_BLOCKED)
if(res == 0 || res < 0 && Socket::GetErrorCode() != IS_BLOCKED)
SetSockError("send");
return res;
}
@ -529,7 +528,7 @@ int Socket::WriteWait(const char *s, int length, int timeout_msec)
SetSockError("WriteWait(blocking)->broken line");
return 0;
}
if(count < 0 / * && GetLastError() != SOCKERR(ETIMEDOUT)* /)
if(count < 0 / * && Socket::GetErrorCode() != SOCKERR(ETIMEDOUT)* /)
SetSockError("WriteWait(blocking)");
SLOG("//WriteWait(blocking) -> " << count);
return max(count, 0);
@ -822,6 +821,7 @@ void Socket::SetSockError(SOCKET socket, const char *context, int code, const ch
err << "socket(" << (int)socket << ") / ";
err << context << ": " << errdesc;
errordesc = err;
is_error = true;
SetErrorText(err);
}