diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-02-21 11:53:20 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-02-21 11:53:20 +0200 |
| commit | 2b67346ded70b8371a7ad30655529d3165a6d561 (patch) | |
| tree | ab3c5290a0a8b3ffa3d3a79bee1488f43450c061 | |
| parent | Merge pull request #1747 (diff) | |
| parent | core: add p2p bind port options from net_node (diff) | |
| download | monero-2b67346ded70b8371a7ad30655529d3165a6d561.tar.xz | |
Merge pull request #1703
e74b3ab5 core: add p2p bind port options from net_node (moneromooo-monero)
| -rw-r--r-- | src/cryptonote_core/cryptonote_core.cpp | 4 | ||||
| -rw-r--r-- | src/p2p/net_node.inl | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index fc34b3adc..73f01559d 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -151,6 +151,10 @@ namespace cryptonote command_line::add_arg(desc, command_line::arg_show_time_stats); command_line::add_arg(desc, command_line::arg_block_sync_size); command_line::add_arg(desc, command_line::arg_check_updates); + + // we now also need some of net_node's options (p2p bind arg, for separate data dir) + command_line::add_arg(desc, nodetool::arg_testnet_p2p_bind_port, false); + command_line::add_arg(desc, nodetool::arg_p2p_bind_port, false); } //----------------------------------------------------------------------------------------------- bool core::handle_command_line(const boost::program_options::variables_map& vm) diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index 7ab6a4894..9f87326a0 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -108,8 +108,8 @@ namespace nodetool void node_server<t_payload_net_handler>::init_options(boost::program_options::options_description& desc) { command_line::add_arg(desc, arg_p2p_bind_ip); - command_line::add_arg(desc, arg_p2p_bind_port); - command_line::add_arg(desc, arg_testnet_p2p_bind_port); + command_line::add_arg(desc, arg_p2p_bind_port, false); + command_line::add_arg(desc, arg_testnet_p2p_bind_port, false); command_line::add_arg(desc, arg_p2p_external_port); command_line::add_arg(desc, arg_p2p_allow_local_ip); command_line::add_arg(desc, arg_p2p_add_peer); |