diff --git a/src/netbase.cpp b/src/netbase.cpp index d3c3c36b370..c8735bd43de 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -665,7 +665,7 @@ std::unique_ptr ConnectThroughProxy(const Proxy& proxy, } // do socks negotiation - if (proxy.randomize_credentials) { + if (proxy.m_randomize_credentials) { ProxyCredentials random_auth; static std::atomic_int counter(0); random_auth.username = random_auth.password = strprintf("%i", counter++); diff --git a/src/netbase.h b/src/netbase.h index e3b7da470c8..0cefddafead 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -58,14 +58,14 @@ bool IsUnixSocketPath(const std::string& name); class Proxy { public: - Proxy(): m_is_unix_socket(false), randomize_credentials(false) {} - explicit Proxy(const CService &_proxy, bool _randomize_credentials=false): proxy(_proxy), m_is_unix_socket(false), randomize_credentials(_randomize_credentials) {} - explicit Proxy(const std::string path, bool _randomize_credentials=false): m_unix_socket_path(path), m_is_unix_socket(true), randomize_credentials(_randomize_credentials) {} + Proxy() : m_is_unix_socket(false), m_randomize_credentials(false) {} + explicit Proxy(const CService& _proxy, bool _randomize_credentials = false) : proxy(_proxy), m_is_unix_socket(false), m_randomize_credentials(_randomize_credentials) {} + explicit Proxy(const std::string path, bool _randomize_credentials = false) : m_unix_socket_path(path), m_is_unix_socket(true), m_randomize_credentials(_randomize_credentials) {} CService proxy; std::string m_unix_socket_path; bool m_is_unix_socket; - bool randomize_credentials; + bool m_randomize_credentials; bool IsValid() const { diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp index be07e6c2d5a..3fa2b184953 100644 --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -608,7 +608,7 @@ static UniValue GetNetworksInfo() obj.pushKV("limited", !g_reachable_nets.Contains(network)); obj.pushKV("reachable", g_reachable_nets.Contains(network)); obj.pushKV("proxy", proxy.IsValid() ? proxy.ToString() : std::string()); - obj.pushKV("proxy_randomize_credentials", proxy.randomize_credentials); + obj.pushKV("proxy_randomize_credentials", proxy.m_randomize_credentials); networks.push_back(obj); } return networks;