mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-09-03 16:16:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12258 from skyfloogle/traversal-logging

Browse source 
Netplay: Don't log skippable events as errors
This commit is contained in:
Admiral H. Curtiss 2023-11-01 11:56:39 +01:00 • committed by GitHub
commit ff009dd8b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/Core/Common/ENet.cpp
View file

@ -31,7 +31,7 @@ int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event)
// wakeup packet received
if (host->receivedDataLength == 1 && host->receivedData[0] == 0)
{
event->type = (ENetEventType)42;
event->type = SKIPPABLE_EVENT;
return 1;
}
return 0;

3
Source/Core/Common/ENet.h
View file

@ -21,4 +21,7 @@ using ENetHostPtr = std::unique_ptr<ENetHost, ENetHostDeleter>;
void WakeupThread(ENetHost* host);
int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event);
bool SendPacket(ENetPeer* socket, const sf::Packet& packet, u8 channel_id);
// used for traversal packets and wake-up packets
constexpr ENetEventType SKIPPABLE_EVENT = ENetEventType(42);
} // namespace Common::ENet

2
Source/Core/Common/TraversalClient.cpp
View file

@ -299,7 +299,7 @@ int ENET_CALLBACK TraversalClient::InterceptCallback(ENetHost* host, ENetEvent*
&host->receivedAddress) ||
(host->receivedDataLength == 1 && host->receivedData[0] == 0))
{
event->type = (ENetEventType)42;
event->type = Common::ENet::SKIPPABLE_EVENT;
return 1;
}
return 0;