Skip to content
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

Jump to bottom

Add 'ether_payload' & 'ip_payload' methods to SlicedPacket types #88

Merged
merged 5 commits into from
Feb 11, 2024
Merged

Add 'ether_payload' & 'ip_payload' methods to SlicedPacket types #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6086af3
Add 'ether_payload' & 'ip_payload' methods to SlicedPacket types
JulianSchmid Feb 10, 2024
4e8f0be
Applied clippy sugestion
JulianSchmid Feb 10, 2024
9f6ba05
Adapted slice length fuzzy test to new rust nightly checks
JulianSchmid Feb 10, 2024
6445bd8
Exclude slice length tests with non 32 bit system compatibility
JulianSchmid Feb 11, 2024
4445dcf
Exclude slice length tests with non 32 bit system compatibility
JulianSchmid Feb 11, 2024
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
233 changes: 233 additions & 0 deletions etherparse/src/lax_sliced_packet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,41 @@ impl<'a> LaxSlicedPacket<'a> {
pub fn from_ip(slice: &'a [u8]) -> Result<LaxSlicedPacket, err::ip::LaxHeaderSliceError> {
LaxSlicedPacketCursor::parse_from_ip(slice)
}

/// Returns the last ether payload of the packet (if one is present).
///
/// If VLAN header is present the payload after the most inner VLAN
/// header is returned and if there is no VLAN header is present in the
/// link field is returned.
pub fn ether_payload(&self) -> Option<EtherPayloadSlice<'a>> {
if let Some(vlan) = self.vlan.as_ref() {
match vlan {
VlanSlice::SingleVlan(s) => Some(s.payload()),
VlanSlice::DoubleVlan(s) => Some(s.payload()),
}
} else if let Some(eth) = self.link.as_ref() {
match eth {
LinkSlice::Ethernet2(e) => Some(e.payload()),
LinkSlice::EtherPayload(e) => Some(e.clone()),
}
} else {
None
}
}

/// Return the IP payload after the the IP header and the IP extension
/// headers (if one is present).
pub fn ip_payload(&self) -> Option<&LaxIpPayloadSlice<'a>> {
if let Some(net) = self.net.as_ref() {
use LaxNetSlice::*;
match net {
Ipv4(v) => Some(v.payload()),
Ipv6(v) => Some(v.payload()),
}
} else {
None
}
}
}

#[cfg(test)]
Expand Down Expand Up @@ -265,6 +300,204 @@ mod test {
);
}

#[test]
fn ether_payload() {
use alloc::vec::*;

// no content
assert_eq!(
LaxSlicedPacket {
link: None,
vlan: None,
net: None,
transport: None,
stop_err: None
}
.ether_payload(),
None
);

// only ethernet header II
{
let payload = [1, 2, 3, 4];
let mut buf = Vec::with_capacity(Ethernet2Header::LEN + 4);
buf.extend_from_slice(
&Ethernet2Header {
ether_type: EtherType::WAKE_ON_LAN,
..Default::default()
}
.to_bytes(),
);
buf.extend_from_slice(&payload);
assert_eq!(
LaxSlicedPacket::from_ethernet(&buf)
.unwrap()
.ether_payload(),
Some(EtherPayloadSlice {
ether_type: EtherType::WAKE_ON_LAN,
payload: &payload
})
);
}

// ether type payload
{
let payload = [1, 2, 3, 4];
assert_eq!(
LaxSlicedPacket {
link: Some(LinkSlice::EtherPayload(EtherPayloadSlice {
ether_type: EtherType::WAKE_ON_LAN,
payload: &payload
})),
vlan: None,
net: None,
transport: None,
stop_err: None,
}
.ether_payload(),
Some(EtherPayloadSlice {
ether_type: EtherType::WAKE_ON_LAN,
payload: &payload
})
);
}

// single vlan header
{
let payload = [1, 2, 3, 4];
let mut buf = Vec::with_capacity(Ethernet2Header::LEN + SingleVlanHeader::LEN + 4);
buf.extend_from_slice(
&Ethernet2Header {
ether_type: EtherType::VLAN_TAGGED_FRAME,
..Default::default()
}
.to_bytes(),
);
buf.extend_from_slice(
&SingleVlanHeader {
ether_type: EtherType::WAKE_ON_LAN,
..Default::default()
}
.to_bytes(),
);
buf.extend_from_slice(&payload);
assert_eq!(
LaxSlicedPacket::from_ethernet(&buf)
.unwrap()
.ether_payload(),
Some(EtherPayloadSlice {
ether_type: EtherType::WAKE_ON_LAN,
payload: &payload
})
);
}

// double vlan header
{
let payload = [1, 2, 3, 4];
let mut buf = Vec::with_capacity(Ethernet2Header::LEN + SingleVlanHeader::LEN * 2 + 4);
buf.extend_from_slice(
&Ethernet2Header {
ether_type: EtherType::VLAN_DOUBLE_TAGGED_FRAME,
..Default::default()
}
.to_bytes(),
);
buf.extend_from_slice(
&SingleVlanHeader {
ether_type: EtherType::VLAN_TAGGED_FRAME,
..Default::default()
}
.to_bytes(),
);
buf.extend_from_slice(
&SingleVlanHeader {
ether_type: EtherType::WAKE_ON_LAN,
..Default::default()
}
.to_bytes(),
);
buf.extend_from_slice(&payload);
assert_eq!(
LaxSlicedPacket::from_ethernet(&buf)
.unwrap()
.ether_payload(),
Some(EtherPayloadSlice {
ether_type: EtherType::WAKE_ON_LAN,
payload: &payload
})
);
}
}

#[test]
fn ip_payload() {
use alloc::vec::*;

// no content
assert_eq!(
LaxSlicedPacket {
link: None,
vlan: None,
net: None,
transport: None,
stop_err: None,
}
.ip_payload(),
None
);

// ipv4
{
let payload = [1, 2, 3, 4];
let mut buf = Vec::with_capacity(Ipv4Header::MIN_LEN + 4);
buf.extend_from_slice(
&Ipv4Header {
protocol: IpNumber::ARIS,
total_len: Ipv4Header::MIN_LEN_U16 + 4,
..Default::default()
}
.to_bytes(),
);
buf.extend_from_slice(&payload);
assert_eq!(
LaxSlicedPacket::from_ip(&buf).unwrap().ip_payload(),
Some(&LaxIpPayloadSlice {
payload: &payload,
ip_number: IpNumber::ARIS,
fragmented: false,
len_source: LenSource::Ipv4HeaderTotalLen,
incomplete: false,
})
);
}

// ipv6
{
let payload = [1, 2, 3, 4];
let mut buf = Vec::with_capacity(Ipv6Header::LEN + 4);
buf.extend_from_slice(
&Ipv6Header {
payload_length: 4,
next_header: IpNumber::ARGUS,
..Default::default()
}
.to_bytes(),
);
buf.extend_from_slice(&payload);
assert_eq!(
LaxSlicedPacket::from_ip(&buf).unwrap().ip_payload(),
Some(&LaxIpPayloadSlice {
payload: &payload,
ip_number: IpNumber::ARGUS,
fragmented: false,
len_source: LenSource::Ipv6HeaderPayloadLen,
incomplete: false,
})
);
}
}

#[test]
fn from_x_slice() {
// no eth
Expand Down
Loading
Loading