Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion src/packet/forward_tsn_chunk.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,10 @@ impl TryFrom<RawChunk<'_>> for ForwardTsnChunk {

fn try_from(raw: RawChunk<'_>) -> Result<Self, Error> {
ensure!(raw.typ == CHUNK_TYPE, ChunkParseError::InvalidType);
ensure!(raw.value.len() >= 4 && (raw.value.len() % 4) == 0, ChunkParseError::InvalidLength);
ensure!(
raw.value.len() >= 4 && raw.value.len().is_multiple_of(4),
ChunkParseError::InvalidLength
);

let new_cumulative_tsn = Tsn(read_u32_be!(&raw.value[0..4]));

Expand Down
2 changes: 1 addition & 1 deletion src/packet/iforward_tsn_chunk.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ impl TryFrom<RawChunk<'_>> for IForwardTsnChunk {
fn try_from(raw: RawChunk<'_>) -> Result<Self, Error> {
ensure!(raw.typ == CHUNK_TYPE, ChunkParseError::InvalidType);
ensure!(
raw.value.len() >= 4 && ((raw.value.len() - 4) % 8) == 0,
raw.value.len() >= 4 && (raw.value.len() - 4).is_multiple_of(8),
ChunkParseError::InvalidLength
);

Expand Down
5 changes: 4 additions & 1 deletion src/packet/incoming_ssn_reset_request_parameter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,10 @@ impl TryFrom<RawParameter<'_>> for IncomingSsnResetRequestParameter {

fn try_from(raw: RawParameter<'_>) -> Result<Self, Error> {
ensure!(raw.typ == PARAMETER_TYPE, ChunkParseError::InvalidType);
ensure!(raw.value.len() >= 4 && (raw.value.len() % 2) == 0, ChunkParseError::InvalidLength);
ensure!(
raw.value.len() >= 4 && raw.value.len().is_multiple_of(2),
ChunkParseError::InvalidLength
);

let request_seq_nbr = read_u32_be!(&raw.value[0..4]);
let streams = raw.value[4..].chunks_exact(2).map(|c| StreamId(read_u16_be!(c))).collect();
Expand Down
2 changes: 1 addition & 1 deletion src/packet/outgoing_ssn_reset_request_parameter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ impl TryFrom<RawParameter<'_>> for OutgoingSsnResetRequestParameter {
fn try_from(raw: RawParameter<'_>) -> Result<Self, Error> {
ensure!(raw.typ == PARAMETER_TYPE, ChunkParseError::InvalidType);
ensure!(
raw.value.len() >= 12 && (raw.value.len() % 2) == 0,
raw.value.len() >= 12 && raw.value.len().is_multiple_of(2),
ChunkParseError::InvalidLength
);

Expand Down
2 changes: 1 addition & 1 deletion src/rx/data_tracker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ mod tests {
}

fn expect_gaps(d: &SackChunk, offsets: &[u16]) {
assert!(offsets.len() % 2 == 0);
assert!(offsets.len().is_multiple_of(2));
let count = offsets.len() / 2;
assert!(d.gap_ack_blocks.len() == count);
let mut idx = 0;
Expand Down