diff options
| author | Vasil Dimov <vd@FreeBSD.org> | 2020-12-28 16:57:10 +0100 |
|---|---|---|
| committer | Vasil Dimov <vd@FreeBSD.org> | 2021-02-10 13:30:08 +0100 |
| commit | 04ae8469049e1f14585aabfb618ae522150240a7 (patch) | |
| tree | 80472dda64d7565ea923d84a9f11b60e243609d6 /src/net.cpp | |
| parent | ba9d73268f9585d4b9254adcf54708f88222798b (diff) | |
net: use Sock in InterruptibleRecv() and Socks5()
Use the `Sock` class instead of `SOCKET` for `InterruptibleRecv()` and
`Socks5()`.
This way the `Socks5()` function can be tested by giving it a mocked
instance of a socket.
Co-authored-by: practicalswift <practicalswift@users.noreply.github.com>
Diffstat (limited to 'src/net.cpp')
| -rw-r--r-- | src/net.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net.cpp b/src/net.cpp index 2a3669b90e..16aa489873 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -440,7 +440,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo return nullptr; } connected = ConnectThroughProxy(proxy, addrConnect.ToStringIP(), addrConnect.GetPort(), - sock->Get(), nConnectTimeout, proxyConnectionFailed); + *sock, nConnectTimeout, proxyConnectionFailed); } else { // no proxy needed (none set for target network) sock = CreateSock(addrConnect); @@ -464,7 +464,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo int port = default_port; SplitHostPort(std::string(pszDest), port, host); bool proxyConnectionFailed; - connected = ConnectThroughProxy(proxy, host, port, sock->Get(), nConnectTimeout, + connected = ConnectThroughProxy(proxy, host, port, *sock, nConnectTimeout, proxyConnectionFailed); } if (!connected) { |