github-personal/firezone
1
0
Fork 0
mirror of https://github.com/outbackdingo/firezone.git synced 2026-01-27 10:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(eBPF): reuse CdHdr struct (#8635)

Browse Source 
Instead of passing just a 4-byte array, we can pass a `CdHdr` struct
that we have already defined. This is more type-safe and correctly
captures the invariant of the order of fields in the header.
This commit is contained in:
Thomas Eizinger
2025-04-03 14:22:38 +00:00
committed by GitHub
parent 0f6abf074c
commit 634c5ee38f
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
rust/relay/ebpf-turn-router/src/main.rs
View File

@@ -223,7 +223,7 @@ fn try_handle_ipv4_udp_to_channel_data(
let new_udp_len = udp_len + CdHdr::LEN as u16;
let channel_number = client_and_channel.channel();
let channel_data_length = udp_len - UdpHdr::LEN as u16;
let channel_data_length = udp_len - UdpHdr::LEN as u16; // The `length` field in the UDP header includes the header itself. For the channel-data field, we only want the length of the payload.
udp.update(
pseudo_header,
@@ -234,12 +234,13 @@ fn try_handle_ipv4_udp_to_channel_data(
channel_data_length,
);
let cd_num = channel_number.to_be_bytes();
let cd_len = channel_data_length.to_be_bytes(); // The `length` field in the UDP header includes the header itself. For the channel-data field, we only want the length of the payload.
let channel_data_header = [cd_num[0], cd_num[1], cd_len[0], cd_len[1]];
add_channel_data_header_ipv4(ctx, channel_data_header)?;
add_channel_data_header_ipv4(
ctx,
CdHdr {
number: channel_number.to_be_bytes(),
length: channel_data_length.to_be_bytes(),
},
)?;
Ok(())
}
@@ -313,7 +314,7 @@ fn try_handle_ipv6_udp_to_channel_data(
let new_udp_len = udp_len + CdHdr::LEN as u16;
let channel_number = client_and_channel.channel();
let channel_data_length = udp_len - UdpHdr::LEN as u16;
let channel_data_length = udp_len - UdpHdr::LEN as u16; // The `length` field in the UDP header includes the header itself. For the channel-data field, we only want the length of the payload.
udp.update(
pseudo_header,
@@ -324,12 +325,13 @@ fn try_handle_ipv6_udp_to_channel_data(
channel_data_length,
);
let cd_num = channel_number.to_be_bytes();
let cd_len = channel_data_length.to_be_bytes(); // The `length` field in the UDP header includes the header itself. For the channel-data field, we only want the length of the payload.
let channel_data_header = [cd_num[0], cd_num[1], cd_len[0], cd_len[1]];
add_channel_data_header_ipv6(ctx, channel_data_header)?;
add_channel_data_header_ipv6(
ctx,
CdHdr {
number: channel_number.to_be_bytes(),
length: channel_data_length.to_be_bytes(),
},
)?;
Ok(())
}

8
rust/relay/ebpf-turn-router/src/move_headers.rs
View File

@@ -17,12 +17,12 @@ pub fn remove_channel_data_header_ipv4(ctx: &XdpContext) -> Result<(), Error> {
}
#[inline(always)]
pub fn add_channel_data_header_ipv4(ctx: &XdpContext, mut header: [u8; 4]) -> Result<(), Error> {
pub fn add_channel_data_header_ipv4(ctx: &XdpContext, mut header: CdHdr) -> Result<(), Error> {
move_headers::<{ -(CdHdr::LEN as i32) }, { Ipv4Hdr::LEN }>(ctx)?;
let offset = (EthHdr::LEN + Ipv4Hdr::LEN + UdpHdr::LEN) as u32;
let header_ptr = &mut header as *mut _ as *mut c_void;
let header_len = CdHdr::LEN as u32;
let header_len = core::mem::size_of_val(&header) as u32;
let ret = unsafe { bpf_xdp_store_bytes(ctx.ctx, offset, header_ptr, header_len) };
if ret < 0 {
@@ -38,12 +38,12 @@ pub fn remove_channel_data_header_ipv6(ctx: &XdpContext) -> Result<(), Error> {
}
#[inline(always)]
pub fn add_channel_data_header_ipv6(ctx: &XdpContext, mut header: [u8; 4]) -> Result<(), Error> {
pub fn add_channel_data_header_ipv6(ctx: &XdpContext, mut header: CdHdr) -> Result<(), Error> {
move_headers::<{ -(CdHdr::LEN as i32) }, { Ipv6Hdr::LEN }>(ctx)?;
let offset = (EthHdr::LEN + Ipv6Hdr::LEN + UdpHdr::LEN) as u32;
let header_ptr = &mut header as *mut _ as *mut c_void;
let header_len = CdHdr::LEN as u32;
let header_len = core::mem::size_of_val(&header) as u32;
let ret = unsafe { bpf_xdp_store_bytes(ctx.ctx, offset, header_ptr, header_len) };
if ret < 0 {