diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-12-13 05:09:57 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-12-13 05:42:32 +0100 |
| commit | ba2f19504c6b1302a93accbb50383f422c54df43 (patch) | |
| tree | 4a373f3b1ade813c77d8cb67e63bc72870ea7cff /src/netbase.h | |
| parent | ef8ba7d73a480197b756fab00126914e49de4e7b (diff) | |
| parent | 3830b6e0659106458c941029f5b2e789e3cb38a3 (diff) | |
| download | bitcoin-ba2f19504c6b1302a93accbb50383f422c54df43.tar.xz | |
Merge #11363: net: Split socket create/connect
3830b6e net: use CreateSocket for binds (Cory Fields)
df3bcf8 net: pass socket closing responsibility up to caller for outgoing connections (Cory Fields)
9e3b2f5 net: Move IsSelectableSocket check into socket creation (Cory Fields)
1729c29 net: split socket creation out of connection (Cory Fields)
Pull request description:
Requirement for #11227.
We'll need to create sockets and perform the actual connect in separate steps, so break them up.
#11227 adds an RAII wrapper around connection attempts, as a belt-and-suspenders in case a CloseSocket is missed.
Tree-SHA512: de675bb718cc56d68893c303b8057ca062c7431eaa17ae7c4829caed119fa3f15b404d8f52aca22a6bca6e73a26fb79e898b335d090ab015bf6456cf417fc694
Diffstat (limited to 'src/netbase.h')
| -rw-r--r-- | src/netbase.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/netbase.h b/src/netbase.h index 0a07be87b7..c89bd5b88f 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -51,8 +51,9 @@ bool Lookup(const char *pszName, CService& addr, int portDefault, bool fAllowLoo bool Lookup(const char *pszName, std::vector<CService>& vAddr, int portDefault, bool fAllowLookup, unsigned int nMaxSolutions); CService LookupNumeric(const char *pszName, int portDefault = 0); bool LookupSubNet(const char *pszName, CSubNet& subnet); -bool ConnectSocketDirectly(const CService &addrConnect, SOCKET& hSocketRet, int nTimeout); -bool ConnectThroughProxy(const proxyType &proxy, const std::string& strDest, int port, SOCKET& hSocketRet, int nTimeout, bool *outProxyConnectionFailed); +SOCKET CreateSocket(const CService &addrConnect); +bool ConnectSocketDirectly(const CService &addrConnect, const SOCKET& hSocketRet, int nTimeout); +bool ConnectThroughProxy(const proxyType &proxy, const std::string& strDest, int port, const SOCKET& hSocketRet, int nTimeout, bool *outProxyConnectionFailed); /** Return readable error string for a network error code */ std::string NetworkErrorString(int err); /** Close socket and set hSocket to INVALID_SOCKET */ |