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

Merge pull request #11381 from skyfloogle/traversal-fix-1 

Netplay: Fix traversal connections occasionally not working
This commit is contained in:
Pierre Bourdon 2023-01-17 23:40:24 +01:00 committed by GitHub
parent 4fc6488844 c689e9cde0
commit 1cd11b8f3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Core/NetPlayClient.cpp
View File

@ -248,7 +248,12 @@ bool NetPlayClient::Connect()
sf::Packet rpac;
// TODO: make this not hang
ENetEvent netEvent;
if (enet_host_service(m_client, &netEvent, 5000) > 0 && netEvent.type == ENET_EVENT_TYPE_RECEIVE)
int net;
while ((net = enet_host_service(m_client, &netEvent, 5000)) > 0 && netEvent.type == 42)
{
// ignore packets from traversal server
}
if (net > 0 && netEvent.type == ENET_EVENT_TYPE_RECEIVE)
{
rpac.append(netEvent.packet->data, netEvent.packet->dataLength);
enet_packet_destroy(netEvent.packet);