diff options
| author | Pieter Wuille <sipa@ulyssis.org> | 2012-01-17 02:12:35 +0100 |
|---|---|---|
| committer | Pieter Wuille <sipa@ulyssis.org> | 2012-01-17 02:12:35 +0100 |
| commit | c981d768b3cb0cf0879b3d70d3b548692fff0882 (patch) | |
| tree | 3b350bb166cb07d8df1542b6fa0dc12614a8c1e8 /src/netbase.cpp | |
| parent | 8498c591448d01a8a8ccc5ad1e8cbee9dbcf1500 (diff) | |
Fix handling of default ports
Diffstat (limited to 'src/netbase.cpp')
| -rw-r--r-- | src/netbase.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/netbase.cpp b/src/netbase.cpp index 48db3625c0..54e3119153 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -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 |