diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2016-08-04 16:37:49 -0400 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2016-08-04 16:41:39 -0400 |
| commit | 8945384bca00f74ba85c98a52925c254c49025a5 (patch) | |
| tree | c5479d77e5feb28ed75b53715073bcf3b46c1ffe /src/netbase.h | |
| parent | 21ba407a7369a0229b8a8554dee0da63a64e6639 (diff) | |
| download | bitcoin-8945384bca00f74ba85c98a52925c254c49025a5.tar.xz | |
net: Have LookupNumeric return a CService directly
Also fix up a few small issues:
- Lookup with "badip:port" now sets the port to 0
- Don't allow assert to have side-effects
Diffstat (limited to 'src/netbase.h')
| -rw-r--r-- | src/netbase.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/netbase.h b/src/netbase.h index d0abd5e954..bb12019a82 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -49,7 +49,7 @@ bool LookupHost(const char *pszName, std::vector<CNetAddr>& vIP, unsigned int nM bool LookupHost(const char *pszName, CNetAddr& addr, 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); +CService LookupNumeric(const char *pszName, int portDefault = 0); bool LookupSubNet(const char *pszName, CSubNet& subnet); 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); |