Merge pull request #10511 from Techjar/netplay-longer-timeout-2-elect…

…ric-boogaloo NetPlay: Add timeout to traversal code path
dolphin-emu · Mar 15, 2022 · d599620 · d599620
2 parents 905e86d + 302dedb
commit d599620
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp
@@ -153,7 +153,7 @@ NetPlayClient::NetPlayClient(const std::string& address, const u16 port, NetPlay
     }
 
     // Extend reliable traffic timeout
-    enet_peer_timeout(m_server, 0, 30000, 30000);
+    enet_peer_timeout(m_server, 0, PEER_TIMEOUT, PEER_TIMEOUT);
 
     ENetEvent netEvent;
     int net = enet_host_service(m_client, &netEvent, 5000);
@@ -210,6 +210,10 @@ NetPlayClient::NetPlayClient(const std::string& address, const u16 port, NetPlay
         {
         case ENET_EVENT_TYPE_CONNECT:
           m_server = netEvent.peer;
+
+          // Extend reliable traffic timeout
+          enet_peer_timeout(m_server, 0, PEER_TIMEOUT, PEER_TIMEOUT);
+
           if (Connect())
           {
             m_connection_state = ConnectionState::Connected;

diff --git a/Source/Core/Core/NetPlayCommon.h b/Source/Core/Core/NetPlayCommon.h
@@ -14,6 +14,8 @@
 
 namespace NetPlay
 {
+constexpr u32 PEER_TIMEOUT = 30000;
+
 bool CompressFileIntoPacket(const std::string& file_path, sf::Packet& packet);
 bool CompressFolderIntoPacket(const std::string& folder_path, sf::Packet& packet);
 bool CompressBufferIntoPacket(const std::vector<u8>& in_buffer, sf::Packet& packet);

diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp
@@ -417,7 +417,7 @@ ConnectionError NetPlayServer::OnConnect(ENetPeer* socket, sf::Packet& rpac)
     return ConnectionError::NameTooLong;
 
   // Extend reliable traffic timeout
-  enet_peer_timeout(socket, 0, 30000, 30000);
+  enet_peer_timeout(socket, 0, PEER_TIMEOUT, PEER_TIMEOUT);
 
   // cause pings to be updated
   m_update_pings = true;