moonlight-stream/moonlight-common-c
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-common-c.git synced 2025-08-18 01:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignore ICMP Port Unreachable messages on our UDP sockets

Browse Source 
These messages can falsely indicate failure in cases where the UDP socket
for audio or video hasn't opened yet when we start to send our PING packets.

It is also problematic when sending STUN requests to multiple IP addresses.
If one returns an ICMP Port Unreachable, it can cause us to fail the entire set
of requests even when other IP addresses do respond.
This commit is contained in:
Cameron Gutman 2020-09-06 13:49:26 -07:00
parent 7b024c967e
commit 6ca0b93809
1 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/PlatformSockets.c
View File

@ -133,36 +133,46 @@ int pollSockets(struct pollfd* pollFds, int pollFdsCount, int timeoutMs) {
int recvUdpSocket(SOCKET s, char* buffer, int size, int useSelect) {
int err;
if (useSelect) {
struct pollfd pfd;
do {
if (useSelect) {
struct pollfd pfd;
// Wait up to 100 ms for the socket to be readable
pfd.fd = s;
pfd.events = POLLIN;
err = pollSockets(&pfd, 1, UDP_RECV_POLL_TIMEOUT_MS);
if (err <= 0) {
// Return if an error or timeout occurs
return err;
// Wait up to 100 ms for the socket to be readable
pfd.fd = s;
pfd.events = POLLIN;
err = pollSockets(&pfd, 1, UDP_RECV_POLL_TIMEOUT_MS);
if (err <= 0) {
// Return if an error or timeout occurs
return err;
}
// This won't block since the socket is readable
err = (int)recvfrom(s, buffer, size, 0, NULL, NULL);
}
else {
// The caller has already configured a timeout on this
// socket via SO_RCVTIMEO, so we can avoid a syscall
// for each packet.
err = (int)recvfrom(s, buffer, size, 0, NULL, NULL);
if (err < 0 &&
(LastSocketError() == EWOULDBLOCK ||
LastSocketError() == EINTR ||
LastSocketError() == EAGAIN)) {
// Return 0 for timeout
return 0;
}
}
// This won't block since the socket is readable
return (int)recv(s, buffer, size, 0);
}
else {
// The caller has already configured a timeout on this
// socket via SO_RCVTIMEO, so we can avoid a syscall
// for each packet.
err = (int)recv(s, buffer, size, 0);
if (err < 0 &&
(LastSocketError() == EWOULDBLOCK ||
LastSocketError() == EINTR ||
LastSocketError() == EAGAIN)) {
// Return 0 for timeout
return 0;
}
// We may receive an error due to a previous ICMP Port Unreachable error received
// by this socket. We want to ignore those and continue reading. If the remote party
// is really dead, ENet or TCP connection failures will trigger connection teardown.
#if defined(LC_WINDOWS)
} while (err < 0 && LastSocketError() == WSAECONNRESET);
#else
} while (err < 0 && LastSocketError() == ECONNREFUSED);
#endif
return err;
}
return err;
}
void closeSocket(SOCKET s) {