highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-12 06:58:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'keepnode' of https://github.com/TheBlueMatt/bitcoin

Browse Source
This commit is contained in:
Gavin Andresen
2012-01-16 16:45:43 -05:00
parent 5dc090009e 10ba0a3efc
commit 8498c59144
4 changed files with 100 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/netbase.cpp
View File

@@ -98,7 +98,7 @@ bool LookupHostNumeric(const char *pszName, std::vector<CNetAddr>& vIP, int nMax
return LookupHost(pszName, vIP, nMaxSolutions, false);
}
bool Lookup(const char *pszName, CService& addr, int portDefault, bool fAllowLookup)
bool Lookup(const char *pszName, std::vector<CService>& vAddr, int portDefault, bool fAllowLookup, int nMaxSolutions)
{
if (pszName[0] == 0)
return false;
@@ -132,10 +132,22 @@ bool Lookup(const char *pszName, CService& addr, int portDefault, bool fAllowLoo
}
std::vector<CNetAddr> vIP;
bool fRet = LookupIntern(pszHost, vIP, 1, fAllowLookup);
bool fRet = LookupIntern(pszHost, vIP, nMaxSolutions, fAllowLookup);
if (!fRet)
return false;
addr = CService(vIP[0], port);
vAddr.resize(vIP.size());
for (int i = 0; i < vIP.size(); i++)
vAddr[i] = CService(vIP[i], port);
return true;
}
bool Lookup(const char *pszName, CService& addr, int portDefault, bool fAllowLookup)
{
std::vector<CService> vService;
bool fRet = Lookup(pszName, vService, portDefault, fAllowLookup, 1);
if (!fRet)
return false;
addr = vService[0];
return true;
}