mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-28 16:49:58 -06:00
Merge pull request #10905 from shuffle2/netplay-hash
netplay: use sha1 instead of md5
This commit is contained in:
@ -1030,13 +1030,13 @@ unsigned int NetPlayServer::OnData(sf::Packet& packet, Client& player)
|
||||
}
|
||||
break;
|
||||
|
||||
case MessageID::MD5Progress:
|
||||
case MessageID::GameDigestProgress:
|
||||
{
|
||||
int progress;
|
||||
packet >> progress;
|
||||
|
||||
sf::Packet spac;
|
||||
spac << MessageID::MD5Progress;
|
||||
spac << MessageID::GameDigestProgress;
|
||||
spac << player.pid;
|
||||
spac << progress;
|
||||
|
||||
@ -1044,13 +1044,13 @@ unsigned int NetPlayServer::OnData(sf::Packet& packet, Client& player)
|
||||
}
|
||||
break;
|
||||
|
||||
case MessageID::MD5Result:
|
||||
case MessageID::GameDigestResult:
|
||||
{
|
||||
std::string result;
|
||||
packet >> result;
|
||||
|
||||
sf::Packet spac;
|
||||
spac << MessageID::MD5Result;
|
||||
spac << MessageID::GameDigestResult;
|
||||
spac << player.pid;
|
||||
spac << result;
|
||||
|
||||
@ -1058,13 +1058,13 @@ unsigned int NetPlayServer::OnData(sf::Packet& packet, Client& player)
|
||||
}
|
||||
break;
|
||||
|
||||
case MessageID::MD5Error:
|
||||
case MessageID::GameDigestError:
|
||||
{
|
||||
std::string error;
|
||||
packet >> error;
|
||||
|
||||
sf::Packet spac;
|
||||
spac << MessageID::MD5Error;
|
||||
spac << MessageID::GameDigestError;
|
||||
spac << player.pid;
|
||||
spac << error;
|
||||
|
||||
@ -1214,10 +1214,10 @@ bool NetPlayServer::ChangeGame(const SyncIdentifier& sync_identifier,
|
||||
}
|
||||
|
||||
// called from ---GUI--- thread
|
||||
bool NetPlayServer::ComputeMD5(const SyncIdentifier& sync_identifier)
|
||||
bool NetPlayServer::ComputeGameDigest(const SyncIdentifier& sync_identifier)
|
||||
{
|
||||
sf::Packet spac;
|
||||
spac << MessageID::ComputeMD5;
|
||||
spac << MessageID::ComputeGameDigest;
|
||||
SendSyncIdentifier(spac, sync_identifier);
|
||||
|
||||
SendAsyncToClients(std::move(spac));
|
||||
@ -1226,10 +1226,10 @@ bool NetPlayServer::ComputeMD5(const SyncIdentifier& sync_identifier)
|
||||
}
|
||||
|
||||
// called from ---GUI--- thread
|
||||
bool NetPlayServer::AbortMD5()
|
||||
bool NetPlayServer::AbortGameDigest()
|
||||
{
|
||||
sf::Packet spac;
|
||||
spac << MessageID::MD5Abort;
|
||||
spac << MessageID::GameDigestAbort;
|
||||
|
||||
SendAsyncToClients(std::move(spac));
|
||||
return true;
|
||||
|
Reference in New Issue
Block a user