diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2015-04-28 07:00:31 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2015-04-28 07:02:34 -0700 |
| commit | 9e06be2802eb731dfa3273abdf85e3c94d7c1e59 (patch) | |
| tree | 23dd826e9e34d652cd76b7488179c2fb62ccd9b4 | |
| parent | 18d28326785a7111b50528107550c3d37ec40d89 (diff) | |
| parent | d1af89e655d7153d72305ce0559e8aabbe80eedb (diff) | |
| download | bitcoin-9e06be2802eb731dfa3273abdf85e3c94d7c1e59.tar.xz | |
Merge pull request #6054
d1af89e use const reference as param in ConnectThroughProxy/Socks5 (Philip Kaufmann)
| -rw-r--r-- | src/netbase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/netbase.cpp b/src/netbase.cpp index 1837cfa9c3..2015d0271a 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -293,7 +293,7 @@ struct ProxyCredentials }; /** Connect using SOCKS5 (as described in RFC1928) */ -bool static Socks5(string strDest, int port, const ProxyCredentials *auth, SOCKET& hSocket) +static bool Socks5(const std::string& strDest, int port, const ProxyCredentials *auth, SOCKET& hSocket) { LogPrintf("SOCKS5 connecting %s\n", strDest); if (strDest.size() > 255) { @@ -558,7 +558,7 @@ bool IsProxy(const CNetAddr &addr) { return false; } -static bool ConnectThroughProxy(const proxyType &proxy, const std::string strDest, int port, SOCKET& hSocketRet, int nTimeout, bool *outProxyConnectionFailed) +static bool ConnectThroughProxy(const proxyType &proxy, const std::string& strDest, int port, SOCKET& hSocketRet, int nTimeout, bool *outProxyConnectionFailed) { SOCKET hSocket = INVALID_SOCKET; // first connect to proxy server |