core: do not download an update we already downloaded

This commit is contained in:
moneromooo-monero 2017-02-21 22:23:59 +00:00
parent 45101550f2
commit 708758b737
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 23 additions and 14 deletions

View File

@ -1100,7 +1100,7 @@ namespace cryptonote
return true;
std::string version, hash;
MDEBUG("Checking for a new " << software << " version for " << buildtag);
MCDEBUG("updates", "Checking for a new " << software << " version for " << buildtag);
if (!tools::check_updates(software, buildtag, m_testnet, version, hash))
return false;
@ -1121,28 +1121,37 @@ namespace cryptonote
filename = std::string(software) + "-update-" + version;
boost::filesystem::path path(epee::string_tools::get_current_module_folder());
path /= filename;
crypto::hash file_hash;
if (!tools::sha256sum(path.string(), file_hash) || (hash != epee::string_tools::pod_to_hex(file_hash)))
{
MCDEBUG("updates", "We don't have that file already, downloading");
if (!tools::download(path.string(), url))
{
MERROR("Failed to download " << url);
MCERROR("updates", "Failed to download " << url);
return false;
}
crypto::hash file_hash;
if (!tools::sha256sum(path.string(), file_hash))
{
MERROR("Failed to hash " << path);
MCERROR("updates", "Failed to hash " << path);
return false;
}
if (hash != epee::string_tools::pod_to_hex(file_hash))
{
MERROR("Download from " << url << " does not match the expected hash");
MCERROR("updates", "Download from " << url << " does not match the expected hash");
return false;
}
MGINFO("New version downloaded to " << path);
MCINFO("updates", "New version downloaded to " << path);
}
else
{
MCDEBUG("updates", "We already have " << path << " with expected hash");
}
if (check_updates_level == UPDATES_DOWNLOAD)
return true;
MERROR("Download/update not implemented yet");
MCERROR("updates", "Download/update not implemented yet");
return true;
}
//-----------------------------------------------------------------------------------------------