diff options
| author | rfree2monero <rfreemonero@op.pl> | 2015-04-01 18:24:45 +0200 |
|---|---|---|
| committer | rfree2monero <rfreemonero@op.pl> | 2015-04-01 18:24:45 +0200 |
| commit | 3cbdf198f168e113f12fa49d016133c434964ed7 (patch) | |
| tree | 050c74077de8e1b6e431f7d0671b57b5afcb01ab /src/p2p | |
| parent | fix locking in count-peers thread (2) (diff) | |
| parent | Merge pull request #248 (diff) | |
| download | monero-3cbdf198f168e113f12fa49d016133c434964ed7.tar.xz | |
Merge remote-tracking branch 'monero-official/master' into network-1.6-work1
Diffstat (limited to 'src/p2p')
| -rw-r--r-- | src/p2p/net_node.h | 20 | ||||
| -rw-r--r-- | src/p2p/net_node.inl | 8 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/p2p/net_node.h b/src/p2p/net_node.h index 5b034ce25..f94fedae0 100644 --- a/src/p2p/net_node.h +++ b/src/p2p/net_node.h @@ -80,22 +80,18 @@ namespace nodetool public: typedef t_payload_net_handler payload_net_handler; - node_server(t_payload_net_handler& payload_handler, boost::uuids::uuid network_id) - :m_payload_handler(payload_handler), - m_allow_local_ip(false), - m_no_igd(false), - m_hide_my_port(false), - m_network_id(std::move(network_id)) - { - m_current_number_of_out_peers = 0; - m_save_graph = false; - is_closing = false; - } + node_server( + t_payload_net_handler& payload_handler + ) + : m_payload_handler(payload_handler) + , m_allow_local_ip(false) + , m_hide_my_port(false) + {} static void init_options(boost::program_options::options_description& desc); bool run(); - bool init(const boost::program_options::variables_map& vm, bool testnet); + bool init(const boost::program_options::variables_map& vm); bool deinit(); bool send_stop_signal(); uint32_t get_this_peer_port(){return m_listenning_port;} diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index afc6436f3..ef158d9a1 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -46,7 +46,7 @@ #include "net/local_ip.h" #include "crypto/crypto.h" #include "storages/levin_abstract_invoke2.h" -#include "data_logger.hpp" +#include "daemon/command_line_args.h" // We have to look for miniupnpc headers in different places, dependent on if its compiled or external #ifdef UPNP_STATIC @@ -273,16 +273,20 @@ namespace nodetool //----------------------------------------------------------------------------------- template<class t_payload_net_handler> - bool node_server<t_payload_net_handler>::init(const boost::program_options::variables_map& vm, bool testnet) + bool node_server<t_payload_net_handler>::init(const boost::program_options::variables_map& vm) { + bool testnet = command_line::get_arg(vm, daemon_args::arg_testnet_on); + if (testnet) { + memcpy(&m_network_id, &::config::testnet::NETWORK_ID, 16); append_net_address(m_seed_nodes, "107.152.187.202:28080"); append_net_address(m_seed_nodes, "197.242.158.240:28080"); append_net_address(m_seed_nodes, "107.152.130.98:28080"); } else { + memcpy(&m_network_id, &::config::NETWORK_ID, 16); // for each hostname in the seed nodes list, attempt to DNS resolve and // add the result addresses as seed nodes // TODO: at some point add IPv6 support, but that won't be relevant |