summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar MonsterDruide12023-01-04 13:49:31 +0100
committerGravatar MonsterDruide12023-01-05 11:54:36 +0100
commit688a9fbfa6f0fdb2d4d39fbf6cd7c970a94a0f83 (patch)
tree8fa699180b8e0e015e4129f19545e3f4b355d053
parentMerge pull request #9557 from FernandoS27/ooops-i-killed-the-shitty-drivers (diff)
downloadyuzu-688a9fbfa6f0fdb2d4d39fbf6cd7c970a94a0f83.tar.gz
yuzu-688a9fbfa6f0fdb2d4d39fbf6cd7c970a94a0f83.tar.xz
yuzu-688a9fbfa6f0fdb2d4d39fbf6cd7c970a94a0f83.zip
net: Silently translate ETIMEDOUT network error
Diffstat (limited to '')
-rw-r--r--src/core/internal_network/network.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/internal_network/network.cpp b/src/core/internal_network/network.cpp
index 447fbffaa..282ea1ff9 100644
--- a/src/core/internal_network/network.cpp
+++ b/src/core/internal_network/network.cpp
@@ -117,6 +117,8 @@ Errno TranslateNativeError(int e) {
117 return Errno::NETUNREACH; 117 return Errno::NETUNREACH;
118 case WSAEMSGSIZE: 118 case WSAEMSGSIZE:
119 return Errno::MSGSIZE; 119 return Errno::MSGSIZE;
120 case WSAETIMEDOUT:
121 return Errno::TIMEDOUT;
120 default: 122 default:
121 UNIMPLEMENTED_MSG("Unimplemented errno={}", e); 123 UNIMPLEMENTED_MSG("Unimplemented errno={}", e);
122 return Errno::OTHER; 124 return Errno::OTHER;
@@ -211,6 +213,8 @@ Errno TranslateNativeError(int e) {
211 return Errno::NETUNREACH; 213 return Errno::NETUNREACH;
212 case EMSGSIZE: 214 case EMSGSIZE:
213 return Errno::MSGSIZE; 215 return Errno::MSGSIZE;
216 case ETIMEDOUT:
217 return Errno::TIMEDOUT;
214 default: 218 default:
215 UNIMPLEMENTED_MSG("Unimplemented errno={}", e); 219 UNIMPLEMENTED_MSG("Unimplemented errno={}", e);
216 return Errno::OTHER; 220 return Errno::OTHER;
@@ -226,7 +230,7 @@ Errno GetAndLogLastError() {
226 int e = errno; 230 int e = errno;
227#endif 231#endif
228 const Errno err = TranslateNativeError(e); 232 const Errno err = TranslateNativeError(e);
229 if (err == Errno::AGAIN) { 233 if (err == Errno::AGAIN || err == Errno::TIMEDOUT) {
230 return err; 234 return err;
231 } 235 }
232 LOG_ERROR(Network, "Socket operation error: {}", Common::NativeErrorToString(e)); 236 LOG_ERROR(Network, "Socket operation error: {}", Common::NativeErrorToString(e));