highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-03 22:03:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make GetBindAddress() callable from outside net.cpp

Browse Source 
The function logic is moved-only from net.cpp to netbase.cpp
and redeclared (as non-static) in netbase.h
This commit is contained in:
Matthew Zipkin
2025-06-23 11:36:01 -07:00
parent aeaa67a9ea
commit a0ca851d26
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/net.cpp
View File

@@ -360,20 +360,6 @@ bool CConnman::CheckIncomingNonce(uint64_t nonce)
return true;
}
/** Get the bind address for a socket as CService. */
static CService GetBindAddress(const Sock& sock)
{
CService addr_bind;
struct sockaddr_storage sockaddr_bind;
socklen_t sockaddr_bind_len = sizeof(sockaddr_bind);
if (!sock.GetSockName((struct sockaddr*)&sockaddr_bind, &sockaddr_bind_len)) {
addr_bind.SetSockAddr((const struct sockaddr*)&sockaddr_bind, sockaddr_bind_len);
} else {
LogWarning("getsockname failed\n");
}
return addr_bind;
}
CNode* CConnman::ConnectNode(CAddress addrConnect,
const char* pszDest,
bool fCountFailure,

13
src/netbase.cpp
View File

@@ -947,3 +947,16 @@ CService MaybeFlipIPv6toCJDNS(const CService& service)
}
return ret;
}
CService GetBindAddress(const Sock& sock)
{
CService addr_bind;
struct sockaddr_storage sockaddr_bind;
socklen_t sockaddr_bind_len = sizeof(sockaddr_bind);
if (!sock.GetSockName((struct sockaddr*)&sockaddr_bind, &sockaddr_bind_len)) {
addr_bind.SetSockAddr((const struct sockaddr*)&sockaddr_bind, sockaddr_bind_len);
} else {
LogWarning("getsockname failed\n");
}
return addr_bind;
}

3
src/netbase.h
View File

@@ -362,4 +362,7 @@ bool IsBadPort(uint16_t port);
*/
CService MaybeFlipIPv6toCJDNS(const CService& service);
/** Get the bind address for a socket as CService. */
CService GetBindAddress(const Sock& sock);
#endif // BITCOIN_NETBASE_H