diff --git a/tools/dhtchat.cpp b/tools/dhtchat.cpp index a07548e8..2083287d 100644 --- a/tools/dhtchat.cpp +++ b/tools/dhtchat.cpp @@ -37,11 +37,6 @@ const std::string printTime(const std::time_t& now) { return buf; } -void print_node_info(const DhtRunner& dht, const dht_params&) { - std::cout << "OpenDht node " << dht.getNodeId() << " running on port " << dht.getBoundPort() << std::endl; - std::cout << "Public key ID " << dht.getId() << std::endl; -} - void print_usage() { std::cout << "Usage: dhtchat [-n network_id] [-p local_port] [-b bootstrap_host[:port]]" << std::endl << std::endl; std::cout << "dhtchat, a simple OpenDHT command line chat client." << std::endl; diff --git a/tools/dhtnode.cpp b/tools/dhtnode.cpp index 85a6a037..4c5dbefb 100644 --- a/tools/dhtnode.cpp +++ b/tools/dhtnode.cpp @@ -48,18 +48,6 @@ void print_id_req() { std::cout << "An identity is required to perform this operation (run with -i)" << std::endl; } -void print_node_info(const std::shared_ptr& node, const dht_params& params) { - std::cout << "OpenDHT node " << node->getNodeId() << " running on "; - auto port4 = node->getBoundPort(AF_INET); - auto port6 = node->getBoundPort(AF_INET6); - if (port4 == port6) - std::cout << "port " << port4 << std::endl; - else - std::cout << "IPv4 port " << port4 << ", IPv6 port " << port6 << std::endl; - if (params.id.first) - std::cout << "Public key ID " << node->getId() << std::endl; -} - void print_help() { std::cout << "OpenDHT command line interface (CLI)" << std::endl; std::cout << "Possible commands:" << std::endl @@ -123,7 +111,7 @@ void cmd_loop(std::shared_ptr& node, dht_params& params #endif ) { - print_node_info(node, params); + print_node_info(*node, params); std::cout << " (type 'h' or 'help' for a list of possible commands)" << std::endl << std::endl; #ifndef WIN32_NATIVE @@ -152,7 +140,7 @@ void cmd_loop(std::shared_ptr& node, dht_params& params print_help(); continue; } else if (op == "ll") { - print_node_info(node, params); + print_node_info(*node, params); std::cout << "IPv4 stats:" << std::endl; std::cout << node->getNodesStats(AF_INET).toString() << std::endl; std::cout << "IPv6 stats:" << std::endl; diff --git a/tools/dhtscanner.cpp b/tools/dhtscanner.cpp index befca481..44dd39af 100644 --- a/tools/dhtscanner.cpp +++ b/tools/dhtscanner.cpp @@ -91,7 +91,7 @@ main(int argc, char **argv) if (not params.bootstrap.first.empty()) dht.bootstrap(params.bootstrap.first.c_str(), params.bootstrap.second.c_str()); - std::cout << "OpenDht node " << dht.getNodeId() << " running on port " << params.port << std::endl; + print_node_info(dht, params); std::cout << "Scanning network..." << std::endl; auto all_nodes = std::make_shared(); diff --git a/tools/tools_common.h b/tools/tools_common.h index ac3aad7f..352a6edc 100644 --- a/tools/tools_common.h +++ b/tools/tools_common.h @@ -174,6 +174,18 @@ getDhtConfig(dht_params& params) return {std::move(config), std::move(context)}; } +void print_node_info(const dht::DhtRunner& node, const dht_params& params) { + std::cout << "OpenDHT node " << node.getNodeId() << " running on "; + auto port4 = node.getBoundPort(AF_INET); + auto port6 = node.getBoundPort(AF_INET6); + if (port4 == port6) + std::cout << "port " << port4 << std::endl; + else + std::cout << "IPv4 port " << port4 << ", IPv6 port " << port6 << std::endl; + if (params.id.first) + std::cout << "Public key ID " << node.getId() << std::endl; +} + static const constexpr struct option long_options[] = { {"help", no_argument , nullptr, 'h'}, {"port", required_argument, nullptr, 'p'},