From 1247fdea1d35fbeef42be15cb80c64ae2f8c9434 Mon Sep 17 00:00:00 2001
From: Tamir Duberstein <tamird@gmail.com>
Date: Tue, 5 Sep 2023 10:56:05 -0400
Subject: [PATCH] socket_filter: fix build

The signature of attach changed in
https://github.com/aya-rs/aya/pull/723.
---
 test.sh                      | 2 +-
 xtask/src/build_ebpf.rs      | 1 -
 {{project-name}}/src/main.rs | 3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/test.sh b/test.sh
index bc270b0..b5dbaae 100755
--- a/test.sh
+++ b/test.sh
@@ -49,7 +49,7 @@ case "$PROG_TYPE" in
         ADDITIONAL_ARGS=''
 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
 cargo xtask build-ebpf
 cargo build
diff --git a/xtask/src/build_ebpf.rs b/xtask/src/build_ebpf.rs
index 452cb17..de8a9d6 100644
--- a/xtask/src/build_ebpf.rs
+++ b/xtask/src/build_ebpf.rs
@@ -44,7 +44,6 @@ pub fn build_ebpf(opts: Options) -> Result<(), anyhow::Error> {
     let target = format!("--target={}", opts.target);
     let mut args = vec![
         "build",
-        "--verbose",
         target.as_str(),
         "-Z",
         "build-std=core",
diff --git a/{{project-name}}/src/main.rs b/{{project-name}}/src/main.rs
index ab87e39..756fd87 100644
--- a/{{project-name}}/src/main.rs
+++ b/{{project-name}}/src/main.rs
@@ -35,7 +35,6 @@ use aya::util::online_cpus;
 use aya::{programs::BtfTracePoint, Btf};
 {%- when "socket_filter" -%}
 use std::net::TcpStream;
-use std::os::unix::io::AsRawFd;
 use aya::programs::SocketFilter;
 {%- when "raw_tracepoint" -%}
 use aya::programs::RawTracePoint;
@@ -165,7 +164,7 @@ async fn main() -> Result<(), anyhow::Error> {
     let client = TcpStream::connect("127.0.0.1:1234")?;
     let prog: &mut SocketFilter = bpf.program_mut("{{crate_name}}").unwrap().try_into()?;
     prog.load()?;
-    prog.attach(client.as_raw_fd())?;
+    prog.attach(client)?;
     {%- when "cgroup_sysctl" -%}
     let program: &mut CgroupSysctl = bpf.program_mut("{{crate_name}}").unwrap().try_into()?;
     let cgroup = std::fs::File::open(opt.cgroup_path)?;