diff options
| author | Pavel Janík <[email protected]> | 2016-08-15 14:10:07 +0200 |
|---|---|---|
| committer | Pavel Janík <[email protected]> | 2016-08-15 14:10:07 +0200 |
| commit | b7c349d5e7c207bb7a2e7469c3e5522c9909c17f (patch) | |
| tree | 72334fef6ee1ea35717aa8295589b0a01691dba9 /src/netbase.cpp | |
| parent | Merge #8128: Net: Turn net structures into dumb storage classes (diff) | |
| download | discoin-b7c349d5e7c207bb7a2e7469c3e5522c9909c17f.tar.xz discoin-b7c349d5e7c207bb7a2e7469c3e5522c9909c17f.zip | |
Do not shadow variables in networking code
Diffstat (limited to 'src/netbase.cpp')
| -rw-r--r-- | src/netbase.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/netbase.cpp b/src/netbase.cpp index 4f243ec6f..7d7f1b678 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -631,8 +631,8 @@ bool ConnectSocketByName(CService &addr, SOCKET& hSocketRet, const char *pszDest SplitHostPort(std::string(pszDest), port, strDest); - proxyType nameProxy; - GetNameProxy(nameProxy); + proxyType proxy; + GetNameProxy(proxy); std::vector<CService> addrResolved; if (Lookup(strDest.c_str(), addrResolved, port, fNameLookup && !HaveNameProxy(), 256)) { @@ -646,7 +646,7 @@ bool ConnectSocketByName(CService &addr, SOCKET& hSocketRet, const char *pszDest if (!HaveNameProxy()) return false; - return ConnectThroughProxy(nameProxy, strDest, port, hSocketRet, nTimeout, outProxyConnectionFailed); + return ConnectThroughProxy(proxy, strDest, port, hSocketRet, nTimeout, outProxyConnectionFailed); } bool LookupSubNet(const char* pszName, CSubNet& ret) |