Page MenuHomePhabricator
Files F13115740

D8717.diff
No OneTemporary
Actions

D8717.diff
View Options

diff --git a/src/net.h b/src/net.h
--- a/src/net.h
+++ b/src/net.h
@@ -142,6 +142,7 @@
MANUAL,
FEELER,
BLOCK_RELAY,
+ ADDR_FETCH,
};
namespace {
@@ -240,7 +241,6 @@
OpenNetworkConnection(const CAddress &addrConnect, bool fCountFailure,
CSemaphoreGrant *grantOutbound = nullptr,
const char *strDest = nullptr,
- bool m_addr_fetch = false,
ConnectionType conn_type = ConnectionType::OUTBOUND);
bool CheckIncomingNonce(uint64_t nonce);
diff --git a/src/net.cpp b/src/net.cpp
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1889,7 +1889,8 @@
CAddress addr;
CSemaphoreGrant grant(*semOutbound, true);
if (grant) {
- OpenNetworkConnection(addr, false, &grant, strDest.c_str(), true);
+ OpenNetworkConnection(addr, false, &grant, strDest.c_str(),
+ ConnectionType::ADDR_FETCH);
}
}
@@ -1933,7 +1934,7 @@
for (const std::string &strAddr : connect) {
CAddress addr(CService(), NODE_NONE);
OpenNetworkConnection(addr, false, nullptr, strAddr.c_str(),
- false, ConnectionType::MANUAL);
+ ConnectionType::MANUAL);
for (int i = 0; i < 10 && i < nLoop; i++) {
if (!interruptNet.sleep_for(
std::chrono::milliseconds(500))) {
@@ -2134,7 +2135,7 @@
OpenNetworkConnection(addrConnect,
int(setConnected.size()) >=
std::min(nMaxConnections - 1, 2),
- &grant, nullptr, false, conn_type);
+ &grant, nullptr, conn_type);
}
}
}
@@ -2211,7 +2212,7 @@
tried = true;
CAddress addr(CService(), NODE_NONE);
OpenNetworkConnection(addr, false, &grant,
- info.strAddedNode.c_str(), false,
+ info.strAddedNode.c_str(),
ConnectionType::MANUAL);
if (!interruptNet.sleep_for(std::chrono::milliseconds(500))) {
return;
@@ -2230,7 +2231,7 @@
void CConnman::OpenNetworkConnection(const CAddress &addrConnect,
bool fCountFailure,
CSemaphoreGrant *grantOutbound,
- const char *pszDest, bool m_addr_fetch,
+ const char *pszDest,
ConnectionType conn_type) {
assert(conn_type != ConnectionType::INBOUND);
@@ -2264,9 +2265,6 @@
if (grantOutbound) {
grantOutbound->MoveTo(pnode->grantOutbound);
}
- if (m_addr_fetch) {
- pnode->m_addr_fetch = true;
- }
m_msgproc->InitializeNode(*config, pnode);
{
@@ -2990,6 +2988,7 @@
ConnectionType conn_type_in)
: nTimeConnected(GetSystemTimeInSeconds()), addr(addrIn),
addrBind(addrBindIn), fFeeler(conn_type_in == ConnectionType::FEELER),
+ m_addr_fetch(conn_type_in == ConnectionType::ADDR_FETCH),
m_manual_connection(conn_type_in == ConnectionType::MANUAL),
fInbound(conn_type_in == ConnectionType::INBOUND),
nKeyedNetGroup(nKeyedNetGroupIn),
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -325,9 +325,8 @@
if (strCommand == "onetry") {
CAddress addr;
- node.connman->OpenNetworkConnection(addr, false, nullptr,
- strNode.c_str(), false,
- ConnectionType::MANUAL);
+ node.connman->OpenNetworkConnection(
+ addr, false, nullptr, strNode.c_str(), ConnectionType::MANUAL);
return NullUniValue;
}
diff --git a/src/test/fuzz/process_messages.cpp b/src/test/fuzz/process_messages.cpp
--- a/src/test/fuzz/process_messages.cpp
+++ b/src/test/fuzz/process_messages.cpp
@@ -49,7 +49,7 @@
const ConnectionType conn_type = fuzzed_data_provider.PickValueInArray(
{ConnectionType::INBOUND, ConnectionType::OUTBOUND,
ConnectionType::MANUAL, ConnectionType::FEELER,
- ConnectionType::BLOCK_RELAY});
+ ConnectionType::BLOCK_RELAY, ConnectionType::ADDR_FETCH});
peers.push_back(
std::make_unique<CNode>(
i, service_flags, 0, INVALID_SOCKET,

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 1, 11:55 (2 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5187729
Default Alt Text
D8717.diff (4 KB)

Event Timeline