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

Fix handling of default ports

Browse Source
This commit is contained in:
Pieter Wuille
2012-01-17 02:12:35 +01:00
parent 8498c59144
commit c981d768b3
5 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/netbase.cpp
View File

@@ -627,11 +627,12 @@ CService::CService(const char *pszIpPort, bool fAllowLookup)
*this = ip;
}
CService::CService(const char *pszIp, int portIn, bool fAllowLookup)
CService::CService(const char *pszIpPort, int portDefault, bool fAllowLookup)
{
std::vector<CNetAddr> ip;
if (LookupHost(pszIp, ip, 1, fAllowLookup))
*this = CService(ip[0], portIn);
Init();
CService ip;
if (Lookup(pszIpPort, ip, portDefault, fAllowLookup))
*this = ip;
}
CService::CService(const std::string &strIpPort, bool fAllowLookup)
@@ -642,11 +643,12 @@ CService::CService(const std::string &strIpPort, bool fAllowLookup)
*this = ip;
}
CService::CService(const std::string &strIp, int portIn, bool fAllowLookup)
CService::CService(const std::string &strIpPort, int portDefault, bool fAllowLookup)
{
std::vector<CNetAddr> ip;
if (LookupHost(strIp.c_str(), ip, 1, fAllowLookup))
*this = CService(ip[0], portIn);
Init();
CService ip;
if (Lookup(strIpPort.c_str(), ip, portDefault, fAllowLookup))
*this = ip;
}
unsigned short CService::GetPort() const