diff options
| author | laanwj <126646+laanwj@users.noreply.github.com> | 2022-04-14 10:05:00 +0200 |
|---|---|---|
| committer | laanwj <126646+laanwj@users.noreply.github.com> | 2022-04-14 10:16:01 +0200 |
| commit | b69fd5eaa99f84b62a49d7c7f48d8cee1227592a (patch) | |
| tree | 641d5074bc900c6ca831336838013d7c055e7f61 /src/netbase.h | |
| parent | 1e3ed01faa77215a7c36308237280aaa58895532 (diff) | |
| parent | c71117fcb04fc2e45b5e76fe96b077a07b0c0f82 (diff) | |
Merge bitcoin/bitcoin#22052: net: remove non-blocking bool from interface
c71117fcb04fc2e45b5e76fe96b077a07b0c0f82 net: remove non-blocking bool from interface (Bushstar)
Pull request description:
SetSocketNonBlocking was added in 0.11 in the PR below with a second argument to toggle non-blocking mode for the socket. That argument has always been set to true in all subsequent releases and I'm not sure why it is present.
https://github.com/bitcoin/bitcoin/pull/4491
ACKs for top commit:
promag:
Code review ACK c71117fcb04fc2e45b5e76fe96b077a07b0c0f82.
lsilva01:
Code review ACK https://github.com/bitcoin/bitcoin/pull/22052/commits/c71117fcb04fc2e45b5e76fe96b077a07b0c0f82
vasild:
ACK c71117fcb04fc2e45b5e76fe96b077a07b0c0f82
Tree-SHA512: feebfcfa75d997460a0ba42ffe1e0c25a7e0bfcad12510ad73ea4942cc1c653f9ad429adbbb00b9288fe319009552906fcb635a14dfd7dcbde3853baab6be065
Diffstat (limited to 'src/netbase.h')
| -rw-r--r-- | src/netbase.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/netbase.h b/src/netbase.h index f9e3872c16..c226e6b73d 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -221,8 +221,8 @@ bool ConnectSocketDirectly(const CService &addrConnect, const Sock& sock, int nT */ bool ConnectThroughProxy(const Proxy& proxy, const std::string& strDest, uint16_t port, const Sock& sock, int nTimeout, bool& outProxyConnectionFailed); -/** Disable or enable blocking-mode for a socket */ -bool SetSocketNonBlocking(const SOCKET& hSocket, bool fNonBlocking); +/** Enable non-blocking mode for a socket */ +bool SetSocketNonBlocking(const SOCKET& hSocket); /** Set the TCP_NODELAY flag on a socket */ bool SetSocketNoDelay(const SOCKET& hSocket); void InterruptSocks5(bool interrupt); |