diff options
| author | Dolphin Bot <dolphin-emu-bot@users.noreply.github.com> | 2015-03-18 11:36:08 +0100 |
|---|---|---|
| committer | Dolphin Bot <dolphin-emu-bot@users.noreply.github.com> | 2015-03-18 11:36:08 +0100 |
| commit | 486370829a95e2b9e21cfda701be337508c2dd2a (patch) | |
| tree | 638729fa0539fbd0d6e622c1b9aa88ef4d71df6b /Source/Core/Common/TraversalClient.cpp | |
| parent | 27619e613ffffb6e3c3d21b59a97b51107994acb (diff) | |
| parent | 8201a52cec975c6ed9c81bd6f33c41b3ef7b473a (diff) | |
Merge pull request #2198 from mathieui/netplay-threading-fix
Fix netplay threading issues
Diffstat (limited to 'Source/Core/Common/TraversalClient.cpp')
| -rw-r--r-- | Source/Core/Common/TraversalClient.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/Core/Common/TraversalClient.cpp b/Source/Core/Common/TraversalClient.cpp index 72d18244f3..f17ce0d921 100644 --- a/Source/Core/Common/TraversalClient.cpp +++ b/Source/Core/Common/TraversalClient.cpp @@ -7,9 +7,10 @@ static void GetRandomishBytes(u8* buf, size_t size) { // We don't need high quality random numbers (which might not be available), // just non-repeating numbers! - srand(enet_time_get()); + static std::mt19937 prng(enet_time_get()); + static std::uniform_int_distribution<unsigned int> u8_distribution(0, 255); for (size_t i = 0; i < size; i++) - buf[i] = rand() & 0xff; + buf[i] = u8_distribution(prng); } TraversalClient::TraversalClient(ENetHost* netHost, const std::string& server, const u16 port) @@ -301,7 +302,8 @@ void TraversalClient::Reset() int ENET_CALLBACK TraversalClient::InterceptCallback(ENetHost* host, ENetEvent* event) { auto traversalClient = g_TraversalClient.get(); - if (traversalClient->TestPacket(host->receivedData, host->receivedDataLength, &host->receivedAddress)) + if (traversalClient->TestPacket(host->receivedData, host->receivedDataLength, &host->receivedAddress) + || (host->receivedDataLength == 1 && host->receivedData[0] == 0)) { event->type = (ENetEventType)42; return 1; |