Skip to content

Fix protocol_block_out incorrect overlapped req errors. #982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evoskuil merged 1 commit into from
Mar 27, 2026
+30 −26
Merged

Fix protocol_block_out incorrect overlapped req errors. #982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions include/bitcoin/node/protocols/protocol_block_out_106.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ class BCN_API protocol_block_out_106
void stopping(const code& ec) NOEXCEPT override;

protected:
using get_data = network::messages::peer::get_data;
using get_blocks = network::messages::peer::get_blocks;
using inventory = network::messages::peer::inventory;
using inventory_items = network::messages::peer::inventory_items;
using inventory_items_ptr = std::shared_ptr<inventory_items>;

/// Block announcements are superseded by send_headers.
virtual bool superseded() const NOEXCEPT;

Expand All @@ -58,15 +64,14 @@ class BCN_API protocol_block_out_106
virtual bool do_announce(header_t link) NOEXCEPT;

virtual bool handle_receive_get_blocks(const code& ec,
const network::messages::peer::get_blocks::cptr& message) NOEXCEPT;
const get_blocks::cptr& message) NOEXCEPT;
virtual bool handle_receive_get_data(const code& ec,
const network::messages::peer::get_data::cptr& message) NOEXCEPT;
virtual void send_block(const code& ec, size_t index,
const network::messages::peer::get_data::cptr& message) NOEXCEPT;
const get_data::cptr& message) NOEXCEPT;
virtual void send_block(const code& ec,
const inventory_items_ptr& items) NOEXCEPT;

private:
network::messages::peer::inventory create_inventory(
const network::messages::peer::get_blocks& locator) const NOEXCEPT;
inventory create_inventory(const get_blocks& locator) const NOEXCEPT;

private:
// This is thread safe.
Expand Down
39 changes: 19 additions & 20 deletions src/protocols/protocol_block_out_106.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ namespace node {

using namespace system;
using namespace network;
using namespace network::messages::peer;
using namespace std::chrono;
using namespace std::placeholders;

Expand Down Expand Up @@ -147,7 +146,16 @@ bool protocol_block_out_106::handle_receive_get_data(const code& ec,
if (stopped(ec))
return false;

if (!message->any_block())
if (!node_witness_ && message->any_witness())
{
LOGR("Unsupported witness get_data from [" << opposite() << "].");
stop(network::error::protocol_violation);
return false;
}

constexpr auto only = get_data::selector::blocks;
const auto blocks = emplace_shared<inventory_items>(message->select(only));
if (blocks->empty())
return true;

if (busy_)
Expand All @@ -158,32 +166,22 @@ bool protocol_block_out_106::handle_receive_get_data(const code& ec,
}

busy_ = true;
send_block(error::success, zero, message);
send_block(error::success, blocks);
return true;
}

// Outbound (block).
// ----------------------------------------------------------------------------

void protocol_block_out_106::send_block(const code& ec, size_t index,
const get_data::cptr& message) NOEXCEPT
void protocol_block_out_106::send_block(const code& ec,
const inventory_items_ptr& items) NOEXCEPT
{
BC_ASSERT(stranded());
if (stopped(ec))
return;

// Skip over non-block requests.
const auto& items = message->items;
for (; index < items.size() && !items.at(index).is_block_type(); ++index);

// No more block requests.
if (index == items.size())
{
busy_ = false;
return;
}

const auto& item = items.at(index);
if (items->empty()) return;
const auto item = pop(*items);
const auto witness = item.is_witness_type();
if (!node_witness_ && witness)
{
Expand All @@ -206,13 +204,14 @@ void protocol_block_out_106::send_block(const code& ec, size_t index,
}

span<microseconds>(events::block_usecs, start);
SEND(block{ ptr }, send_block, _1, add1(index), message);
if (items->empty()) busy_ = false;
SEND(messages::peer::block{ ptr }, send_block, _1, items);
}

// utilities
// ----------------------------------------------------------------------------

inventory protocol_block_out_106::create_inventory(
protocol_block_out_106::inventory protocol_block_out_106::create_inventory(
const get_blocks& locator) const NOEXCEPT
{
// Empty response implies complete (success).
Expand All @@ -222,7 +221,7 @@ inventory protocol_block_out_106::create_inventory(
return inventory::factory
(
archive().get_blocks(locator.start_hashes, locator.stop_hash,
max_get_blocks), type_id::block
messages::peer::max_get_blocks), type_id::block
);
}

Expand Down