highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-06 05:00:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused MaybeSetAddrName

Browse Source 
This logic is a no-op since it was introduced in commit
f9f5cfc50637f2cd1540923caf337e2651ec1625.

m_addr_name is never initialized to the empty string, because
ToStringIPPort never returns an empty string.
This commit is contained in:
MarcoFalke 2021-08-24 19:19:58 +02:00
parent eb09c26724
commit fa82f4ea96
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
3 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/net.cpp
View File

@ -414,14 +414,10 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
return nullptr;
}
// It is possible that we already have a connection to the IP/port pszDest resolved to.
// In that case, drop the connection that was just created, and return the existing CNode instead.
// Also store the name we used to connect in that CNode, so that future FindNode() calls to that
// name catch this early.
// In that case, drop the connection that was just created.
LOCK(cs_vNodes);
CNode* pnode = FindNode(static_cast<CService>(addrConnect));
if (pnode)
{
pnode->MaybeSetAddrName(std::string(pszDest));
if (pnode) {
LogPrintf("Failed to open new connection, already connected\n");
return nullptr;
}
@ -539,14 +535,8 @@ std::string CNode::GetAddrName() const {
return addrName;
}
void CNode::MaybeSetAddrName(const std::string& addrNameIn) {
LOCK(cs_addrName);
if (addrName.empty()) {
addrName = addrNameIn;
}
}
CService CNode::GetAddrLocal() const {
CService CNode::GetAddrLocal() const
{
LOCK(cs_addrLocal);
return addrLocal;
}

2
src/net.h
View File

@ -659,8 +659,6 @@ public:
}
std::string GetAddrName() const;
//! Sets the addrName only if it was not previously set
void MaybeSetAddrName(const std::string& addrNameIn);
std::string ConnectionTypeAsString() const { return ::ConnectionTypeAsString(m_conn_type); }

3
src/test/fuzz/net.cpp
View File

@ -37,9 +37,6 @@ FUZZ_TARGET_INIT(net, initialize_net)
[&] {
node.CloseSocketDisconnect();
},
[&] {
node.MaybeSetAddrName(fuzzed_data_provider.ConsumeRandomLengthString(32));
},
[&] {
const std::vector<bool> asmap = ConsumeRandomLengthBitVector(fuzzed_data_provider);
if (!SanityCheckASMap(asmap)) {