diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-02-09 21:29:35 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-02-21 09:35:23 +0000 |
| commit | e74b3ab5f720253f88b06de15fa1b5199e7cdeeb (patch) | |
| tree | ab3c5290a0a8b3ffa3d3a79bee1488f43450c061 | |
| parent | Merge pull request #1747 (diff) | |
| download | monero-e74b3ab5f720253f88b06de15fa1b5199e7cdeeb.tar.xz | |
core: add p2p bind port options from net_node
They're now used by core to determine the data directory to use
for the txpool directory.
This fixes an assert in the core tests, which don't use the RPC
server, which normally initializes the P2P code.
| -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); |