From 233301c3f3adbf592f0b0aac09a9675e56fa989b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Tue, 23 Jan 2018 12:19:38 -0500 Subject: [PATCH] dhtrunner: use proxy by default if configured --- include/opendht/dhtrunner.h | 2 +- src/dhtrunner.cpp | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/opendht/dhtrunner.h b/include/opendht/dhtrunner.h index f2fc2a9e..92872ffe 100644 --- a/include/opendht/dhtrunner.h +++ b/include/opendht/dhtrunner.h @@ -383,7 +383,7 @@ public: return; config_.proxy_server = proxy; config_.push_node_id = pushNodeId; - enableProxy(use_proxy); + enableProxy(use_proxy and not config_.proxy_server.empty()); } /** diff --git a/src/dhtrunner.cpp b/src/dhtrunner.cpp index 0a0cd6ce..2f354a8e 100644 --- a/src/dhtrunner.cpp +++ b/src/dhtrunner.cpp @@ -91,10 +91,8 @@ DhtRunner::run(const SockAddr& local4, const SockAddr& local6, DhtRunner::Config dht_ = std::unique_ptr<SecureDht>(new SecureDht(std::move(dht), config.dht_config)); #if OPENDHT_PROXY_CLIENT - if (!dht_via_proxy_) { - config_ = config; - enableProxy(use_proxy); - } + config_ = config; + enableProxy(not config_.proxy_server.empty()); #endif running = true; -- GitLab