Merge pull request #249 from fuwa0529/remove-unbound-rebased

Remove remove unbound

CMakeLists.txt

@@ -208,6 +208,7 @@ if(NOT MANUAL_SUBMODULES)
     
     message(STATUS "Checking submodules")
     check_submodule(external/miniupnp)
+    check_submodule(external/unbound)
     check_submodule(external/rapidjson)
     check_submodule(external/trezor-common)
     check_submodule(external/RandomWOW)
@@ -473,6 +474,8 @@ else()
 endif()
 
 # Final setup for libunbound
+include_directories(${UNBOUND_INCLUDE})
+link_directories(${UNBOUND_LIBRARY_DIRS})
 
 # Final setup for easylogging++
 include_directories(${EASYLOGGING_INCLUDE})

external/CMakeLists.txt

@@ -71,8 +71,7 @@ else()
   set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE)
 endif()
 
-set(UNBOUND_INCLUDE_DIR unbound_dummy_include_dir)
-set(UNBOUND_LIBRARIES unbound_dummy_libraries)
+find_package(Unbound)
 
 if(NOT UNBOUND_INCLUDE_DIR OR STATIC)
   # NOTE: If STATIC is true, CMAKE_FIND_LIBRARY_SUFFIXES has been reordered.
@@ -80,6 +79,7 @@ if(NOT UNBOUND_INCLUDE_DIR OR STATIC)
   # be set in this case.
   # The unbound CMakeLists.txt can set it, since it's also needed for the
   # static OpenSSL libraries set up there after with target_link_libraries.
+  add_subdirectory(unbound)
 
   set(UNBOUND_STATIC true PARENT_SCOPE)
   set(UNBOUND_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/unbound/libunbound" PARENT_SCOPE)

src/checkpoints/checkpoints.cpp

@@ -30,6 +30,7 @@
 
 #include "checkpoints.h"
 
+#include "common/dns_utils.h"
 #include "string_tools.h"
 #include "storages/portable_storage_template_helper.h" // epee json include
 #include "serialization/keyvalue_serialization.h"
@@ -278,6 +279,7 @@ namespace cryptonote
     static const std::vector<std::string> stagenet_dns_urls = { 
     };
 
+    if (!tools::dns_utils::load_txt_records_from_dns(records, nettype == TESTNET ? testnet_dns_urls : nettype == STAGENET ? stagenet_dns_urls : dns_urls))
       return true; // why true ?
 
     for (const auto& record : records)

src/common/CMakeLists.txt

@@ -31,6 +31,7 @@ include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR})
 set(common_sources
   base58.cpp
   command_line.cpp
+  dns_utils.cpp
   download.cpp
   error.cpp
   expect.cpp
@@ -63,6 +64,7 @@ set(common_private_headers
   boost_serialization_helper.h
   command_line.h
   common_fwd.h
+  dns_utils.h
   download.h
   error.h
   expect.h
@@ -96,6 +98,7 @@ monero_add_library(common
 target_link_libraries(common
   PUBLIC
     cncrypto
+    ${UNBOUND_LIBRARY}
     ${LIBUNWIND_LIBRARIES}
     ${Boost_DATE_TIME_LIBRARY}
     ${Boost_FILESYSTEM_LIBRARY}

src/common/updates.cpp

@@ -29,6 +29,7 @@
 #include <boost/algorithm/string.hpp>
 #include "misc_log_ex.h"
 #include "util.h"
+#include "dns_utils.h"
 #include "updates.h"
 
 #undef MONERO_DEFAULT_LOG_CATEGORY
@@ -47,6 +48,7 @@ namespace tools
     static const std::vector<std::string> dns_urls = {
     };
 
+    if (!tools::dns_utils::load_txt_records_from_dns(records, dns_urls))
       return false;
 
     for (const auto& record : records)

src/common/util.cpp

@@ -54,6 +54,7 @@
   #include <fstream>
 #endif
 
+#include "unbound.h"
 
 #include "include_base_utils.h"
 #include "file_io_utils.h"
@@ -672,7 +673,6 @@ std::string get_nix_version_display_string()
     return std::error_code(code, std::system_category());
   }
 
-  /*
   static bool unbound_built_with_threads()
   {
     ub_ctx *ctx = ub_ctx_create();
@@ -687,7 +687,6 @@ std::string get_nix_version_display_string()
     MINFO("libunbound was built " << (with_threads ? "with" : "without") << " threads");
     return with_threads;
   }
-  */
 
   bool sanitize_locale()
   {
@@ -797,6 +796,9 @@ std::string get_nix_version_display_string()
     OPENSSL_init_ssl(0, NULL);
 #endif
 
+    if (!unbound_built_with_threads())
+      MCLOG_RED(el::Level::Warning, "global", "libunbound was not built with threads enabled - crashes may occur");
+
     return true;
   }
   void set_strict_default_file_permissions(bool strict)

src/cryptonote_basic/cryptonote_basic_impl.cpp

@@ -41,6 +41,7 @@ using namespace epee;
 #include "common/base58.h"
 #include "crypto/hash.h"
 #include "int-util.h"
+#include "common/dns_utils.h"
 
 #undef MONERO_DEFAULT_LOG_CATEGORY
 #define MONERO_DEFAULT_LOG_CATEGORY "cn"
@@ -298,7 +299,7 @@ namespace cryptonote {
     if (get_account_address_from_str(info, nettype, str_or_url))
       return true;
     bool dnssec_valid;
-    std::string address_str;
+    std::string address_str = tools::dns_utils::get_account_address_as_str_from_url(str_or_url, dnssec_valid, dns_confirm);
     return !address_str.empty() &&
       get_account_address_from_str(info, nettype, address_str);
   }

src/daemon/command_parser_executor.cpp

@@ -26,6 +26,7 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#include "common/dns_utils.h"
 #include "common/command_line.h"
 #include "daemon/command_parser_executor.h"
 
@@ -344,7 +345,8 @@ bool t_command_parser_executor::start_mining(const std::vector<std::string>& arg
       if(!cryptonote::get_account_address_from_str(info, cryptonote::STAGENET, args.front()))
       {
         bool dnssec_valid;
-        std::string address_str;
+        std::string address_str = tools::dns_utils::get_account_address_as_str_from_url(args.front(), dnssec_valid,
+            [](const std::string &url, const std::vector<std::string> &addresses, bool dnssec_valid){return addresses[0];});
         if(!cryptonote::get_account_address_from_str(info, cryptonote::MAINNET, address_str))
         {
           if(!cryptonote::get_account_address_from_str(info, cryptonote::TESTNET, address_str))

src/p2p/net_node.inl

@@ -689,6 +689,7 @@ namespace nodetool
 
           try
           {
+            addr_list = tools::DNSResolver::instance().get_ipv4(addr_str, avail, valid);
             MDEBUG("dns_threads[" << result_index << "] DNS resolve done");
             boost::this_thread::interruption_point();
           }

src/simplewallet/simplewallet.cpp

@@ -50,6 +50,7 @@
 #include "common/i18n.h"
 #include "common/command_line.h"
 #include "common/util.h"
+#include "common/dns_utils.h"
 #include "common/base58.h"
 #include "common/scoped_message_writer.h"
 #include "cryptonote_protocol/cryptonote_protocol_handler.h"

src/wallet/api/wallet_manager.cpp

@@ -32,6 +32,7 @@
 #include "wallet_manager.h"
 #include "wallet.h"
 #include "common_defines.h"
+#include "common/dns_utils.h"
 #include "common/util.h"
 #include "common/updates.h"
 #include "version.h"
@@ -335,7 +336,7 @@ bool WalletManagerImpl::stopMining()
 
 std::string WalletManagerImpl::resolveOpenAlias(const std::string &address, bool &dnssec_valid) const
 {
-    std::vector<std::string> addresses;
+    std::vector<std::string> addresses = tools::dns_utils::addresses_from_url(address, dnssec_valid);
     if (addresses.empty())
         return "";
     return addresses.front();

src/wallet/wallet2.cpp

@@ -75,6 +75,7 @@ using namespace epee;
 #include "memwipe.h"
 #include "common/base58.h"
 #include "common/combinator.h"
+#include "common/dns_utils.h"
 #include "common/notify.h"
 #include "common/perf_timer.h"
 #include "ringct/rctSigs.h"
@@ -13451,7 +13452,7 @@ uint64_t wallet2::get_segregation_fork_height() const
     const uint64_t current_height = get_blockchain_current_height();
     uint64_t best_diff = std::numeric_limits<uint64_t>::max(), best_height = 0;
     std::vector<std::string> records;
-    if (false)
+    if (tools::dns_utils::load_txt_records_from_dns(records, dns_urls))
     {
       for (const auto& record : records)
       {