marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ignore "would block" errors from UDP sendto 

Given that SimpleUDP makes no promises on delivering data anyway, it's okay
to just drop packets silently.

While I'm at it, it's probably a good idea for non-Windows system to
set sockets as non-blocking too, as well as C4NetIOUDP to be more
consistent with its handling of errors along these lines.
stable-5.3 v5.3.3
Peter Wortmann 2013-03-07 21:26:01 +00:00 committed by Tobias Zwick
parent cd5c5fe30c
commit b78664b43c
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/network/C4NetIO.cpp
View File

@ -1374,6 +1374,14 @@ bool C4NetIOSimpleUDP::Init(uint16_t inPort)
#else
// disable blocking
if (::fcntl(sock, F_SETFL, fcntl(sock, F_GETFL) | O_NONBLOCK) == SOCKET_ERROR)
{
// set error
SetError("could not disable blocking", true);
return false;
}
// create pipe
if (pipe(Pipe) != 0)
{
@ -1590,7 +1598,8 @@ bool C4NetIOSimpleUDP::Send(const C4NetIOPacket &rPacket)
C4NetIO::addr_t addr = rPacket.getAddr();
if (::sendto(sock, getBufPtr<char>(rPacket), rPacket.getSize(), 0,
reinterpret_cast<sockaddr *>(&addr), sizeof(addr))
!= int(rPacket.getSize()))
!= int(rPacket.getSize()) &&
!HaveWouldBlockError())
{
SetError("socket sendto failed", true);
return false;
@ -2522,7 +2531,11 @@ bool C4NetIOUDP::Peer::Send(const C4NetIOPacket &rPacket) // (mt-safe)
// is etablished completly.
if (eStatus != CS_Works) return true;
// send it
return SendDirect(*pnPacket);
if (!SendDirect(*pnPacket)) {
Close("failed to send packet");
return false;
}
return true;
}
bool C4NetIOUDP::Peer::Check(bool fForceCheck)