Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Block packet size limit #6398

Merged
merged 5 commits into from
Aug 11, 2020
Merged

Block packet size limit #6398

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4fa510a
Block packet size limit
arkpar Jun 18, 2020
935262f
Update client/network/src/protocol.rs
arkpar Jun 18, 2020
3b70788
Merge branch 'master' of github.com:paritytech/substrate into a-block…
arkpar Aug 11, 2020
5a178a7
Add block response limit
arkpar Aug 11, 2020
9afd9ec
Merge branch 'a-block-packet-limit' of github.com:paritytech/substrat…
arkpar Aug 11, 2020
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
7 changes: 6 additions & 1 deletion client/network/src/protocol.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ pub(crate) const MIN_VERSION: u32 = 3;

// Maximum allowed entries in `BlockResponse`
const MAX_BLOCK_DATA_RESPONSE: u32 = 128;
// Maximum total bytes allowed for block bodies in `BlockResponse`
const MAX_BODIES_BYTES: usize = 8 * 1024 * 1024;

/// When light node connects to the full node and the full node is behind light node
/// for at least `LIGHT_MAXIMAL_BLOCKS_DIFFERENCE` blocks, we consider it not useful
/// and disconnect to free connection slot.
Expand Down Expand Up @@ -762,8 +765,9 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
let get_justification = request
.fields
.contains(message::BlockAttributes::JUSTIFICATION);
let mut total_size = 0;
while let Some(header) = self.context_data.chain.header(id).unwrap_or(None) {
if blocks.len() >= max {
if blocks.len() >= max || (blocks.len() >= 1 && total_size > MAX_BODIES_BYTES) {
break;
}
let number = *header.number();
Expand Down Expand Up @@ -794,6 +798,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
trace!(target: "sync", "Missing data for block request.");
break;
}
total_size += block_data.body.as_ref().map_or(0, |b| b.len());
blocks.push(block_data);
match request.direction {
message::Direction::Ascending => id = BlockId::Number(number + One::one()),
Expand Down