diff --git a/include/opendht/dhtrunner.h b/include/opendht/dhtrunner.h index e48e9df97a4aaac89d5072079544b9bac07daee0..6b1d563c64d60ee940a63891283efb3398169e29 100644 --- a/include/opendht/dhtrunner.h +++ b/include/opendht/dhtrunner.h @@ -266,7 +266,7 @@ public: std::lock_guard<std::mutex> lck(dht_mtx); return dht_->getRoutingTablesLog(af); } - std::string getSearchesLog(sa_family_t af) const + std::string getSearchesLog(sa_family_t af = 0) const { std::lock_guard<std::mutex> lck(dht_mtx); return dht_->getSearchesLog(af); diff --git a/src/dht.cpp b/src/dht.cpp index fb10126efad182642def512251839c39ced125ba..709012ce2d96d422242116bee05b220155417d53 100644 --- a/src/dht.cpp +++ b/src/dht.cpp @@ -1950,7 +1950,7 @@ Dht::getStorageLog() const } -std::string +std::string Dht::getRoutingTablesLog(sa_family_t af) const { auto& list = (af == AF_INET) ? buckets : buckets6; @@ -1960,7 +1960,7 @@ Dht::getRoutingTablesLog(sa_family_t af) const return out.str(); } -std::string +std::string Dht::getSearchesLog(sa_family_t af) const { std::stringstream out; @@ -2360,9 +2360,9 @@ Dht::processMessage(const uint8_t *buf, size_t buflen, const sockaddr *from, soc } break; case MessageType::Ping: - DHT_DEBUG("Got ping (%d)!", tid.length); + //DHT_DEBUG("Got ping (%d)!", tid.length); newNode(id, from, fromlen, 1); - DHT_DEBUG("Sending pong."); + //DHT_DEBUG("Sending pong."); sendPong(from, fromlen, tid); break; case MessageType::FindNode: @@ -2514,8 +2514,6 @@ Dht::periodic(const uint8_t *buf, size_t buflen, uniform_duration_distribution<> {seconds(5) , seconds(25)} : uniform_duration_distribution<> {seconds(60), seconds(180)}; confirm_nodes_time = now + time_dis(rd); - - dumpTables(); } return std::min(confirm_nodes_time, search_time); diff --git a/tools/dhtnode.cpp b/tools/dhtnode.cpp index e212bcf83e5a1027f538cead6f5885714431f6ad..8ed04157c6a3d09df08848f6c341be01577af5fe 100644 --- a/tools/dhtnode.cpp +++ b/tools/dhtnode.cpp @@ -176,7 +176,7 @@ main(int argc, char **argv) continue; } else if (op == "ls") { std::cout << "Searches:" << std::endl; - std::cout << dht.getSearchesLog(AF_INET) << std::endl; + std::cout << dht.getSearchesLog() << std::endl; continue; } else if (op == "log") { dht.setLoggers(