Refactor reverse proxy configuration to use static BPF and cgroup_tra…

…ffic
arloor · Oct 22, 2024 · 5f5cd66 · 5f5cd66
1 parent b479d65
commit 5f5cd66
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -76,7 +76,7 @@ jobs:
           extra_deps: cmake zlib1g-dev libelf-dev pkg-config clang autoconf autopoint flex bison gawk make
           after_install: |
             ls -lh /usr/lib/x86_64-linux-gnu/libelf.a
-          args: -p rust_http_proxy --no-default-features --features aws_lc_rs,bpf_vendored
+          args: -p rust_http_proxy --no-default-features --features aws_lc_rs,bpf_static
           apt_mirror: mirrors.mit.edu
           rust_flags: -C target-feature=+crt-static -L /usr/lib/x86_64-linux-gnu
           debug: false

diff --git a/rust_http_proxy/Cargo.toml b/rust_http_proxy/Cargo.toml
@@ -60,7 +60,7 @@ pnet = { version = "0.35", optional = true }
 default = ["ring"]
 jemalloc = ["jemallocator"]
 bpf = ["socket_filter", "cgroup_traffic"]
-bpf_vendored = ["bpf", "socket_filter/vendored"]
-bpf_static = ["bpf", "socket_filter/static", "libbpf-sys/vendored-libbpf"]
+bpf_vendored = ["bpf", "socket_filter/vendored","cgroup_traffic/vendored"]
+bpf_static = ["bpf", "socket_filter/static","cgroup_traffic/static", "libbpf-sys/vendored-libbpf"]
 aws_lc_rs = ["tokio-rustls/aws-lc-rs", "hyper-rustls/aws-lc-rs"]
 ring = ["tokio-rustls/ring", "hyper-rustls/ring"]