phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 23:09:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

netbase: allow CreateSock() to create UNIX sockets if supported

Browse source
This commit is contained in:
Matthew Zipkin 2023-05-26 14:05:28 -04:00
parent bae86c8d31
commit 74f568cb6f
No known key found for this signature in database
GPG key ID: E7E2984B6289C93A
2 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/netbase.cpp
View file

@ -3,6 +3,10 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H)
#include <config/bitcoin-config.h>
#endif
#include <netbase.h> #include <netbase.h>
#include <compat/compat.h> #include <compat/compat.h>
@ -21,6 +25,10 @@
#include <limits> #include <limits>
#include <memory> #include <memory>
#if HAVE_SOCKADDR_UN
#include <sys/un.h>
#endif
// Settings // Settings
static GlobalMutex g_proxyinfo_mutex; static GlobalMutex g_proxyinfo_mutex;
static Proxy proxyInfo[NET_MAX] GUARDED_BY(g_proxyinfo_mutex); static Proxy proxyInfo[NET_MAX] GUARDED_BY(g_proxyinfo_mutex);
@ -446,11 +454,16 @@ bool Socks5(const std::string& strDest, uint16_t port, const ProxyCredentials* a
std::unique_ptr<Sock> CreateSockOS(sa_family_t address_family) std::unique_ptr<Sock> CreateSockOS(sa_family_t address_family)
{ {
// Not IPv4 or IPv6 // Not IPv4, IPv6 or UNIX
if (address_family == AF_UNSPEC) return nullptr; if (address_family == AF_UNSPEC) return nullptr;
// Create a TCP socket in the address family of the specified service. int protocol{IPPROTO_TCP};
SOCKET hSocket = socket(address_family, SOCK_STREAM, IPPROTO_TCP); #if HAVE_SOCKADDR_UN
if (address_family == AF_UNIX) protocol = 0;
#endif
// Create a socket in the specified address family.
SOCKET hSocket = socket(address_family, SOCK_STREAM, protocol);
if (hSocket == INVALID_SOCKET) { if (hSocket == INVALID_SOCKET) {
return nullptr; return nullptr;
} }
@ -474,17 +487,21 @@ std::unique_ptr<Sock> CreateSockOS(sa_family_t address_family)
} }
#endif #endif
// Set the no-delay option (disable Nagle's algorithm) on the TCP socket.
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. // Set the non-blocking option on the socket.
if (!sock->SetNonBlocking()) { if (!sock->SetNonBlocking()) {
LogPrintf("Error setting socket to non-blocking: %s\n", NetworkErrorString(WSAGetLastError())); LogPrintf("Error setting socket to non-blocking: %s\n", NetworkErrorString(WSAGetLastError()));
return nullptr; return nullptr;
} }
#if HAVE_SOCKADDR_UN
if (address_family == AF_UNIX) return sock;
#endif
// Set the no-delay option (disable Nagle's algorithm) on the TCP socket.
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");
}
return sock; return sock;
} }

2
src/netbase.h
View file

@ -229,7 +229,7 @@ CService LookupNumeric(const std::string& name, uint16_t portDefault = 0, DNSLoo
CSubNet LookupSubNet(const std::string& subnet_str); CSubNet LookupSubNet(const std::string& subnet_str);
/** /**
* Create a socket in the given address family. * Create a TCP or UNIX socket in the given address family.
* @param[in] address_family to use for the socket. * @param[in] address_family to use for the socket.
* @return pointer to the created Sock object or unique_ptr that owns nothing in case of failure * @return pointer to the created Sock object or unique_ptr that owns nothing in case of failure
*/ */