From eb837704646f851ac47cdc55b0e554b872e7f255 Mon Sep 17 00:00:00 2001 From: RRFZ <247457381+Plastic-time@users.noreply.github.com> Date: Tue, 17 Nov 2026 08:37:53 -0500 Subject: [PATCH] pcap: preserve capture and protocol source history Port relevant PCAP implementation and regression snapshots from Craft Anything 3836b5bd529de3db647cd433f78715fb6c2ad07f. --- crates/pcap/src/lib.rs | 5 ++- crates/pcap/tests/pcap_ipv6_no_next_header.rs | 40 +++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 crates/pcap/tests/pcap_ipv6_no_next_header.rs diff --git a/crates/pcap/src/lib.rs b/crates/pcap/src/lib.rs index 065663423..5caa19938 100644 --- a/crates/pcap/src/lib.rs +++ b/crates/pcap/src/lib.rs @@ -712,7 +712,10 @@ fn ipv6(p: &[u8], d: &mut Decoded) { d.note = Some("IPv6 fragment (transport header is in the first fragment)".into()); return; } - transport(next, p.get(off..end).unwrap_or(&[]), d); + // RFC 8200: No Next Header ends the chain even if the packet has trailing bytes. + if next != 59 { + transport(next, p.get(off..end).unwrap_or(&[]), d); + } } fn tcp_flags(f: u8) -> String { diff --git a/crates/pcap/tests/pcap_ipv6_no_next_header.rs b/crates/pcap/tests/pcap_ipv6_no_next_header.rs new file mode 100644 index 000000000..fd698e393 --- /dev/null +++ b/crates/pcap/tests/pcap_ipv6_no_next_header.rs @@ -0,0 +1,40 @@ +use craft_anything_formats::pcap::decode; + +/// Build a raw IPv6 packet with the given payload and Next Header field. +fn packet(next: u8, payload: &[u8]) -> Vec { + let mut packet = vec![0; 40]; + packet[0] = 0x60; + packet[4..6].copy_from_slice(&u16::try_from(payload.len()).unwrap().to_be_bytes()); + packet[6] = next; + packet[7] = 64; + packet.extend_from_slice(payload); + packet +} + +/// Both an empty packet and bytes after No Next Header have no transport record. +#[test] +fn no_next_header_has_no_transport() { + for payload in [b"".as_slice(), b"padding"] { + let decoded = decode(229, &packet(59, payload)); + assert_eq!(decoded.ip.unwrap().protocol, 59); + assert_eq!(decoded.protocols, ["raw", "ipv6"]); + assert!(decoded.transport.is_none()); + } +} + +/// Destination Options can also end the header chain. +#[test] +fn no_next_header_after_an_extension() { + let decoded = decode(229, &packet(60, &[59, 0, 0, 0, 0, 0, 0, 0, 1, 2])); + assert_eq!(decoded.ip.unwrap().protocol, 59); + assert!(decoded.transport.is_none()); +} + +/// UDP after the same extension still yields its transport and payload. +#[test] +fn udp_after_an_extension_still_decodes() { + let decoded = decode(229, &packet(60, &[17, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 11, 0, 9, 0, 0, 42])); + let transport = decoded.transport.unwrap(); + assert_eq!(transport.protocol, "udp"); + assert_eq!((transport.src_port, transport.dst_port, transport.payload_len), (Some(10), Some(11), 1)); +}