diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-01-06 10:00:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-06 10:00:09 -0500 |
| commit | be16c84ecaf71b239593a0e53c403f0f3dcdd69b (patch) | |
| tree | ff9ca482c1f3ebf52bcc07d8c6d396cd4a686ca0 /src/core/internal_network/network.cpp | |
| parent | 41958ff4aec6c845b5b0d164a9accabb5e338f38 (diff) | |
| parent | 3eb787dcef07cdec3d93b1d542cd01205b6615a8 (diff) | |
Merge pull request #9558 from MonsterDruide1/network-timeout-noerror
net: Silently translate ETIMEDOUT network error
Diffstat (limited to 'src/core/internal_network/network.cpp')
| -rw-r--r-- | src/core/internal_network/network.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/internal_network/network.cpp b/src/core/internal_network/network.cpp index 447fbffaa6..282ea1ff9d 100644 --- a/src/core/internal_network/network.cpp +++ b/src/core/internal_network/network.cpp @@ -117,6 +117,8 @@ Errno TranslateNativeError(int e) { return Errno::NETUNREACH; case WSAEMSGSIZE: return Errno::MSGSIZE; + case WSAETIMEDOUT: + return Errno::TIMEDOUT; default: UNIMPLEMENTED_MSG("Unimplemented errno={}", e); return Errno::OTHER; @@ -211,6 +213,8 @@ Errno TranslateNativeError(int e) { return Errno::NETUNREACH; case EMSGSIZE: return Errno::MSGSIZE; + case ETIMEDOUT: + return Errno::TIMEDOUT; default: UNIMPLEMENTED_MSG("Unimplemented errno={}", e); return Errno::OTHER; @@ -226,7 +230,7 @@ Errno GetAndLogLastError() { int e = errno; #endif const Errno err = TranslateNativeError(e); - if (err == Errno::AGAIN) { + if (err == Errno::AGAIN || err == Errno::TIMEDOUT) { return err; } LOG_ERROR(Network, "Socket operation error: {}", Common::NativeErrorToString(e)); |
