From 76c16822d09fbebbc792dc999ea2d3432a63253a Mon Sep 17 00:00:00 2001 From: xiphon Date: Mon, 20 Jul 2020 04:31:58 +0000 Subject: wallet2_api: implement runtime proxy configuration --- contrib/epee/include/net/abstract_http_client.h | 1 + contrib/epee/include/net/http_client.h | 8 -------- contrib/epee/src/abstract_http_client.cpp | 5 +++++ 3 files changed, 6 insertions(+), 8 deletions(-) (limited to 'contrib/epee') diff --git a/contrib/epee/include/net/abstract_http_client.h b/contrib/epee/include/net/abstract_http_client.h index 787ae2667..1f8bbc605 100644 --- a/contrib/epee/include/net/abstract_http_client.h +++ b/contrib/epee/include/net/abstract_http_client.h @@ -64,6 +64,7 @@ namespace http abstract_http_client() {} virtual ~abstract_http_client() {} bool set_server(const std::string& address, boost::optional user, ssl_options_t ssl_options = ssl_support_t::e_ssl_support_autodetect); + virtual bool set_proxy(const std::string& address); virtual void set_server(std::string host, std::string port, boost::optional user, ssl_options_t ssl_options = ssl_support_t::e_ssl_support_autodetect) = 0; virtual void set_auto_connect(bool auto_connect) = 0; virtual bool connect(std::chrono::milliseconds timeout) = 0; diff --git a/contrib/epee/include/net/http_client.h b/contrib/epee/include/net/http_client.h index 86df48f65..9645e896b 100644 --- a/contrib/epee/include/net/http_client.h +++ b/contrib/epee/include/net/http_client.h @@ -885,14 +885,6 @@ namespace net_utils } }; typedef http_simple_client_template http_simple_client; - - class http_simple_client_factory : public http_client_factory - { - public: - std::unique_ptr create() override { - return std::unique_ptr(new epee::net_utils::http::http_simple_client()); - } - }; } } } diff --git a/contrib/epee/src/abstract_http_client.cpp b/contrib/epee/src/abstract_http_client.cpp index 98b5b67d9..540917873 100644 --- a/contrib/epee/src/abstract_http_client.cpp +++ b/contrib/epee/src/abstract_http_client.cpp @@ -137,6 +137,11 @@ namespace http set_server(std::move(parsed.host), std::to_string(parsed.port), std::move(user), std::move(ssl_options)); return true; } + + bool epee::net_utils::http::abstract_http_client::set_proxy(const std::string& address) + { + return false; + } } } } -- cgit v1.2.3