monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 08:17:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

updates: we now have a user URL, and an automatic one

Browse source 
So the user can use https, while the automatic does not have to
This commit is contained in:
moneromooo-monero 2017-02-22 11:11:45 +00:00
parent 9f17b1a30f
commit 822577eb42
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/updates.cpp
View file

@ -98,9 +98,9 @@ namespace tools
return found;
}
std::string get_update_url(const std::string &software, const std::string &subdir, const std::string &buildtag, const std::string &version)
std::string get_update_url(const std::string &software, const std::string &subdir, const std::string &buildtag, const std::string &version, bool user)
{
static const char base[] = "http://updates.getmonero.org/";
static const char *base = user ? "https://downloads.getmonero.org/" : "http://updates.getmonero.org/";
#ifdef _WIN32
static const char extension[] = ".zip";
#else

2
src/common/updates.h
View file

@ -33,5 +33,5 @@
namespace tools
{
bool check_updates(const std::string &software, const std::string &buildtag, bool bestnet, std::string &version, std::string &hash);
std::string get_update_url(const std::string &software, const std::string &subdir, const std::string &buildtag, const std::string &version);
std::string get_update_url(const std::string &software, const std::string &subdir, const std::string &buildtag, const std::string &version, bool user);
}

3
src/cryptonote_core/cryptonote_core.cpp
View file

@ -1107,12 +1107,13 @@ namespace cryptonote
if (tools::vercmp(version.c_str(), MONERO_VERSION) <= 0)
return true;
std::string url = tools::get_update_url(software, subdir, buildtag, version);
std::string url = tools::get_update_url(software, subdir, buildtag, version, true);
MGINFO("Version " << version << " of " << software << " for " << buildtag << " is available: " << url << ", SHA256 hash " << hash);
if (check_updates_level == UPDATES_NOTIFY)
return true;
url = tools::get_update_url(software, subdir, buildtag, version, false);
std::string filename;
const char *slash = strrchr(url.c_str(), '/');
if (slash)