Skip to content

Commit f6c267d

Browse files
committed
net: avoid unnecessary GetBindAddress() call
Our local (bind) address is already saved in `CNode::addrBind` and there is no need to re-retrieve it again with `GetBindAddress()`. Also, for I2P connections `CNode::addrBind` would contain our I2P address, but `GetBindAddress()` would return something like `127.0.0.1:RANDOM_PORT`.
1 parent 7c224fd commit f6c267d

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

src/net.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2606,9 +2606,7 @@ std::vector<CAddress> CConnman::GetAddresses(size_t max_addresses, size_t max_pc
26062606

26072607
std::vector<CAddress> CConnman::GetAddresses(CNode& requestor, size_t max_addresses, size_t max_pct)
26082608
{
2609-
SOCKET socket;
2610-
WITH_LOCK(requestor.cs_hSocket, socket = requestor.hSocket);
2611-
auto local_socket_bytes = GetBindAddress(socket).GetAddrBytes();
2609+
auto local_socket_bytes = requestor.addrBind.GetAddrBytes();
26122610
uint64_t cache_id = GetDeterministicRandomizer(RANDOMIZER_ID_ADDRCACHE)
26132611
.Write(requestor.addr.GetNetwork())
26142612
.Write(local_socket_bytes.data(), local_socket_bytes.size())

0 commit comments

Comments
 (0)