mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-22 15:04:44 +01:00
refactor: Set fSuccessfullyConnected in FillNode
Also, pass ConnmanTestMsg& and PeerManager& (needed for later commits).
This commit is contained in:
parent
fa3583f856
commit
fae6e31df7
4 changed files with 10 additions and 10 deletions
|
@ -79,11 +79,9 @@ void fuzz_target(FuzzBufferType buffer, const std::string& LIMIT_TO_MESSAGE_TYPE
|
||||||
}
|
}
|
||||||
CNode& p2p_node = *ConsumeNodeAsUniquePtr(fuzzed_data_provider).release();
|
CNode& p2p_node = *ConsumeNodeAsUniquePtr(fuzzed_data_provider).release();
|
||||||
|
|
||||||
const bool successfully_connected{fuzzed_data_provider.ConsumeBool()};
|
|
||||||
p2p_node.fSuccessfullyConnected = successfully_connected;
|
|
||||||
connman.AddTestNode(p2p_node);
|
connman.AddTestNode(p2p_node);
|
||||||
g_setup->m_node.peerman->InitializeNode(&p2p_node);
|
g_setup->m_node.peerman->InitializeNode(&p2p_node);
|
||||||
FillNode(fuzzed_data_provider, p2p_node, /*init_version=*/successfully_connected);
|
FillNode(fuzzed_data_provider, connman, *g_setup->m_node.peerman, p2p_node);
|
||||||
|
|
||||||
const auto mock_time = ConsumeTime(fuzzed_data_provider);
|
const auto mock_time = ConsumeTime(fuzzed_data_provider);
|
||||||
SetMockTime(mock_time);
|
SetMockTime(mock_time);
|
||||||
|
|
|
@ -46,11 +46,8 @@ FUZZ_TARGET_INIT(process_messages, initialize_process_messages)
|
||||||
peers.push_back(ConsumeNodeAsUniquePtr(fuzzed_data_provider, i).release());
|
peers.push_back(ConsumeNodeAsUniquePtr(fuzzed_data_provider, i).release());
|
||||||
CNode& p2p_node = *peers.back();
|
CNode& p2p_node = *peers.back();
|
||||||
|
|
||||||
const bool successfully_connected{fuzzed_data_provider.ConsumeBool()};
|
|
||||||
p2p_node.fSuccessfullyConnected = successfully_connected;
|
|
||||||
p2p_node.fPauseSend = false;
|
|
||||||
g_setup->m_node.peerman->InitializeNode(&p2p_node);
|
g_setup->m_node.peerman->InitializeNode(&p2p_node);
|
||||||
FillNode(fuzzed_data_provider, p2p_node, /*init_version=*/successfully_connected);
|
FillNode(fuzzed_data_provider, connman, *g_setup->m_node.peerman, p2p_node);
|
||||||
|
|
||||||
connman.AddTestNode(p2p_node);
|
connman.AddTestNode(p2p_node);
|
||||||
}
|
}
|
||||||
|
|
|
@ -200,16 +200,19 @@ bool FuzzedSock::IsConnected(std::string& errmsg) const
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void FillNode(FuzzedDataProvider& fuzzed_data_provider, CNode& node, bool init_version) noexcept
|
void FillNode(FuzzedDataProvider& fuzzed_data_provider, ConnmanTestMsg& connman, PeerManager& peerman, CNode& node) noexcept
|
||||||
{
|
{
|
||||||
|
const bool successfully_connected{fuzzed_data_provider.ConsumeBool()};
|
||||||
|
node.fSuccessfullyConnected = successfully_connected;
|
||||||
const ServiceFlags remote_services = ConsumeWeakEnum(fuzzed_data_provider, ALL_SERVICE_FLAGS);
|
const ServiceFlags remote_services = ConsumeWeakEnum(fuzzed_data_provider, ALL_SERVICE_FLAGS);
|
||||||
const NetPermissionFlags permission_flags = ConsumeWeakEnum(fuzzed_data_provider, ALL_NET_PERMISSION_FLAGS);
|
const NetPermissionFlags permission_flags = ConsumeWeakEnum(fuzzed_data_provider, ALL_NET_PERMISSION_FLAGS);
|
||||||
const int32_t version = fuzzed_data_provider.ConsumeIntegralInRange<int32_t>(MIN_PEER_PROTO_VERSION, std::numeric_limits<int32_t>::max());
|
const int32_t version = fuzzed_data_provider.ConsumeIntegralInRange<int32_t>(MIN_PEER_PROTO_VERSION, std::numeric_limits<int32_t>::max());
|
||||||
const bool filter_txs = fuzzed_data_provider.ConsumeBool();
|
const bool filter_txs = fuzzed_data_provider.ConsumeBool();
|
||||||
|
|
||||||
|
node.fPauseSend = false;
|
||||||
node.nServices = remote_services;
|
node.nServices = remote_services;
|
||||||
node.m_permissionFlags = permission_flags;
|
node.m_permissionFlags = permission_flags;
|
||||||
if (init_version) {
|
if (successfully_connected) {
|
||||||
node.nVersion = version;
|
node.nVersion = version;
|
||||||
node.SetCommonVersion(std::min(version, PROTOCOL_VERSION));
|
node.SetCommonVersion(std::min(version, PROTOCOL_VERSION));
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,6 +36,8 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
class PeerManager;
|
||||||
|
|
||||||
template <typename... Callables>
|
template <typename... Callables>
|
||||||
size_t CallOneOf(FuzzedDataProvider& fuzzed_data_provider, Callables... callables)
|
size_t CallOneOf(FuzzedDataProvider& fuzzed_data_provider, Callables... callables)
|
||||||
{
|
{
|
||||||
|
@ -275,7 +277,7 @@ auto ConsumeNode(FuzzedDataProvider& fuzzed_data_provider, const std::optional<N
|
||||||
}
|
}
|
||||||
inline std::unique_ptr<CNode> ConsumeNodeAsUniquePtr(FuzzedDataProvider& fdp, const std::optional<NodeId>& node_id_in = std::nullopt) { return ConsumeNode<true>(fdp, node_id_in); }
|
inline std::unique_ptr<CNode> ConsumeNodeAsUniquePtr(FuzzedDataProvider& fdp, const std::optional<NodeId>& node_id_in = std::nullopt) { return ConsumeNode<true>(fdp, node_id_in); }
|
||||||
|
|
||||||
void FillNode(FuzzedDataProvider& fuzzed_data_provider, CNode& node, bool init_version) noexcept;
|
void FillNode(FuzzedDataProvider& fuzzed_data_provider, ConnmanTestMsg& connman, PeerManager& peerman, CNode& node) noexcept;
|
||||||
|
|
||||||
class FuzzedFileProvider
|
class FuzzedFileProvider
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue