mirrors/opendht
1
0 Fork 0
mirror of https://github.com/savoirfairelinux/opendht.git synced 2026-11-08 12:28:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch savoirfairelinux 'master' changes

Browse Source
This commit is contained in:
Seva committed 2019-05-27 15:23:26 -04:00
2 parents 3d525030b9 1c3132e0ef
commit 078c1198b0
1 file changed
+2 -7
Download Patch File Download Diff File Expand all files Collapse all files
src/dht_proxy_client.cpp
+2 -7
View File
@@ -151,13 +151,8 @@ struct DhtProxyClient::ProxySearch {
DhtProxyClient::DhtProxyClient() {}
<<<<<<< HEAD
DhtProxyClient::DhtProxyClient(std::function<void()> signal, const std::string& serverHost, const std::string& pushClientId, const Logger& l)
: DhtInterface(l), serverHost_(serverHost), pushClientId_(pushClientId), loopSignal_(signal)
=======
DhtProxyClient::DhtProxyClient(std::function<void()> signal, const std::string& serverHost, const std::string& pushClientId)
: serverHost_(serverHost), pushClientId_(pushClientId), loopSignal_(signal), io_context(new restinio::asio_ns::io_context())
>>>>>>> dhtproxy: switch threading to io_context
DhtProxyClient::DhtProxyClient(std::function<void()> signal, const std::string& serverHost, const std::string& pushClientId, const Logger& l):
serverHost_(serverHost), pushClientId_(pushClientId), loopSignal_(signal), io_context(new restinio::asio_ns::io_context())
{
auto hostAndPort = splitPort(serverHost_);
this->serverHostIp_ = hostAndPort.first;