diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2023-11-01 11:56:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-01 11:56:39 +0100 |
| commit | ff009dd8b5bcfbdbffbc93f0ed5cc8b2c65ee368 (patch) | |
| tree | dbeb8d2d5de29e46fdf1e7bbf1064ef646ca40db /Source/Core/Common | |
| parent | 166d8a1aa3b615fc7e30fd07dd0b943eff95e77d (diff) | |
| parent | bee6d5bfb63c86ddb8451358e7a935d07a576a93 (diff) | |
Merge pull request #12258 from skyfloogle/traversal-logging
Netplay: Don't log skippable events as errors
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/ENet.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/Common/ENet.h | 3 | ||||
| -rw-r--r-- | Source/Core/Common/TraversalClient.cpp | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/Source/Core/Common/ENet.cpp b/Source/Core/Common/ENet.cpp index b694eba042..6e27036175 100644 --- a/Source/Core/Common/ENet.cpp +++ b/Source/Core/Common/ENet.cpp @@ -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; diff --git a/Source/Core/Common/ENet.h b/Source/Core/Common/ENet.h index f1791ca41d..920a7d5fbd 100644 --- a/Source/Core/Common/ENet.h +++ b/Source/Core/Common/ENet.h @@ -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 diff --git a/Source/Core/Common/TraversalClient.cpp b/Source/Core/Common/TraversalClient.cpp index e384c1cca8..50278a37e9 100644 --- a/Source/Core/Common/TraversalClient.cpp +++ b/Source/Core/Common/TraversalClient.cpp @@ -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; |