update to bitcoin-git

This commit is contained in:
Wladimir J. van der Laan
2011-05-15 16:50:28 +02:00
parent 6a8062a30d
commit 85663f2c18
5 changed files with 22 additions and 13 deletions

View File

@@ -133,6 +133,8 @@ bool ConnectSocket(const CAddress& addrConnect, SOCKET& hSocketRet)
bool Lookup(const char *pszName, vector<CAddress>& vaddr, int nServices, int nMaxSolutions, bool fAllowLookup, int portDefault, bool fAllowPort)
{
vaddr.clear();
if (pszName[0] == 0)
return false;
int port = portDefault;
char psz[256];
char *pszHost = psz;
@@ -158,11 +160,11 @@ bool Lookup(const char *pszName, vector<CAddress>& vaddr, int nServices, int nMa
}
}
struct in_addr addrIP;
if (inet_aton(pszHost, &addrIP))
unsigned int addrIP = inet_addr(pszHost);
if (addrIP != INADDR_NONE)
{
// valid IP address passed
vaddr.push_back(CAddress(addrIP.s_addr, port, nServices));
vaddr.push_back(CAddress(addrIP, port, nServices));
return true;
}
@@ -1527,7 +1529,7 @@ void StartNode(void* parg)
if (gethostname(pszHostName, sizeof(pszHostName)) != SOCKET_ERROR)
{
vector<CAddress> vaddr;
if (NameLookup(pszHostName, vaddr, nLocalServices))
if (Lookup(pszHostName, vaddr, nLocalServices, -1, true))
BOOST_FOREACH (const CAddress &addr, vaddr)
if (addr.GetByte(3) != 127)
{