diff options
| author | Thomas Snider <tjps636@gmail.com> | 2017-03-22 22:02:02 -0700 |
|---|---|---|
| committer | Thomas Snider <tjps636@gmail.com> | 2017-04-05 11:31:43 -0700 |
| commit | ad415bc16afdb4fdb6d619624762f1324751a824 (patch) | |
| tree | f36dd6aa64fa7e498e60195008922e3a9c883f0c | |
| parent | 02d64bd929c9663ba38e96721c6dbd89972d043d (diff) | |
| download | bitcoin-ad415bc16afdb4fdb6d619624762f1324751a824.tar.xz | |
[net] Added SetSocketNoDelay() utility function
| -rw-r--r-- | src/net.cpp | 7 | ||||
| -rw-r--r-- | src/netbase.cpp | 15 | ||||
| -rw-r--r-- | src/netbase.h | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/net.cpp b/src/net.cpp index 4c5b04b785..d8629667b5 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1069,12 +1069,7 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) { // According to the internet TCP_NODELAY is not carried into accepted sockets // on all platforms. Set it again here just to be sure. - int set = 1; -#ifdef WIN32 - setsockopt(hSocket, IPPROTO_TCP, TCP_NODELAY, (const char*)&set, sizeof(int)); -#else - setsockopt(hSocket, IPPROTO_TCP, TCP_NODELAY, (void*)&set, sizeof(int)); -#endif + SetSocketNoDelay(hSocket); if (IsBanned(addr) && !whitelisted) { diff --git a/src/netbase.cpp b/src/netbase.cpp index 0f02e93e46..ead2f4db7d 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -428,18 +428,14 @@ bool static ConnectSocketDirectly(const CService &addrConnect, SOCKET& hSocketRe if (hSocket == INVALID_SOCKET) return false; - int set = 1; #ifdef SO_NOSIGPIPE + int set = 1; // Different way of disabling SIGPIPE on BSD setsockopt(hSocket, SOL_SOCKET, SO_NOSIGPIPE, (void*)&set, sizeof(int)); #endif //Disable Nagle's algorithm -#ifdef WIN32 - setsockopt(hSocket, IPPROTO_TCP, TCP_NODELAY, (const char*)&set, sizeof(int)); -#else - setsockopt(hSocket, IPPROTO_TCP, TCP_NODELAY, (void*)&set, sizeof(int)); -#endif + SetSocketNoDelay(hSocket); // Set to non-blocking if (!SetSocketNonBlocking(hSocket, true)) @@ -728,6 +724,13 @@ bool SetSocketNonBlocking(SOCKET& hSocket, bool fNonBlocking) return true; } +bool SetSocketNoDelay(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; diff --git a/src/netbase.h b/src/netbase.h index dd33b6e47e..c9d108aadd 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -59,6 +59,8 @@ std::string NetworkErrorString(int err); bool CloseSocket(SOCKET& hSocket); /** Disable or enable blocking-mode for a socket */ bool SetSocketNonBlocking(SOCKET& hSocket, bool fNonBlocking); +/** Set the TCP_NODELAY flag on a socket */ +bool SetSocketNoDelay(SOCKET& hSocket); /** * Convert milliseconds to a struct timeval for e.g. select. */ |