foster/bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-06 14:19:59 -05:00
Code Issues Activity

net: change GetBindAddress() to take Sock argument

Browse source 
This avoids the direct call to `getsockname()` and allows mocking.
This commit is contained in:
Vasil Dimov 2021-04-13 15:11:20 +02:00
parent 748dbcd9f2
commit a8d6abba5e
No known key found for this signature in database
GPG key ID: 54DF06F64B55CBBF
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/net.cpp
View file

@ -422,13 +422,13 @@ bool CConnman::CheckIncomingNonce(uint64_t nonce)
} }
/** Get the bind address for a socket as CAddress */ /** Get the bind address for a socket as CAddress */
static CAddress GetBindAddress(SOCKET sock) static CAddress GetBindAddress(const Sock& sock)
{ {
CAddress addr_bind; CAddress addr_bind;
struct sockaddr_storage sockaddr_bind; struct sockaddr_storage sockaddr_bind;
socklen_t sockaddr_bind_len = sizeof(sockaddr_bind); socklen_t sockaddr_bind_len = sizeof(sockaddr_bind);
if (sock != INVALID_SOCKET) { if (sock.Get() != INVALID_SOCKET) {
if (!getsockname(sock, (struct sockaddr*)&sockaddr_bind, &sockaddr_bind_len)) { if (!sock.GetSockName((struct sockaddr*)&sockaddr_bind, &sockaddr_bind_len)) {
addr_bind.SetSockAddr((const struct sockaddr*)&sockaddr_bind); addr_bind.SetSockAddr((const struct sockaddr*)&sockaddr_bind);
} else { } else {
LogPrintLevel(BCLog::NET, BCLog::Level::Warning, "getsockname failed\n"); LogPrintLevel(BCLog::NET, BCLog::Level::Warning, "getsockname failed\n");
@ -540,7 +540,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
NodeId id = GetNewNodeId(); NodeId id = GetNewNodeId();
uint64_t nonce = GetDeterministicRandomizer(RANDOMIZER_ID_LOCALHOSTNONCE).Write(id).Finalize(); uint64_t nonce = GetDeterministicRandomizer(RANDOMIZER_ID_LOCALHOSTNONCE).Write(id).Finalize();
if (!addr_bind.IsValid()) { if (!addr_bind.IsValid()) {
addr_bind = GetBindAddress(sock->Get()); addr_bind = GetBindAddress(*sock);
} }
CNode* pnode = new CNode(id, CNode* pnode = new CNode(id,
nLocalServices, nLocalServices,
@ -1154,7 +1154,7 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
addr = CAddress{MaybeFlipIPv6toCJDNS(addr), NODE_NONE}; addr = CAddress{MaybeFlipIPv6toCJDNS(addr), NODE_NONE};
} }
const CAddress addr_bind{MaybeFlipIPv6toCJDNS(GetBindAddress(sock->Get())), NODE_NONE}; const CAddress addr_bind{MaybeFlipIPv6toCJDNS(GetBindAddress(*sock)), NODE_NONE};
NetPermissionFlags permissionFlags = NetPermissionFlags::None; NetPermissionFlags permissionFlags = NetPermissionFlags::None;
hListenSocket.AddSocketPermissionFlags(permissionFlags); hListenSocket.AddSocketPermissionFlags(permissionFlags);