From c41ee417fbc3ed3de533aade6c4f2d207beaf69d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Wed, 29 Apr 2020 19:22:24 -0400
Subject: [PATCH] tools: cleanup
---
tools/dhtchat.cpp | 2 +-
tools/dhtnode.cpp | 4 ++--
tools/dhtscanner.cpp | 2 +-
tools/tools_common.h | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/dhtchat.cpp b/tools/dhtchat.cpp
index 07dfd7c2..3f9853c7 100644
--- a/tools/dhtchat.cpp
+++ b/tools/dhtchat.cpp
@@ -67,7 +67,7 @@ main(int argc, char **argv)
if (not params.bootstrap.empty())
dht.bootstrap(params.bootstrap);
- print_node_info(dht.getNodeInfo(), params);
+ print_node_info(dht.getNodeInfo());
std::cout << " type 'c {hash}' to join a channel" << std::endl << std::endl;
bool connected {false};
diff --git a/tools/dhtnode.cpp b/tools/dhtnode.cpp
index 0318b151..a3d7c4d2 100644
--- a/tools/dhtnode.cpp
+++ b/tools/dhtnode.cpp
@@ -114,7 +114,7 @@ void cmd_loop(std::shared_ptr<DhtRunner>& node, dht_params& params
#endif
)
{
- print_node_info(node->getNodeInfo(), params);
+ print_node_info(node->getNodeInfo());
std::cout << " (type 'h' or 'help' for a list of possible commands)" << std::endl << std::endl;
#ifndef WIN32_NATIVE
@@ -144,7 +144,7 @@ void cmd_loop(std::shared_ptr<DhtRunner>& node, dht_params& params
continue;
} else if (op == "ll") {
node->getNodeInfo([&](const std::shared_ptr<dht::NodeInfo>& nodeInfo) {
- print_node_info(*nodeInfo, params);
+ print_node_info(*nodeInfo);
std::cout << nodeInfo->ongoing_ops << " ongoing operations" << std::endl;
std::cout << "IPv4 stats:" << std::endl;
std::cout << nodeInfo->ipv4.toString() << std::endl;
diff --git a/tools/dhtscanner.cpp b/tools/dhtscanner.cpp
index e94f6dbe..b6dbf27c 100644
--- a/tools/dhtscanner.cpp
+++ b/tools/dhtscanner.cpp
@@ -94,7 +94,7 @@ main(int argc, char **argv)
if (not params.bootstrap.empty())
dht.bootstrap(params.bootstrap);
- print_node_info(dht.getNodeInfo(), params);
+ print_node_info(dht.getNodeInfo());
std::cout << "Scanning network..." << std::endl;
auto all_nodes = std::make_shared<NodeSet>();
diff --git a/tools/tools_common.h b/tools/tools_common.h
index a48d6740..367387a3 100644
--- a/tools/tools_common.h
+++ b/tools/tools_common.h
@@ -191,13 +191,13 @@ getDhtConfig(dht_params& params)
return {std::move(config), std::move(context)};
}
-void print_node_info(const dht::NodeInfo& info, const dht_params& params) {
+void print_node_info(const dht::NodeInfo& info) {
std::cout << "OpenDHT node " << info.node_id << " running on ";
if (info.bound4 == info.bound6)
std::cout << "port " << info.bound4 << std::endl;
else
std::cout << "IPv4 port " << info.bound4 << ", IPv6 port " << info.bound6 << std::endl;
- if (params.id.first)
+ if (info.id)
std::cout << "Public key ID " << info.id << std::endl;
}
--
GitLab