mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-27 04:36:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pull in project-slippi/Ishiiruka/commit/90b87df414a1e4b833139da9f8d3d5a1e36f62ff

Browse source
This commit is contained in:
Nikhil Narayana 2022-05-29 23:34:10 -07:00
commit dbd629e54c
2 changed files with 33 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/Core/Slippi/SlippiMatchmaking.cpp
View file

@ -658,7 +658,9 @@ void SlippiMatchmaking::handleConnecting()
if (p >= m_localPlayerIndex) if (p >= m_localPlayerIndex)
p++; p++;
err << m_playerInfo[p].display_name << " "; err << m_playerInfo[p].display_name;
if (i < failedConns.size() - 1)
err << ", ";
} }
m_errorMsg = err.str(); m_errorMsg = err.str();
} }

32
Source/Core/Core/Slippi/SlippiNetplay.cpp
View file

@ -529,6 +529,7 @@ void SlippiNetplayClient::ThreadFunc()
int net = enet_host_service(m_client, &netEvent, 500); int net = enet_host_service(m_client, &netEvent, 500);
if (net > 0) if (net > 0)
{ {
sf::Packet rpac;
switch (netEvent.type) switch (netEvent.type)
{ {
case ENET_EVENT_TYPE_RECEIVE: case ENET_EVENT_TYPE_RECEIVE:
@ -537,8 +538,13 @@ void SlippiNetplayClient::ThreadFunc()
INFO_LOG(SLIPPI_ONLINE, "[Netplay] got receive event with nil peer"); INFO_LOG(SLIPPI_ONLINE, "[Netplay] got receive event with nil peer");
continue; continue;
} }
INFO_LOG(SLIPPI_ONLINE, "[Netplay] got receive event with peer addr %x:%d", ERROR_LOG_FMT(SLIPPI_ONLINE, "[Netplay] got receive event with peer addr {}:{}",
netEvent.peer->address.host, netEvent.peer->address.port); netEvent.peer->address.host, netEvent.peer->address.port);
rpac.append(netEvent.packet->data, netEvent.packet->dataLength);
OnData(rpac, netEvent.peer);
enet_packet_destroy(netEvent.packet);
break; break;
case ENET_EVENT_TYPE_DISCONNECT: case ENET_EVENT_TYPE_DISCONNECT:
@ -559,8 +565,30 @@ void SlippiNetplayClient::ThreadFunc()
continue; continue;
} }
INFO_LOG(SLIPPI_ONLINE, "[Netplay] got connect event with peer addr %x:%d", INFO_LOG_FMT(SLIPPI_ONLINE, "[Netplay] got connect event with peer addr {}:{}",
netEvent.peer->address.host, netEvent.peer->address.port); netEvent.peer->address.host, netEvent.peer->address.port);
auto isAlreadyConnected = false;
for (int i = 0; i < m_server.size(); i++)
{
if (connections[i] && netEvent.peer->address.host == m_server[i]->address.host &&
netEvent.peer->address.port == m_server[i]->address.port)
{
m_server[i] = netEvent.peer;
isAlreadyConnected = true;
break;
}
}
if (isAlreadyConnected)
{
// Don't add this person again if they are already connected. Not doing this can cause one
// person to take up 2 or more spots, denying one or more players from connecting and thus
// getting stuck on the "Waiting" step
ERROR_LOG(SLIPPI_ONLINE, "Already connected!");
break; // Breaks out of case
}
for (int i = 0; i < m_server.size(); i++) for (int i = 0; i < m_server.size(); i++)
{ {
// This check used to check for port as well as host. The problem was that for some // This check used to check for port as well as host. The problem was that for some