sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Network/SocketImpl: Fix Send causing a SocketError_Internal status on non-blocking sockets

This commit is contained in:
Lynix 2017-01-27 15:05:04 +01:00
parent 002d33f590
commit 453ca77c1b
2 changed files with 62 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/Nazara/Network/Posix/SocketImpl.cpp
View File

@ -562,10 +562,22 @@ namespace Nz
int byteSent = send(handle, reinterpret_cast<const char*>(buffer), length, 0); int byteSent = send(handle, reinterpret_cast<const char*>(buffer), length, 0);
if (byteSent == SOCKET_ERROR) if (byteSent == SOCKET_ERROR)
{ {
if (error) int errorCode = GetLastErrorCode();
*error = TranslateErrnoToResolveError(GetLastErrorCode());
return false; //< Error switch (errorCode)
{
case EWOULDBLOCK:
byteSent = 0;
break;
default:
{
if (error)
*error = TranslateErrnoToResolveError(errorCode);
return false; //< Error
}
}
} }
if (sent) if (sent)
@ -639,10 +651,22 @@ namespace Nz
int byteSent = sendto(handle, reinterpret_cast<const char*>(buffer), length, 0, reinterpret_cast<const sockaddr*>(nameBuffer.data()), bufferLength); int byteSent = sendto(handle, reinterpret_cast<const char*>(buffer), length, 0, reinterpret_cast<const sockaddr*>(nameBuffer.data()), bufferLength);
if (byteSent == SOCKET_ERROR) if (byteSent == SOCKET_ERROR)
{ {
if (error) int errorCode = GetLastErrorCode();
*error = TranslateErrnoToResolveError(GetLastErrorCode());
return false; //< Error switch (errorCode)
{
case EWOULDBLOCK:
byteSent = 0;
break;
default:
{
if (error)
*error = TranslateErrnoToResolveError(errorCode);
return false; //< Error
}
}
} }
if (sent) if (sent)

38
src/Nazara/Network/Win32/SocketImpl.cpp
View File

@ -594,10 +594,23 @@ namespace Nz
int byteSent = send(handle, reinterpret_cast<const char*>(buffer), length, 0); int byteSent = send(handle, reinterpret_cast<const char*>(buffer), length, 0);
if (byteSent == SOCKET_ERROR) if (byteSent == SOCKET_ERROR)
{ {
if (error) int errorCode = WSAGetLastError();
*error = TranslateWSAErrorToSocketError(WSAGetLastError()); switch (errorCode)
{
case WSAEWOULDBLOCK:
{
byteSent = 0;
break;
}
return false; //< Error default:
{
if (error)
*error = TranslateWSAErrorToSocketError(errorCode);
return false; //< Error
}
}
} }
if (sent) if (sent)
@ -667,10 +680,23 @@ namespace Nz
int byteSent = sendto(handle, reinterpret_cast<const char*>(buffer), length, 0, reinterpret_cast<const sockaddr*>(nameBuffer.data()), bufferLength); int byteSent = sendto(handle, reinterpret_cast<const char*>(buffer), length, 0, reinterpret_cast<const sockaddr*>(nameBuffer.data()), bufferLength);
if (byteSent == SOCKET_ERROR) if (byteSent == SOCKET_ERROR)
{ {
if (error) int errorCode = WSAGetLastError();
*error = TranslateWSAErrorToSocketError(WSAGetLastError()); switch (errorCode)
{
case WSAEWOULDBLOCK:
{
byteSent = 0;
break;
}
return false; //< Error default:
{
if (error)
*error = TranslateWSAErrorToSocketError(errorCode);
return false; //< Error
}
}
} }
if (sent) if (sent)