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

Network/SocketPoller: Uniformize behavior accross platforms

Browse Source 
On Windows, a closed connection will mark as ready for read/write
This commit is contained in:
Jérôme Leclercq
2017-10-04 10:53:51 +02:00
committed by Lynix
parent d1eac591f5
commit 874599fefd
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Nazara/Network/Win32/SocketPollerImpl.cpp
View File

@@ -143,12 +143,12 @@ namespace Nz
int socketRemaining = activeSockets;
for (PollSocket& entry : m_sockets)
{
if (entry.revents != 0)
if (entry.revents & (POLLRDNORM | POLLWRNORM | POLLHUP | POLLERR))
{
if (entry.revents & POLLRDNORM)
if (entry.revents & (POLLRDNORM | POLLHUP | POLLERR))
m_readyToReadSockets.insert(entry.fd);
if (entry.revents & POLLWRNORM)
if (entry.revents & (POLLWRNORM | POLLERR))
m_readyToWriteSockets.insert(entry.fd);
entry.revents = 0;
@@ -156,6 +156,11 @@ namespace Nz
if (--socketRemaining == 0)
break;
}
else
{
NazaraWarning("Socket " + String::Number(entry.fd) + " was returned by WSAPoll without POLLRDNORM nor POLLWRNORM events (events: 0x" + String::Number(entry.events, 16) + ')');
activeSockets--;
}
}
}