Skip to content
Snippets Groups Projects
Commit c1cac45a authored by Adrien Béraud's avatar Adrien Béraud
Browse files

dnc: cleanup

Change-Id: Ia525d076480015580c73e181ce214f8c387b4ffd
parent b975dbfd
Branches
Tags
No related merge requests found
...@@ -15,12 +15,12 @@ ...@@ -15,12 +15,12 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include "certstore.h" #include "certstore.h"
#include <opendht/crypto.h>
#include "connectionmanager.h" #include "connectionmanager.h"
#include "common.h" #include "common.h"
#include "fileutils.h" #include "fileutils.h"
#include "ice_transport.h" #include "ice_transport.h"
#include <opendht/crypto.h>
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <filesystem> #include <filesystem>
...@@ -30,8 +30,6 @@ ...@@ -30,8 +30,6 @@
namespace dhtnet { namespace dhtnet {
std::shared_ptr<asio::posix::stream_descriptor> stdinDescriptor;
dht::crypto::Identity dht::crypto::Identity
loadIdentity(bool isServer) loadIdentity(bool isServer)
{ {
......
...@@ -75,7 +75,7 @@ Dnc::Dnc(dht::crypto::Identity identity, ...@@ -75,7 +75,7 @@ Dnc::Dnc(dht::crypto::Identity identity,
auto config = connectionManagerConfig(identity, bootstrap_ip_add, bootstrap_port, logger, certStore, ioContext, iceFactory); auto config = connectionManagerConfig(identity, bootstrap_ip_add, bootstrap_port, logger, certStore, ioContext, iceFactory);
// create a connection manager // 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->onDhtConnected(identity.first->getPublicKey());
connectionManager->onICERequest([this](const dht::Hash<32>&) { // handle ICE request connectionManager->onICERequest([this](const dht::Hash<32>&) { // handle ICE request
......
...@@ -53,8 +53,6 @@ private: ...@@ -53,8 +53,6 @@ private:
std::shared_ptr<asio::io_context> ioContext; std::shared_ptr<asio::io_context> ioContext;
std::thread ioContextRunner; std::thread ioContextRunner;
std::shared_ptr<asio::posix::stream_descriptor> stdinDescriptor;
std::pair<std::string, std::string> parseName(const std::string_view name); std::pair<std::string, std::string> parseName(const std::string_view name);
}; };
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
*/ */
#include "dnc.h" #include "dnc.h"
#include "common.h" #include "common.h"
#include <string> #include <string>
#include <vector> #include <vector>
#include <iostream> #include <iostream>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment