monero-project · fluffypony · Feb 21, 2017 · Feb 16, 2017 · Feb 16, 2017 · Feb 16, 2017
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -88,6 +88,14 @@ else()
  set(OPT_FLAGS_RELEASE "-Ofast")
 endif()
+  
+# BUILD_TAG is used to select the build type to check for a new version
+  
+if(BUILD_TAG)
+  
+  message(STATUS "Building build tag ${BUILD_TAG}")
+  
+  add_definitions("-DBUILD_TAG=${BUILD_TAG}")
+  
+else()
+  
+  message(STATUS "Building without build tag")
+  
+endif()
+  
+
 set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG ${OPT_FLAGS_RELEASE}")
 set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${OPT_FLAGS_RELEASE}")

diff --git a/Makefile b/Makefile
@@ -58,43 +58,55 @@ release-all:
 	mkdir -p build/release
 	cd build/release && cmake -D BUILD_TESTS=ON -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE)
+  
+release-static:
+  
+	mkdir -p build/release
+  
+	cd build/release && cmake -D STATIC=ON -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE)
+  
+
 coverage:
 	mkdir -p build/debug
 	cd build/debug && cmake -D BUILD_TESTS=ON -D CMAKE_BUILD_TYPE=Debug -D COVERAGE=ON ../.. && $(MAKE) && $(MAKE) test
-  
-release-static-armv6:
+  
+# Targets for specific prebuilt builds which will be advertised for updates by their build tag
+  
+
+  
+release-static-linux-armv6:
 	mkdir -p build/release
-  
-	cd build/release && cmake -D BUILD_TESTS=OFF -D ARCH="armv6zk" -D STATIC=ON -D BUILD_64=OFF -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE)
+  
+	cd build/release && cmake -D BUILD_TESTS=OFF -D ARCH="armv6zk" -D STATIC=ON -D BUILD_64=OFF -D CMAKE_BUILD_TYPE=release -D BUILD_TAG="linux-armv6" ../.. && $(MAKE)
-  
-release-static-armv7:
+  
+release-static-linux-armv7:
 	mkdir -p build/release
-  
-	cd build/release && cmake -D BUILD_TESTS=OFF -D ARCH="armv7-a" -D STATIC=ON -D BUILD_64=OFF -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE)
+  
+	cd build/release && cmake -D BUILD_TESTS=OFF -D ARCH="armv7-a" -D STATIC=ON -D BUILD_64=OFF -D CMAKE_BUILD_TYPE=release -D BUILD_TAG="linux-armv7" ../.. && $(MAKE)
 release-static-android:
 	mkdir -p build/release
-  
-	cd build/release && cmake -D BUILD_TESTS=OFF -D ARCH="armv7-a" -D STATIC=ON -D BUILD_64=OFF -D CMAKE_BUILD_TYPE=release -D ANDROID=true -D INSTALL_VENDORED_LIBUNBOUND=ON ../.. && $(MAKE)
+  
+	cd build/release && cmake -D BUILD_TESTS=OFF -D ARCH="armv7-a" -D STATIC=ON -D BUILD_64=OFF -D CMAKE_BUILD_TYPE=release -D ANDROID=true -D INSTALL_VENDORED_LIBUNBOUND=ON -D BUILD_TAG="android"../.. && $(MAKE)
-  
-release-static-armv8:
+  
+release-static-linux-armv8:
 	mkdir -p build/release
-  
-	cd build/release && cmake -D BUILD_TESTS=OFF -D ARCH="armv8-a" -D STATIC=ON -D BUILD_64=ON -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE)
+  
+	cd build/release && cmake -D BUILD_TESTS=OFF -D ARCH="armv8-a" -D STATIC=ON -D BUILD_64=ON -D CMAKE_BUILD_TYPE=release -D BUILD_TAG="linux-armv8" ../.. && $(MAKE)
-  
-release-static: release-static-64
+  
+release-static-linux-x86_64:
+  
+	mkdir -p build/release
+  
+	cd build/release && cmake -D STATIC=ON -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=release -D BUILD_TAG="linux-x64" ../.. && $(MAKE)
-  
-release-static-64:
+  
+release-static-freebsd-x86_64:
 	mkdir -p build/release
-  
-	cd build/release && cmake -D STATIC=ON -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE)
+  
+	cd build/release && cmake -D STATIC=ON -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=release -D BUILD_TAG="freebsd-x64" ../.. && $(MAKE)
+  
+
+  
+release-static-freebsd-x86_64:
+  
+	mkdir -p build/release
+  
+	cd build/release && cmake -D STATIC=ON -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=release -D BUILD_TAG="mac-x64" ../.. && $(MAKE)
-  
-release-static-32:
+  
+release-static-linux-i686:
 	mkdir -p build/release
-  
-	cd build/release && cmake -D STATIC=ON -D ARCH="i686" -D BUILD_64=OFF -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE)
+  
+	cd build/release && cmake -D STATIC=ON -D ARCH="i686" -D BUILD_64=OFF -D CMAKE_BUILD_TYPE=release -D BUILD_TAG="linux-x86" ../.. && $(MAKE)
 release-static-win64:
 	mkdir -p build/release
-  
-	cd build/release && cmake -G "MSYS Makefiles" -D STATIC=ON -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release -D CMAKE_TOOLCHAIN_FILE=../../cmake/64-bit-toolchain.cmake -D MSYS2_FOLDER=c:/msys64 ../.. && $(MAKE)
+  
+	cd build/release && cmake -G "MSYS Makefiles" -D STATIC=ON -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release -D BUILD_TAG="win-x64" -D CMAKE_TOOLCHAIN_FILE=../../cmake/64-bit-toolchain.cmake -D MSYS2_FOLDER=c:/msys64 ../.. && $(MAKE)
 release-static-win32:
 	mkdir -p build/release
-  
-	cd build/release && cmake -G "MSYS Makefiles" -D STATIC=ON -D ARCH="i686" -D BUILD_64=OFF -D CMAKE_BUILD_TYPE=Release -D CMAKE_TOOLCHAIN_FILE=../../cmake/32-bit-toolchain.cmake -D MSYS2_FOLDER=c:/msys32 ../.. && $(MAKE)
+  
+	cd build/release && cmake -G "MSYS Makefiles" -D STATIC=ON -D ARCH="i686" -D BUILD_64=OFF -D CMAKE_BUILD_TYPE=Release -D BUILD_TAG="win-x32" -D CMAKE_TOOLCHAIN_FILE=../../cmake/32-bit-toolchain.cmake -D MSYS2_FOLDER=c:/msys32 ../.. && $(MAKE)
 clean:
 	@echo "WARNING: Back-up your wallet if it exists within ./build!" ; \

diff --git a/contrib/epee/include/net/http_client.h b/contrib/epee/include/net/http_client.h
@@ -107,14 +107,14 @@ using namespace std;
 	//---------------------------------------------------------------------------
 	static inline const char* get_hex_vals()
 	{
-  
-		static char hexVals[16] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};
+  
+		static const char hexVals[16] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};
 		return hexVals;
 	}
 	static inline const char* get_unsave_chars()
 	{
 		//static char unsave_chars[] = "\"<>%\\^[]`+$,@:;/!#?=&";
-  
-		static char unsave_chars[] = "\"<>%\\^[]`+$,@:;!#&";
+  
+		static const char unsave_chars[] = "\"<>%\\^[]`+$,@:;!#&";
 		return unsave_chars;
 	}

diff --git a/contrib/epee/src/mlog.cpp b/contrib/epee/src/mlog.cpp
@@ -88,7 +88,7 @@ static const char *get_default_categories(int level)
  switch (level)
  {
    case 0:
-  
-      categories = "*:WARNING,net*:FATAL,global:INFO,verify:FATAL,stacktrace:INFO";
+  
+      categories = "*:WARNING,net:FATAL,global:INFO,verify:FATAL,stacktrace:INFO";
      break;
    case 1:
      categories = "*:WARNING,global:INFO,stacktrace:INFO";

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
@@ -30,12 +30,14 @@ set(common_sources
  base58.cpp
  command_line.cpp
  dns_utils.cpp
+  
+  download.cpp
  util.cpp
  i18n.cpp
  password.cpp
  perf_timer.cpp
  task_region.cpp
-  
-  thread_group.cpp)
+  
+  thread_group.cpp
+  
+  updates.cpp)
 if (STACK_TRACE)
  list(APPEND common_sources stack_trace.cpp)
@@ -49,6 +51,7 @@ set(common_private_headers
  command_line.h
  common_fwd.h
  dns_utils.h
+  
+  download.h
  http_connection.h
  int-util.h
  pod-class.h
@@ -62,7 +65,8 @@ set(common_private_headers
  perf_timer.h
  stack_trace.h
  task_region.h
-  
-  thread_group.h)
+  
+  thread_group.h
+  
+  updates.h)
 monero_private_headers(common
  ${common_private_headers})
@@ -74,6 +78,7 @@ target_link_libraries(common
  PUBLIC
    epee
    crypto
+  
+    -lcrypto
    ${UNBOUND_LIBRARY}
    ${LIBUNWIND_LIBRARIES}
    ${Boost_DATE_TIME_LIBRARY}

diff --git a/src/common/command_line.cpp b/src/common/command_line.cpp
@@ -120,4 +120,9 @@ namespace command_line
  , "How many blocks to sync at once during chain synchronization."
  , BLOCKS_SYNCHRONIZING_DEFAULT_COUNT
  };
+  
+  const command_line::arg_descriptor<std::string> arg_check_updates = {
+  
+    "check-updates"
+  
+  , "Check for new versions of monero: [disabled|notify|download|update]"
+  
+  , "notify"
+  
+  };
 }
diff --git a/src/common/command_line.h b/src/common/command_line.h
@@ -218,4 +218,5 @@ namespace command_line
  extern const arg_descriptor<uint64_t> arg_prep_blocks_threads;
  extern const arg_descriptor<uint64_t> arg_show_time_stats;
  extern const arg_descriptor<size_t> arg_block_sync_size;
+  
+  extern const arg_descriptor<std::string> arg_check_updates;
 }
diff --git a/src/common/dns_utils.cpp b/src/common/dns_utils.cpp
@@ -37,6 +37,7 @@
 #include <stdlib.h>
 #include "include_base_utils.h"
+  
+#include <random>
 #include <boost/filesystem/fstream.hpp>
 using namespace epee;
 namespace bf = boost::filesystem;
@@ -451,6 +452,107 @@ std::string get_account_address_as_str_from_url(const std::string& url, bool& dn
  return addresses[0];
 }
+  
+namespace
+  
+{
+  
+  bool dns_records_match(const std::vector<std::string>& a, const std::vector<std::string>& b)
+  
+  {
+  
+    if (a.size() != b.size()) return false;
+  
+
+  
+    for (const auto& record_in_a : a)
+  
+    {
+  
+      bool ok = false;
+  
+      for (const auto& record_in_b : b)
+  
+      {
+  
+	if (record_in_a == record_in_b)
+  
+	{
+  
+	  ok = true;
+  
+	  break;
+  
+	}
+  
+      }
+  
+      if (!ok) return false;
+  
+    }
+  
+
+  
+    return true;
+  
+  }
+  
+}
+  
+
+  
+bool load_txt_records_from_dns(std::vector<std::string> &good_records, const std::vector<std::string> &dns_urls)
+  
+{
+  
+  std::vector<std::vector<std::string> > records;
+  
+  records.resize(dns_urls.size());
+  
+
+  
+  std::random_device rd;
+  
+  std::mt19937 gen(rd());
+  
+  std::uniform_int_distribution<int> dis(0, dns_urls.size() - 1);
+  
+  size_t first_index = dis(gen);
+  
+
+  
+  bool avail, valid;
+  
+  size_t cur_index = first_index;
+  
+  do
+  
+  {
+  
+    std::string url = dns_urls[cur_index];
+  
+
+  
+    records[cur_index] = tools::DNSResolver::instance().get_txt_record(url, avail, valid);
+  
+    if (!avail)
+  
+    {
+  
+      records[cur_index].clear();
+  
+      LOG_PRINT_L2("DNSSEC not available for checkpoint update at URL: " << url << ", skipping.");
+  
+    }
+  
+    if (!valid)
+  
+    {
+  
+      records[cur_index].clear();
+  
+      LOG_PRINT_L2("DNSSEC validation failed for checkpoint update at URL: " << url << ", skipping.");
+  
+    }
+  
+
+  
+    cur_index++;
+  
+    if (cur_index == dns_urls.size())
+  
+    {
+  
+      cur_index = 0;
+  
+    }
+  
+  } while (cur_index != first_index);
+  
+
+  
+  size_t num_valid_records = 0;
+  
+
+  
+  for( const auto& record_set : records)
+  
+  {
+  
+    if (record_set.size() != 0)
+  
+    {
+  
+      num_valid_records++;
+  
+    }
+  
+  }
+  
+
+  
+  if (num_valid_records < 2)
+  
+  {
+  
+    LOG_PRINT_L0("WARNING: no two valid MoneroPulse DNS checkpoint records were received");
+  
+    return false;
+  
+  }
+  
+
+  
+  int good_records_index = -1;
+  
+  for (size_t i = 0; i < records.size() - 1; ++i)
+  
+  {
+  
+    if (records[i].size() == 0) continue;
+  
+
+  
+    for (size_t j = i + 1; j < records.size(); ++j)
+  
+    {
+  
+      if (dns_records_match(records[i], records[j]))
+  
+      {
+  
+        good_records_index = i;
+  
+        break;
+  
+      }
+  
+    }
+  
+    if (good_records_index >= 0) break;
+  
+  }
+  
+
+  
+  if (good_records_index < 0)
+  
+  {
+  
+    LOG_PRINT_L0("WARNING: no two MoneroPulse DNS checkpoint records matched");
+  
+    return false;
+  
+  }
+  
+
+  
+  good_records = records[good_records_index];
+  
+  return true;
+  
+}
+  
+
 }  // namespace tools::dns_utils
 }  // namespace tools
diff --git a/src/common/dns_utils.h b/src/common/dns_utils.h
@@ -165,6 +165,8 @@ std::vector<std::string> addresses_from_url(const std::string& url, bool& dnssec
 std::string get_account_address_as_str_from_url(const std::string& url, bool& dnssec_valid);
+  
+bool load_txt_records_from_dns(std::vector<std::string> &records, const std::vector<std::string> &dns_urls);
+  
+
 }  // namespace tools::dns_utils
 }  // namespace tools