archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 11:51:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7119 from lioncash/random

Browse source 
Common/Random: Add convenience template for simple arithmetic values
This commit is contained in:
Léo Lam 2018-06-14 18:25:21 +02:00 committed by GitHub
commit 0f0823f4a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Source/Core/Common/Random.h
View file

@ -5,6 +5,7 @@
#pragma once
#include <cstddef>
#include <type_traits>
#include "Common/CommonTypes.h"
@ -12,4 +13,14 @@ namespace Common::Random
{
/// Fill `buffer` with random bytes using a cryptographically secure pseudo-random number generator.
void Generate(void* buffer, std::size_t size);
/// Generates a random value of arithmetic type `T`
template <typename T>
T GenerateValue()
{
static_assert(std::is_arithmetic<T>(), "T must be an arithmetic type in GenerateValue.");
T value;
Generate(&value, sizeof(value));
return value;
}
} // namespace Common::Random

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

@ -270,7 +270,7 @@ TraversalRequestId TraversalClient::SendTraversalPacket(const TraversalPacket& p
{
OutgoingTraversalPacketInfo info;
info.packet = packet;
Common::Random::Generate(&info.packet.requestId, sizeof(info.packet.requestId));
info.packet.requestId = Common::Random::GenerateValue<TraversalRequestId>();
info.tries = 0;
m_OutgoingTraversalPackets.push_back(info);
ResendPacket(&m_OutgoingTraversalPackets.back());

3
Source/Core/Common/TraversalServer.cpp
View file

@ -169,8 +169,7 @@ static sockaddr_in6 MakeSinAddr(const TraversalInetAddress& addr)
static void GetRandomHostId(TraversalHostId* hostId)
{
char buf[9];
u32 num;
Common::Random::Generate(&num, sizeof(num));
const u32 num = Common::Random::GenerateValue<u32>();
sprintf(buf, "%08x", num);
memcpy(hostId->data(), buf, 8);
}

5
Source/Core/Core/Analytics.cpp
View file

@ -73,9 +73,8 @@ void DolphinAnalytics::ReloadConfig()
void DolphinAnalytics::GenerateNewIdentity()
{
u64 id_high, id_low;
Common::Random::Generate(&id_high, sizeof(id_high));
Common::Random::Generate(&id_low, sizeof(id_low));
const u64 id_high = Common::Random::GenerateValue<u64>();
const u64 id_low = Common::Random::GenerateValue<u64>();
m_unique_id = StringFromFormat("%016" PRIx64 "%016" PRIx64, id_high, id_low);
// Save the new id in the configuration.