diff --git a/bpf/aya-bpf/src/maps/sock_hash.rs b/bpf/aya-bpf/src/maps/sock_hash.rs index d978690f..ddfe3d8d 100644 --- a/bpf/aya-bpf/src/maps/sock_hash.rs +++ b/bpf/aya-bpf/src/maps/sock_hash.rs @@ -3,7 +3,7 @@ use core::{marker::PhantomData, mem}; use aya_bpf_cty::c_void; use crate::{ - bindings::{bpf_map_def, bpf_map_type::BPF_MAP_TYPE_SOCKHASH, bpf_sock_ops, BPF_F_INGRESS}, + bindings::{bpf_map_def, bpf_map_type::BPF_MAP_TYPE_SOCKHASH, bpf_sock_ops}, helpers::{bpf_msg_redirect_hash, bpf_sock_hash_update}, programs::SkMsgContext, BpfContext, diff --git a/bpf/aya-bpf/src/programs/sk_skb.rs b/bpf/aya-bpf/src/programs/sk_skb.rs index 9eac93c9..f8ce0739 100644 --- a/bpf/aya-bpf/src/programs/sk_skb.rs +++ b/bpf/aya-bpf/src/programs/sk_skb.rs @@ -1,4 +1,10 @@ -use core::ffi::c_void; +use core::{ + ffi::c_void, + mem::{self, MaybeUninit}, +}; + +use aya_bpf_bindings::helpers::{bpf_l4_csum_replace, bpf_skb_load_bytes, bpf_skb_store_bytes}; +use aya_bpf_cty::c_long; use crate::{bindings::__sk_buff, BpfContext}; @@ -10,6 +16,60 @@ impl SkSkbContext { pub fn new(skb: *mut __sk_buff) -> SkSkbContext { SkSkbContext { skb } } + + #[inline] + pub fn load(&self, offset: usize) -> Result { + unsafe { + let mut data = MaybeUninit::::uninit(); + let ret = bpf_skb_load_bytes( + self.skb as *const _, + offset as u32, + &mut data as *mut _ as *mut _, + mem::size_of::() as u32, + ); + if ret < 0 { + return Err(ret); + } + + Ok(data.assume_init()) + } + } + + #[inline] + pub fn store(&self, offset: usize, v: &T) -> Result<(), c_long> { + unsafe { + let ret = bpf_skb_store_bytes( + self.skb as *mut _, + offset as u32, + v as *const _ as *const _, + mem::size_of::() as u32, + 0, + ); + if ret < 0 { + return Err(ret); + } + } + + Ok(()) + } + + #[inline] + pub fn l4_csum_replace( + &self, + offset: usize, + from: u64, + to: u64, + flags: u64, + ) -> Result<(), c_long> { + unsafe { + let ret = bpf_l4_csum_replace(self.skb as *mut _, offset as u32, from, to, flags); + if ret < 0 { + return Err(ret); + } + } + + Ok(()) + } } impl BpfContext for SkSkbContext {