octo
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9558 from MonsterDruide1/network-timeout-noerror 

net: Silently translate ETIMEDOUT network error
This commit is contained in:
liamwhite 2023-01-06 10:00:09 -05:00 committed by GitHub
parent 020dbcdbc7 688a9fbfa6
commit 6d74490139
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/internal_network/network.cpp
View File

@ -117,6 +117,8 @@ Errno TranslateNativeError(int e) {
return Errno::NETUNREACH; return Errno::NETUNREACH;
case WSAEMSGSIZE: case WSAEMSGSIZE:
return Errno::MSGSIZE; return Errno::MSGSIZE;
case WSAETIMEDOUT:
return Errno::TIMEDOUT;
default: default:
UNIMPLEMENTED_MSG("Unimplemented errno={}", e); UNIMPLEMENTED_MSG("Unimplemented errno={}", e);
return Errno::OTHER; return Errno::OTHER;
@ -211,6 +213,8 @@ Errno TranslateNativeError(int e) {
return Errno::NETUNREACH; return Errno::NETUNREACH;
case EMSGSIZE: case EMSGSIZE:
return Errno::MSGSIZE; return Errno::MSGSIZE;
case ETIMEDOUT:
return Errno::TIMEDOUT;
default: default:
UNIMPLEMENTED_MSG("Unimplemented errno={}", e); UNIMPLEMENTED_MSG("Unimplemented errno={}", e);
return Errno::OTHER; return Errno::OTHER;
@ -226,7 +230,7 @@ Errno GetAndLogLastError() {
int e = errno; int e = errno;
#endif #endif
const Errno err = TranslateNativeError(e); const Errno err = TranslateNativeError(e);
if (err == Errno::AGAIN) { if (err == Errno::AGAIN || err == Errno::TIMEDOUT) {
return err; return err;
} }
LOG_ERROR(Network, "Socket operation error: {}", Common::NativeErrorToString(e)); LOG_ERROR(Network, "Socket operation error: {}", Common::NativeErrorToString(e));