diff --git a/ebpf/aya-ebpf/src/programs/sk_buff.rs b/ebpf/aya-ebpf/src/programs/sk_buff.rs index 6602f17d..1efd9313 100644 --- a/ebpf/aya-ebpf/src/programs/sk_buff.rs +++ b/ebpf/aya-ebpf/src/programs/sk_buff.rs @@ -10,7 +10,7 @@ use aya_ebpf_bindings::helpers::{ }; use aya_ebpf_cty::c_long; -use crate::{bindings::__sk_buff, check_bounds_signed, EbpfContext}; +use crate::{EbpfContext, bindings::__sk_buff, check_bounds_signed}; pub struct SkBuff { pub skb: *mut __sk_buff, diff --git a/test/integration-ebpf/src/socket_filter.rs b/test/integration-ebpf/src/socket_filter.rs index ca3ec61c..783644cc 100644 --- a/test/integration-ebpf/src/socket_filter.rs +++ b/test/integration-ebpf/src/socket_filter.rs @@ -3,7 +3,6 @@ use aya_ebpf::{macros::socket_filter, programs::SkBuffContext}; - #[socket_filter] pub fn read_one(ctx: SkBuffContext) -> i64 { // Read 1 byte diff --git a/test/integration-test/src/tests.rs b/test/integration-test/src/tests.rs index 49cdc8ae..edaa18da 100644 --- a/test/integration-test/src/tests.rs +++ b/test/integration-test/src/tests.rs @@ -10,8 +10,8 @@ mod rbpf; mod relocations; mod ring_buf; mod smoke; +mod socket_filter; mod strncmp; mod tcx; mod uprobe_cookie; mod xdp; -mod socket_filter; \ No newline at end of file diff --git a/test/integration-test/src/tests/socket_filter.rs b/test/integration-test/src/tests/socket_filter.rs index add7f98d..fdc0e80b 100644 --- a/test/integration-test/src/tests/socket_filter.rs +++ b/test/integration-test/src/tests/socket_filter.rs @@ -1,13 +1,8 @@ -use aya::{programs::SocketFilter, Ebpf}; +use aya::{Ebpf, programs::SocketFilter}; #[test] fn socket_filter_load() { let mut bpf = Ebpf::load(crate::SOCKET_FILTER).unwrap(); - let prog: &mut SocketFilter = bpf - .program_mut("read_one") - .unwrap() - .try_into() - .unwrap(); + let prog: &mut SocketFilter = bpf.program_mut("read_one").unwrap().try_into().unwrap(); prog.load().unwrap(); - -} \ No newline at end of file +}