Skip to content

net: Parse inner IP packet for ICMP Error messages #887

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

Merged
merged 12 commits into from
Oct 6, 2025
Merged

net: Parse inner IP packet for ICMP Error messages #887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
de81df0
refactor(net): Remove ParsePayload implementation for specific headers
qmonnet Oct 1, 2025
75e7f66
chore(net): Rename TcpError as TcpParseError
qmonnet Oct 2, 2025
a14f2fd
refactor(net): Use a macro to implement From trait for enum variants
qmonnet Oct 2, 2025
01e9293
refactor(net): Move header.rs to dedicated module directory
qmonnet Oct 2, 2025
a2085a1
feat(net): Add TruncatedUdp, TruncatedTcp header types
qmonnet Oct 2, 2025
f24f656
feat(net): Introduce EmbeddedHeaders to parse ICMP's inner packets
qmonnet Oct 2, 2025
6837321
feat(net): Implement DeParse for EmbeddedHeaders
qmonnet Oct 2, 2025
b873eef
feat(net): Implement ParsePayload for enum EmbeddedHeader
qmonnet Oct 2, 2025
727aa4d
feat(net): Parse payload for ICMP
qmonnet Oct 2, 2025
20c4d1a
feat(net): Check whether ICMP embedded packet is full
qmonnet Oct 2, 2025
9e25025
test(net): Add unit tests for EmbeddedHeaders
qmonnet Oct 3, 2025
4aa3963
test(net): Add Bolero tests for struct EmbeddedHeaders
qmonnet Oct 3, 2025
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
1 change: 1 addition & 0 deletions dataplane/src/packet_processor/ipforward.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ impl IpForwarder {
net_ext: ArrayVec::default(),
transport: None, /* should be UDP, but it is automatically done */
udp_encap: Some(udp_encap),
embedded_ip: None,
};
VxlanEncap::new(headers).map_err(|e| format!("{e}"))
}
Expand Down
19 changes: 11 additions & 8 deletions net/src/eth/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use crate::eth::mac::{
use crate::headers::Header;
use crate::ipv4::Ipv4;
use crate::ipv6::Ipv6;
use crate::parse::{DeParse, DeParseError, LengthError, Parse, ParseError, ParsePayload, Reader};
use crate::parse::{DeParse, DeParseError, LengthError, Parse, ParseError, Reader};
use crate::vlan::Vlan;
use etherparse::{EtherType, Ethernet2Header};
use std::num::NonZero;
Expand Down Expand Up @@ -96,6 +96,16 @@ impl Eth {
self.0.ether_type = ether_type.0;
self
}

/// Parse the payload of the ethernet header.
///
/// # Returns
///
/// * `Some(EthNext)` variant if the payload is successfully parsed.
/// * `None` if the payload is not a known Ethernet type.
pub(crate) fn parse_payload(&self, cursor: &mut Reader) -> Option<EthNext> {
parse_from_ethertype(self.0.ether_type, cursor)
}
}

impl Parse for Eth {
Expand Down Expand Up @@ -204,13 +214,6 @@ pub(crate) enum EthNext {
Ipv6(Ipv6),
}

impl ParsePayload for Eth {
type Next = EthNext;
fn parse_payload(&self, cursor: &mut Reader) -> Option<EthNext> {
parse_from_ethertype(self.0.ether_type, cursor)
}
}

impl From<EthNext> for Header {
fn from(value: EthNext) -> Self {
match value {
Expand Down
Loading
Loading