Use multi XDP attach fix

mashiro-no-rabo · Aug 7, 2020 · 6f39ae1 · 6f39ae1
1 parent 19331e1
commit 6f39ae1
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/block-the-rabbit/Cargo.toml b/block-the-rabbit/Cargo.toml
@@ -4,8 +4,8 @@ version = "0.1.0"
 edition = '2018'
 
 [dependencies]
-redbpf-macros = { git = "https://github.com/redsift/redbpf.git" }
-redbpf-probes = { git = "https://github.com/redsift/redbpf.git" }
+redbpf-macros = { git = "https://github.com/aquarhead/redbpf.git", branch = "xdp-multi-attach" }
+redbpf-probes = { git = "https://github.com/aquarhead/redbpf.git", branch = "xdp-multi-attach" }
 
 [features]
 default = []

diff --git a/ready-the-rabbit/Cargo.toml b/ready-the-rabbit/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "ready-the-rabbit"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["LOU Xun <aquarhead@ela.build>"]
 edition = "2018"
 build = "build.rs"
 
 [dependencies]
-redbpf = { git = "https://github.com/redsift/redbpf.git", features = ["load"] }
+redbpf = { git = "https://github.com/aquarhead/redbpf.git", branch = "xdp-multi-attach", features = ["load"] }
 anyhow = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

diff --git a/ready-the-rabbit/src/main.rs b/ready-the-rabbit/src/main.rs
@@ -16,21 +16,16 @@ fn main() -> Result<()> {
   let mut loader = Loader::load(prog).expect("error loading XDP program");
 
   for prog in loader.module.xdps_mut() {
-    // Ideally we should not hardcode the interface, but there's a bug in RedBPF currently
-    //
-    // let interfaces = std::fs::read_dir("/sys/class/net").expect("failed to list interfaces");
-    // for interface in interfaces {
-    //   if let Ok(iface) = interface {
-    //     if let Ok(ifa) = iface.file_name().into_string() {
-    //       prog
-    //         .attach_xdp(&ifa, xdp::Flags::default())
-    //         .expect("failed to attach XDP program");
-    //     }
-    //   }
-    // }
-    prog
-      .attach_xdp("eth0", Default::default())
-      .expect("failed to attach XDP program");
+    let interfaces = std::fs::read_dir("/sys/class/net").expect("failed to list interfaces");
+    for interface in interfaces {
+      if let Ok(iface) = interface {
+        if let Ok(ifa) = iface.file_name().into_string() {
+          prog
+            .attach_xdp(&ifa, Default::default())
+            .expect("failed to attach XDP program");
+        }
+      }
+    }
   }
 
   loop {