diff options
Diffstat (limited to 'src/p2p')
| -rw-r--r-- | src/p2p/net_node.cpp | 3 | ||||
| -rw-r--r-- | src/p2p/net_node.h | 3 | ||||
| -rw-r--r-- | src/p2p/net_node.inl | 22 |
3 files changed, 28 insertions, 0 deletions
diff --git a/src/p2p/net_node.cpp b/src/p2p/net_node.cpp index bb7965817..4d5ba6e38 100644 --- a/src/p2p/net_node.cpp +++ b/src/p2p/net_node.cpp @@ -113,6 +113,7 @@ namespace nodetool { const command_line::arg_descriptor<std::string> arg_p2p_bind_ipv4_address = {"p2p-bind-ipv4-address", "Interface for p2p network protocol (IPv4)", "0.0.0.0"}; const command_line::arg_descriptor<std::string> arg_p2p_bind_ipv6_address = {"p2p-bind-ipv6-address", "Interface for p2p network protocol (IPv6)", "::"}; + const command_line::arg_descriptor<std::string> arg_p2p_bind_ip = {"p2p-bind-ip", "DEPRECATED: replaced with --p2p-bind-ipv4-address", ""}; const command_line::arg_descriptor<std::string, false, true, 2> arg_p2p_bind_ipv4_port = { "p2p-bind-ipv4-port" , "Port for p2p network protocol (IPv4)" @@ -139,6 +140,8 @@ namespace nodetool return val; } }; + const command_line::arg_descriptor<std::string> arg_p2p_bind_port = {"p2p-bind-port", "DEPRECATED: replaced with --p2p-bind-ipv4-port", ""}; + const command_line::arg_descriptor<std::string> arg_p2p_bind_port_ipv6 = {"p2p-bind-port-ipv6", "DEPRECATED: replaced with --p2p-bind-ipv6-port", ""}; const command_line::arg_descriptor<uint32_t> arg_p2p_external_port = {"p2p-external-port", "External port for p2p network protocol (if port forwarding used with NAT)", 0}; const command_line::arg_descriptor<bool> arg_p2p_allow_local_ip = {"allow-local-ip", "Allow local ip add to peer list, mostly in debug purposes"}; diff --git a/src/p2p/net_node.h b/src/p2p/net_node.h index a373c80a3..4db6a107c 100644 --- a/src/p2p/net_node.h +++ b/src/p2p/net_node.h @@ -522,8 +522,11 @@ namespace nodetool const int64_t default_limit_down = P2P_DEFAULT_LIMIT_RATE_DOWN; // kB/s extern const command_line::arg_descriptor<std::string> arg_p2p_bind_ipv4_address; extern const command_line::arg_descriptor<std::string> arg_p2p_bind_ipv6_address; + extern const command_line::arg_descriptor<std::string> arg_p2p_bind_ip; // DEPRECATED extern const command_line::arg_descriptor<std::string, false, true, 2> arg_p2p_bind_ipv4_port; extern const command_line::arg_descriptor<std::string, false, true, 2> arg_p2p_bind_ipv6_port; + extern const command_line::arg_descriptor<std::string> arg_p2p_bind_port; // DEPRECATED + extern const command_line::arg_descriptor<std::string> arg_p2p_bind_port_ipv6; // DEPRECATED extern const command_line::arg_descriptor<bool> arg_p2p_use_ipv6; extern const command_line::arg_descriptor<bool> arg_p2p_ignore_ipv4; extern const command_line::arg_descriptor<uint32_t> arg_p2p_external_port; diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index f50ac8ea2..1a43c8ac2 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -101,8 +101,11 @@ namespace nodetool { command_line::add_arg(desc, arg_p2p_bind_ipv4_address); command_line::add_arg(desc, arg_p2p_bind_ipv6_address); + command_line::add_arg(desc, arg_p2p_bind_ip); // DEPRECATED command_line::add_arg(desc, arg_p2p_bind_ipv4_port, false); command_line::add_arg(desc, arg_p2p_bind_ipv6_port, false); + command_line::add_arg(desc, arg_p2p_bind_port, false); // DEPRECATED + command_line::add_arg(desc, arg_p2p_bind_port_ipv6, false); // DEPRECATED command_line::add_arg(desc, arg_p2p_use_ipv6); command_line::add_arg(desc, arg_p2p_ignore_ipv4); command_line::add_arg(desc, arg_p2p_external_port); @@ -416,6 +419,25 @@ namespace nodetool public_zone.m_bind_ipv6_address = command_line::get_arg(vm, arg_p2p_bind_ipv6_address); public_zone.m_port_ipv4 = command_line::get_arg(vm, arg_p2p_bind_ipv4_port); public_zone.m_port_ipv6 = command_line::get_arg(vm, arg_p2p_bind_ipv6_port); + + // DEPRECATED --p2p-bind-ip + if (!command_line::get_arg(vm, arg_p2p_bind_ip).empty()) + MWARNING("--p2p-bind-ip is now DEPRECATED, replace with --p2p-bind-ipv4-address"); + if (public_zone.m_bind_ipv4_address.empty()) + public_zone.m_bind_ipv4_address = command_line::get_arg(vm, arg_p2p_bind_ip); + + // DEPRECATED --p2p-bind-port + if (!command_line::get_arg(vm, arg_p2p_bind_port).empty()) + MWARNING("--p2p-bind-port is now DEPRECATED, replace with --p2p-bind-ipv4-port"); + if (public_zone.m_port_ipv4.empty()) + public_zone.m_port_ipv4 = command_line::get_arg(vm, arg_p2p_bind_port); + + // DEPRECATED --p2p-bind-port-ipv6 + if (!command_line::get_arg(vm, arg_p2p_bind_port_ipv6).empty()) + MWARNING("--p2p-bind-port-ipv6 is now DEPRECATED, replace with --p2p-bind-ipv6-port"); + if (public_zone.m_port_ipv6.empty()) + public_zone.m_port_ipv6 = command_line::get_arg(vm, arg_p2p_bind_ipv6_port); + public_zone.m_can_pingback = true; m_external_port = command_line::get_arg(vm, arg_p2p_external_port); m_allow_local_ip = command_line::get_arg(vm, arg_p2p_allow_local_ip); |