d0s3t3ch/wownero
1
0
Fork 0
mirror of https://git.wownero.com/wownero/wownero.git synced 2024-08-15 01:03:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #237 from fuwa0529/dev-v0.8

Browse source 
remove unbound
This commit is contained in:
jw 2020-04-12 07:55:47 -07:00 committed by GitHub
commit dc517f5da6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 8 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -208,7 +208,6 @@ 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)
@ -474,8 +473,6 @@ else()
endif()
# Final setup for libunbound
include_directories(${UNBOUND_INCLUDE})
link_directories(${UNBOUND_LIBRARY_DIRS})
# Final setup for easylogging++
include_directories(${EASYLOGGING_INCLUDE})

3
external/CMakeLists.txt vendored
View file

@ -71,7 +71,8 @@ else()
set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE)
endif()
find_package(Unbound)
set(UNBOUND_INCLUDE_DIR unbound_dummy_include_dir)
set(UNBOUND_LIBRARIES unbound_dummy_libraries)
if(NOT UNBOUND_INCLUDE_DIR OR STATIC)
# NOTE: If STATIC is true, CMAKE_FIND_LIBRARY_SUFFIXES has been reordered.

2
src/checkpoints/checkpoints.cpp
View file

@ -30,7 +30,6 @@
#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"
@ -279,7 +278,6 @@ 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)

3
src/common/CMakeLists.txt
View file

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

2
src/common/updates.cpp
View file

@ -29,7 +29,6 @@
#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
@ -48,7 +47,6 @@ 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)

6
src/common/util.cpp
View file

@ -54,7 +54,6 @@
#include <fstream>
#endif
#include "unbound.h"
#include "include_base_utils.h"
#include "file_io_utils.h"
@ -673,6 +672,7 @@ 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,6 +687,7 @@ std::string get_nix_version_display_string()
MINFO("libunbound was built " << (with_threads ? "with" : "without") << " threads");
return with_threads;
}
*/
bool sanitize_locale()
{
@ -796,9 +797,6 @@ 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)

3
src/cryptonote_basic/cryptonote_basic_impl.cpp
View file

@ -41,7 +41,6 @@ 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"
@ -299,7 +298,7 @@ namespace cryptonote {
if (get_account_address_from_str(info, nettype, str_or_url))
return true;
bool dnssec_valid;
std::string address_str = tools::dns_utils::get_account_address_as_str_from_url(str_or_url, dnssec_valid, dns_confirm);
std::string address_str;
return !address_str.empty() &&
get_account_address_from_str(info, nettype, address_str);
}

4
src/daemon/command_parser_executor.cpp
View file

@ -26,7 +26,6 @@
// 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"
@ -345,8 +344,7 @@ 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 = 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];});
std::string address_str;
if(!cryptonote::get_account_address_from_str(info, cryptonote::MAINNET, address_str))
{
if(!cryptonote::get_account_address_from_str(info, cryptonote::TESTNET, address_str))

1
src/p2p/net_node.inl
View file

@ -688,7 +688,6 @@ 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();
}

1
src/simplewallet/simplewallet.cpp
View file

@ -50,7 +50,6 @@
#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"

3
src/wallet/api/wallet_manager.cpp
View file

@ -32,7 +32,6 @@
#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"
@ -336,7 +335,7 @@ bool WalletManagerImpl::stopMining()
std::string WalletManagerImpl::resolveOpenAlias(const std::string &address, bool &dnssec_valid) const
{
std::vector<std::string> addresses = tools::dns_utils::addresses_from_url(address, dnssec_valid);
std::vector<std::string> addresses;
if (addresses.empty())
return "";
return addresses.front();

3
src/wallet/wallet2.cpp
View file

@ -75,7 +75,6 @@ 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"
@ -13443,7 +13442,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 (tools::dns_utils::load_txt_records_from_dns(records, dns_urls))
if (false)
{
for (const auto& record : records)
{