socket_filter: fix build

The signature of attach changed in
https://github.com/aya-rs/aya/pull/723.
pull/100/head
Tamir Duberstein 1 year ago
parent 599ba4bdf9
commit 1247fdea1d

@ -49,7 +49,7 @@ case "$PROG_TYPE" in
ADDITIONAL_ARGS='' ADDITIONAL_ARGS=''
esac esac
cargo generate -v --path "${TEMPLATE_DIR}" -n test -d program_type="${PROG_TYPE}" ${ADDITIONAL_ARGS} cargo generate --path "${TEMPLATE_DIR}" -n test -d program_type="${PROG_TYPE}" ${ADDITIONAL_ARGS}
pushd test pushd test
cargo xtask build-ebpf cargo xtask build-ebpf
cargo build cargo build

@ -44,7 +44,6 @@ pub fn build_ebpf(opts: Options) -> Result<(), anyhow::Error> {
let target = format!("--target={}", opts.target); let target = format!("--target={}", opts.target);
let mut args = vec![ let mut args = vec![
"build", "build",
"--verbose",
target.as_str(), target.as_str(),
"-Z", "-Z",
"build-std=core", "build-std=core",

@ -35,7 +35,6 @@ use aya::util::online_cpus;
use aya::{programs::BtfTracePoint, Btf}; use aya::{programs::BtfTracePoint, Btf};
{%- when "socket_filter" -%} {%- when "socket_filter" -%}
use std::net::TcpStream; use std::net::TcpStream;
use std::os::unix::io::AsRawFd;
use aya::programs::SocketFilter; use aya::programs::SocketFilter;
{%- when "raw_tracepoint" -%} {%- when "raw_tracepoint" -%}
use aya::programs::RawTracePoint; use aya::programs::RawTracePoint;
@ -165,7 +164,7 @@ async fn main() -> Result<(), anyhow::Error> {
let client = TcpStream::connect("127.0.0.1:1234")?; let client = TcpStream::connect("127.0.0.1:1234")?;
let prog: &mut SocketFilter = bpf.program_mut("{{crate_name}}").unwrap().try_into()?; let prog: &mut SocketFilter = bpf.program_mut("{{crate_name}}").unwrap().try_into()?;
prog.load()?; prog.load()?;
prog.attach(client.as_raw_fd())?; prog.attach(client)?;
{%- when "cgroup_sysctl" -%} {%- when "cgroup_sysctl" -%}
let program: &mut CgroupSysctl = bpf.program_mut("{{crate_name}}").unwrap().try_into()?; let program: &mut CgroupSysctl = bpf.program_mut("{{crate_name}}").unwrap().try_into()?;
let cgroup = std::fs::File::open(opt.cgroup_path)?; let cgroup = std::fs::File::open(opt.cgroup_path)?;

Loading…
Cancel
Save