Skip to content

Upgrade aya dependencies to support loongarch64 #316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
setarcos wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Upgrade aya dependencies to support loongarch64 #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
132 changes: 62 additions & 70 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ edition = "2024"
rust-version = "1.88" # MSRV

[workspace.dependencies]
aya = { version = "0.13.0", default-features = false }
aya-ebpf = { version = "0.1.1", default-features = false }
aya-log = { version = "0.2.1", default-features = false }
aya-log-ebpf = { version = "0.1.0", default-features = false }
aya = { version = "0.14.0", default-features = false }
aya-ebpf = { version = "0.2.1", default-features = false }
aya-log = { version = "0.3.0", default-features = false }
aya-log-ebpf = { version = "0.2.0", default-features = false }
tun = { version = "0.8.8" }

[workspace.lints.clippy]
Expand Down
2 changes: 1 addition & 1 deletion mitmproxy-linux/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const-sha1 = "0.3.0"

[target.'cfg(target_os = "linux")'.build-dependencies]
anyhow = { version = "1.0.102", features = ["backtrace"] }
aya-build = "0.1.3"
aya-build = "0.2.0"
mitmproxy-linux-ebpf = { path = "../mitmproxy-linux-ebpf" }
cargo_metadata = { version = "0.23.1", default-features = false }

Expand Down
2 changes: 1 addition & 1 deletion mitmproxy-linux/src/main2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ fn load_bpf(device_index: u32) -> Result<Ebpf> {
debug!("Loading BPF program ({:x})...", Bytes::from_static(&BPF_HASH));
let mut ebpf = EbpfLoader::new()
.btf(Btf::from_sys_fs().ok().as_ref())
.set_global("INTERFACE_ID", &device_index, true)
.override_global("INTERFACE_ID", &device_index, true)
.load(BPF_PROG)
.context("failed to load eBPF program")?;
if let Err(e) = aya_log::EbpfLogger::init(&mut ebpf) {
Expand Down
Loading