diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2016-04-12 20:23:16 -0400 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2016-04-17 17:37:36 -0400 |
| commit | e9fc71e5fa6f0d7991bac616b9fed6a80e77a8d7 (patch) | |
| tree | e8685157e827889383718cb48b3dbc1db05f6bd7 /src | |
| parent | 73fc922ed64333d45f18d8a448f30cfa2ae0281e (diff) | |
| download | bitcoin-e9fc71e5fa6f0d7991bac616b9fed6a80e77a8d7.tar.xz | |
net: require lookup functions to specify all arguments
To make it clear where DNS resolves are happening
Diffstat (limited to 'src')
| -rw-r--r-- | src/net.cpp | 4 | ||||
| -rw-r--r-- | src/netbase.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/net.cpp b/src/net.cpp index f294e4c667..6ab6ef819d 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1443,7 +1443,7 @@ void ThreadDNSAddressSeed() } else { vector<CNetAddr> vIPs; vector<CAddress> vAdd; - if (LookupHost(seed.host.c_str(), vIPs)) + if (LookupHost(seed.host.c_str(), vIPs, 0, true)) { BOOST_FOREACH(const CNetAddr& ip, vIPs) { @@ -1884,7 +1884,7 @@ void static Discover(boost::thread_group& threadGroup) if (gethostname(pszHostName, sizeof(pszHostName)) != SOCKET_ERROR) { vector<CNetAddr> vaddr; - if (LookupHost(pszHostName, vaddr)) + if (LookupHost(pszHostName, vaddr, 0, true)) { BOOST_FOREACH (const CNetAddr &addr, vaddr) { diff --git a/src/netbase.h b/src/netbase.h index db736154fa..4529f98229 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -206,9 +206,9 @@ bool GetProxy(enum Network net, proxyType &proxyInfoOut); bool IsProxy(const CNetAddr &addr); bool SetNameProxy(const proxyType &addrProxy); bool HaveNameProxy(); -bool LookupHost(const char *pszName, std::vector<CNetAddr>& vIP, unsigned int nMaxSolutions = 0, bool fAllowLookup = true); -bool Lookup(const char *pszName, CService& addr, int portDefault = 0, bool fAllowLookup = true); -bool Lookup(const char *pszName, std::vector<CService>& vAddr, int portDefault = 0, bool fAllowLookup = true, unsigned int nMaxSolutions = 0); +bool LookupHost(const char *pszName, std::vector<CNetAddr>& vIP, unsigned int nMaxSolutions, bool fAllowLookup); +bool Lookup(const char *pszName, CService& addr, int portDefault, bool fAllowLookup); +bool Lookup(const char *pszName, std::vector<CService>& vAddr, int portDefault, bool fAllowLookup, unsigned int nMaxSolutions); bool LookupNumeric(const char *pszName, CService& addr, int portDefault = 0); bool ConnectSocket(const CService &addr, SOCKET& hSocketRet, int nTimeout, bool *outProxyConnectionFailed = 0); bool ConnectSocketByName(CService &addr, SOCKET& hSocketRet, const char *pszDest, int portDefault, int nTimeout, bool *outProxyConnectionFailed = 0); |