diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2012-10-07 07:03:06 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2012-10-07 07:03:06 -0700 |
| commit | 43de64949c96b6d708b7d8a82c3dba0f6ddf059e (patch) | |
| tree | 5a5815a1ffbcc5b2b24623a121e9c4a3e2480847 /src/rpcwallet.cpp | |
| parent | ee0b64853699c08602fed81cdefc62d7e8dcdce2 (diff) | |
| parent | 81bbef26099eb54f4dcc32e45b5e0416857a330d (diff) | |
| download | bitcoin-43de64949c96b6d708b7d8a82c3dba0f6ddf059e.tar.xz | |
Merge pull request #1859 from Diapolo/proxy_locks
add LOCK() for proxy related data-structures
Diffstat (limited to 'src/rpcwallet.cpp')
| -rw-r--r-- | src/rpcwallet.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index 51768c9b54..cc2e8ab46b 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -62,8 +62,8 @@ Value getinfo(const Array& params, bool fHelp) "getinfo\n" "Returns an object containing various state info."); - CService addrProxy; - GetProxy(NET_IPV4, addrProxy); + proxyType proxy; + GetProxy(NET_IPV4, proxy); Object obj; obj.push_back(Pair("version", (int)CLIENT_VERSION)); @@ -72,7 +72,7 @@ Value getinfo(const Array& params, bool fHelp) obj.push_back(Pair("balance", ValueFromAmount(pwalletMain->GetBalance()))); obj.push_back(Pair("blocks", (int)nBestHeight)); obj.push_back(Pair("connections", (int)vNodes.size())); - obj.push_back(Pair("proxy", (addrProxy.IsValid() ? addrProxy.ToStringIPPort() : string()))); + obj.push_back(Pair("proxy", (proxy.first.IsValid() ? proxy.first.ToStringIPPort() : string()))); obj.push_back(Pair("difficulty", (double)GetDifficulty())); obj.push_back(Pair("testnet", fTestNet)); obj.push_back(Pair("keypoololdest", (boost::int64_t)pwalletMain->GetOldestKeyPoolTime())); |