mirror of
https://github.com/monero-project/monero.git
synced 2025-08-22 09:29:34 -04:00
Daemon-specific proxy for the wallet-rpc.
1. Daemon-specific proxy is exclusive with global proxy (--proxy). 2. If you set global proxy (--proxy) you cannot set daemon-specific proxy. 3. If you don't set global proxy, you can set proxy (or not set) proxy for each daemon connection with the proxy field in jsonrpc to the wallet-rpc.
This commit is contained in:
parent
059028a30a
commit
c50ade514f
5 changed files with 31 additions and 4 deletions
|
@ -962,6 +962,12 @@ private:
|
|||
|
||||
std::string path() const;
|
||||
|
||||
/*!
|
||||
* \brief has_proxy_option Check the global proxy (--proxy) has been defined or not.
|
||||
* \return returns bool representing the global proxy (--proxy).
|
||||
*/
|
||||
bool has_proxy_option() const;
|
||||
|
||||
/*!
|
||||
* \brief verifies given password is correct for default wallet keys file
|
||||
*/
|
||||
|
@ -992,7 +998,8 @@ private:
|
|||
epee::net_utils::ssl_options_t ssl_options = epee::net_utils::ssl_support_t::e_ssl_support_autodetect);
|
||||
bool set_daemon(std::string daemon_address = "http://localhost:8080",
|
||||
boost::optional<epee::net_utils::http::login> daemon_login = boost::none, bool trusted_daemon = true,
|
||||
epee::net_utils::ssl_options_t ssl_options = epee::net_utils::ssl_support_t::e_ssl_support_autodetect);
|
||||
epee::net_utils::ssl_options_t ssl_options = epee::net_utils::ssl_support_t::e_ssl_support_autodetect,
|
||||
const std::string &proxy = "");
|
||||
bool set_proxy(const std::string &address);
|
||||
|
||||
void stop() { m_run.store(false, std::memory_order_relaxed); m_message_store.stop(); }
|
||||
|
@ -1771,6 +1778,7 @@ private:
|
|||
cryptonote::account_base m_account;
|
||||
boost::optional<epee::net_utils::http::login> m_daemon_login;
|
||||
std::string m_daemon_address;
|
||||
std::string m_proxy;
|
||||
std::string m_wallet_file;
|
||||
std::string m_keys_file;
|
||||
std::string m_mms_file;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue