ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

naomi network: ignore WSAECONNRESET. Longer timeout for client

This commit is contained in:
flyinghead 2022-03-30 15:48:23 +02:00
parent 554ffcd08f
commit 7fcce4a59b
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/network/naomi_network.cpp
View File

@ -88,10 +88,10 @@ bool NaomiNetwork::startNetwork()
slaves.clear();
using namespace std::chrono;
const auto timeout = seconds(20);
if (config::ActAsServer)
{
const auto timeout = seconds(20);
NOTICE_LOG(NETWORK, "Waiting for slave connections");
steady_clock::time_point start_time = steady_clock::now();
@ -131,6 +131,7 @@ bool NaomiNetwork::startNetwork()
}
else
{
const auto timeout = seconds(30);
serverIp = INADDR_BROADCAST;
u16 serverPort = SERVER_PORT;
if (!config::NetworkServer.get().empty())

5
core/network/naomi_network.h
View File

@ -157,6 +157,11 @@ private:
int error = get_last_error();
if (error == L_EWOULDBLOCK || error == L_EAGAIN)
break;
#ifdef _WIN32
if (error == WSAECONNRESET)
// Happens if the previous send resulted in an ICMP Port Unreachable message
break;
#endif
throw Exception("Receive error: errno " + std::to_string(error));
}
if (rc < (int)packet.size(0))