Make GetBindAddress() callable from outside net.cpp

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 committed 2026-01-12 15:31:55 -05:00
1 parent aeaa67a9ea
commit a0ca851d26
3 files changed
+16 -14

No files matched your search

-14
View File
@@ -360,20 +360,6 @@ bool CConnman::CheckIncomingNonce(uint64_t nonce)
return true; 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, CNode* CConnman::ConnectNode(CAddress addrConnect,
const char* pszDest, const char* pszDest,
bool fCountFailure, bool fCountFailure,
+13
View File
@@ -947,3 +947,16 @@ CService MaybeFlipIPv6toCJDNS(const CService& service)
} }
return ret; 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
View File
@@ -362,4 +362,7 @@ bool IsBadPort(uint16_t port);
*/ */
CService MaybeFlipIPv6toCJDNS(const CService& service); CService MaybeFlipIPv6toCJDNS(const CService& service);
/** Get the bind address for a socket as CService. */
CService GetBindAddress(const Sock& sock);
#endif // BITCOIN_NETBASE_H #endif // BITCOIN_NETBASE_H