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
4 changes: 3 additions & 1 deletion src/reassembly/segment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,11 @@ impl FlowDirection {
}
}

// Only report ConflictingOverlap when fully covered (no gap was inserted)
// Union of existing segments covers the new segment entirely (no gaps to fill)
return if !had_gap && has_conflict {
InsertResult::ConflictingOverlap
} else if !had_gap {
InsertResult::Duplicate
} else if truncated {
InsertResult::Truncated
} else {
Expand Down
30 changes: 30 additions & 0 deletions tests/reassembly_segment_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -288,3 +288,33 @@ fn test_out_of_window_segment_rejected() {
let result = dir.insert_segment(edge_seq as u32, b"edge", 10_485_760, 10_000, 1_048_576);
assert_eq!(result, InsertResult::Inserted);
}

#[test]
fn test_multi_segment_full_coverage_returns_duplicate() {
let mut dir = FlowDirection::new();
dir.set_isn(1000);

// Insert two adjacent segments: "AAA" at offset 1, "BBB" at offset 4
dir.insert_segment(1001, b"AAA", 10_485_760, 10_000, 10_485_760);
dir.insert_segment(1004, b"BBB", 10_485_760, 10_000, 10_485_760);

// Insert segment spanning both: "AAABBB" at offset 1
// Union of existing segments fully covers this — should be Duplicate
let result = dir.insert_segment(1001, b"AAABBB", 10_485_760, 10_000, 10_485_760);
assert_eq!(result, InsertResult::Duplicate);
}

#[test]
fn test_multi_segment_full_coverage_conflicting_returns_conflict() {
let mut dir = FlowDirection::new();
dir.set_isn(1000);

// Insert two adjacent segments: "AAA" at offset 1, "BBB" at offset 4
dir.insert_segment(1001, b"AAA", 10_485_760, 10_000, 10_485_760);
dir.insert_segment(1004, b"BBB", 10_485_760, 10_000, 10_485_760);

// Insert segment spanning both with different data
// Union covers it but data conflicts — should be ConflictingOverlap
let result = dir.insert_segment(1001, b"XXXXXX", 10_485_760, 10_000, 10_485_760);
assert_eq!(result, InsertResult::ConflictingOverlap);
}