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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -561,12 +561,24 @@ 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)
{
int errorCode = GetLastErrorCode();
switch (errorCode)
{
case EWOULDBLOCK:
byteSent = 0;
break;
default:
{ {
if (error) if (error)
*error = TranslateErrnoToResolveError(GetLastErrorCode()); *error = TranslateErrnoToResolveError(errorCode);
return false; //< Error return false; //< Error
} }
}
}
if (sent) if (sent)
*sent = byteSent; *sent = byteSent;
@@ -638,12 +650,24 @@ 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)
{
int errorCode = GetLastErrorCode();
switch (errorCode)
{
case EWOULDBLOCK:
byteSent = 0;
break;
default:
{ {
if (error) if (error)
*error = TranslateErrnoToResolveError(GetLastErrorCode()); *error = TranslateErrnoToResolveError(errorCode);
return false; //< Error return false; //< Error
} }
}
}
if (sent) if (sent)
*sent = byteSent; *sent = byteSent;

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

@@ -593,12 +593,25 @@ 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)
{
int errorCode = WSAGetLastError();
switch (errorCode)
{
case WSAEWOULDBLOCK:
{
byteSent = 0;
break;
}
default:
{ {
if (error) if (error)
*error = TranslateWSAErrorToSocketError(WSAGetLastError()); *error = TranslateWSAErrorToSocketError(errorCode);
return false; //< Error return false; //< Error
} }
}
}
if (sent) if (sent)
*sent = byteSent; *sent = byteSent;
@@ -666,12 +679,25 @@ 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)
{
int errorCode = WSAGetLastError();
switch (errorCode)
{
case WSAEWOULDBLOCK:
{
byteSent = 0;
break;
}
default:
{ {
if (error) if (error)
*error = TranslateWSAErrorToSocketError(WSAGetLastError()); *error = TranslateWSAErrorToSocketError(errorCode);
return false; //< Error return false; //< Error
} }
}
}
if (sent) if (sent)
*sent = byteSent; *sent = byteSent;