diff --git a/tools/common.cpp b/tools/common.cpp index 101fbb9d4c752c06bff21882f73be205407e5bb6..35f971cc9302154f3a09e874a32973ae41a0f614 100644 --- a/tools/common.cpp +++ b/tools/common.cpp @@ -15,12 +15,12 @@ * along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include "certstore.h" -#include <opendht/crypto.h> #include "connectionmanager.h" #include "common.h" #include "fileutils.h" #include "ice_transport.h" +#include <opendht/crypto.h> #include <iostream> #include <string> #include <filesystem> @@ -30,8 +30,6 @@ namespace dhtnet { -std::shared_ptr<asio::posix::stream_descriptor> stdinDescriptor; - dht::crypto::Identity loadIdentity(bool isServer) { diff --git a/tools/dnc/dnc.cpp b/tools/dnc/dnc.cpp index dddc7b1a6878f735ac9206dd717f8b231d2e9922..9430cfca9f49c356f870ce77010f0611d119216d 100644 --- a/tools/dnc/dnc.cpp +++ b/tools/dnc/dnc.cpp @@ -75,7 +75,7 @@ Dnc::Dnc(dht::crypto::Identity identity, auto config = connectionManagerConfig(identity, bootstrap_ip_add, bootstrap_port, logger, certStore, ioContext, iceFactory); // create a connection manager - connectionManager = std::make_unique<ConnectionManager>(move(config)); + connectionManager = std::make_unique<ConnectionManager>(std::move(config)); connectionManager->onDhtConnected(identity.first->getPublicKey()); connectionManager->onICERequest([this](const dht::Hash<32>&) { // handle ICE request diff --git a/tools/dnc/dnc.h b/tools/dnc/dnc.h index 0c8c7c1cb84d3925ac7327f2ed9dc3dda21c2a90..c3333df8ac5732b74ffa7257146d4dd2d71a98c3 100644 --- a/tools/dnc/dnc.h +++ b/tools/dnc/dnc.h @@ -53,8 +53,6 @@ private: std::shared_ptr<asio::io_context> ioContext; std::thread ioContextRunner; - std::shared_ptr<asio::posix::stream_descriptor> stdinDescriptor; - std::pair<std::string, std::string> parseName(const std::string_view name); }; diff --git a/tools/dnc/main.cpp b/tools/dnc/main.cpp index e0eeeeb55ac3a353195c80e56fa1cf03d475653e..5d550b0a757f2ed95715b2149311f7d645aac269 100644 --- a/tools/dnc/main.cpp +++ b/tools/dnc/main.cpp @@ -16,6 +16,7 @@ */ #include "dnc.h" #include "common.h" + #include <string> #include <vector> #include <iostream>