highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 14:38:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

net: use Sock::SetSockOpt() instead of standalone SetSocketNoDelay()

Browse Source 
Since the former is mockable, this makes it easier to test higher level
code that sets the TCP_NODELAY flag.
This commit is contained in:
Vasil Dimov
2021-04-13 14:01:44 +02:00
parent d65b6c3fb9
commit a2c4a7acd1
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/netbase.cpp
View File

@@ -519,7 +519,10 @@ std::unique_ptr<Sock> CreateSockTCP(const CService& address_family)
#endif
// Set the no-delay option (disable Nagle's algorithm) on the TCP socket.
SetSocketNoDelay(sock->Get());
const int on{1};
if (sock->SetSockOpt(IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on)) == SOCKET_ERROR) {
LogPrint(BCLog::NET, "Unable to set TCP_NODELAY on a newly created socket, continuing anyway\n");
}
// Set the non-blocking option on the socket.
if (!SetSocketNonBlocking(sock->Get())) {
@@ -729,13 +732,6 @@ bool SetSocketNonBlocking(const SOCKET& hSocket)
return true;
}
bool SetSocketNoDelay(const SOCKET& hSocket)
{
int set = 1;
int rc = setsockopt(hSocket, IPPROTO_TCP, TCP_NODELAY, (const char*)&set, sizeof(int));
return rc == 0;
}
void InterruptSocks5(bool interrupt)
{
interruptSocks5Recv = interrupt;