aboutsummaryrefslogtreecommitdiff
path: root/src/p2p
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-01-17 12:01:42 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-01-17 12:15:12 +0000
commitfd1dfac5d21736d83ca1076b06aba0813b22dd8e (patch)
treeff73cff93e1bc5398bbd9c23a2bd9e60420a0174 /src/p2p
parentp2p: don't connect to seeds if using an exclusive peer (diff)
downloadmonero-fd1dfac5d21736d83ca1076b06aba0813b22dd8e.tar.xz
p2p: don't lookup seed IPs if using an exclusive peer
Diffstat (limited to 'src/p2p')
-rw-r--r--src/p2p/net_node.inl10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
index 142351801..fb4b5ffa7 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -270,6 +270,7 @@ namespace nodetool
m_allow_local_ip = command_line::get_arg(vm, arg_p2p_allow_local_ip);
m_no_igd = command_line::get_arg(vm, arg_no_igd);
m_offline = command_line::get_arg(vm, cryptonote::arg_offline);
+ m_testnet = command_line::get_arg(vm, cryptonote::arg_testnet_on);
if (command_line::has_arg(vm, arg_p2p_add_peer))
{
@@ -398,14 +399,16 @@ namespace nodetool
bool node_server<t_payload_net_handler>::init(const boost::program_options::variables_map& vm)
{
std::set<std::string> full_addrs;
- m_testnet = command_line::get_arg(vm, cryptonote::arg_testnet_on);
+
+ bool res = handle_command_line(vm);
+ CHECK_AND_ASSERT_MES(res, false, "Failed to handle command line");
if (m_testnet)
{
memcpy(&m_network_id, &::config::testnet::NETWORK_ID, 16);
full_addrs = get_seed_nodes(true);
}
- else
+ else if (m_exclusive_peers.empty())
{
memcpy(&m_network_id, &::config::NETWORK_ID, 16);
// for each hostname in the seed nodes list, attempt to DNS resolve and
@@ -496,9 +499,6 @@ namespace nodetool
}
MDEBUG("Number of seed nodes: " << m_seed_nodes.size());
- bool res = handle_command_line(vm);
- CHECK_AND_ASSERT_MES(res, false, "Failed to handle command line");
-
auto config_arg = m_testnet ? cryptonote::arg_testnet_data_dir : cryptonote::arg_data_dir;
m_config_folder = command_line::get_arg(vm, config_arg);