Skip to content

Commit f6ba709

Browse files
committed
feat: change to aya crates.io version for higher stability
1 parent 95996a3 commit f6ba709

File tree

6 files changed

+17
-20
lines changed

6 files changed

+17
-20
lines changed

.github/workflows/build-uprobe-libcall-filter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: rust-uprobe-libcall-filter
22
on: [push]
33
env:
4-
RUSTUP_TOOLCHAIN: "1.85.0"
4+
RUSTUP_TOOLCHAIN: "1.86.0"
55
RUSTUP_HOME: "./rust/rustup"
66
CARGO_HOME: "./rust/cargo"
77

conf/uprobe-libcall-filter.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
applications:
22
filter:
3-
openssl3.2:
4-
openssl_lib: "/lib64/glibc-hwcaps/x86-64-v3/libssl.so.3.2.4"
3+
openssl3.5:
4+
openssl_lib: "/lib64/glibc-hwcaps/x86-64-v3/libssl.so.3.5.1"
55

uprobe-libcall-filter/uprobe-libcall-filter-app/Cargo.toml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,8 @@ edition = "2024"
77

88
[dependencies]
99
anyhow = "1.0.86"
10-
# TODO: change to the stable version by the next release = 0.12
11-
aya = { git = "https://github.com/aya-rs/aya", branch = "main", features = [
12-
"async_tokio",
13-
] }
14-
aya-log = { git = "https://github.com/aya-rs/aya", branch = "main" }
10+
aya = { version = "0.13.1", default-features = false }
11+
aya-log = { version = "0.2.1", default-features = false }
1512
bytes = {version = "1"}
1613
clap = { version = "4.1.1", features = ["derive"] }
1714
env_logger = "0.11"

uprobe-libcall-filter/uprobe-libcall-filter-app/src/main.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,39 +62,39 @@ async fn main() -> Result<(), anyhow::Error> {
6262
bpf.program_mut("osslreadprobe").unwrap().try_into()?;
6363
program_ossreadprobe.load()?;
6464
program_ossreadprobe.attach(
65-
"SSL_read",
65+
Some("SSL_read"),
66+
0,
6667
&application_definition.openssl_lib,
6768
None,
68-
None,
6969
)?;
7070

7171
let program_ossreadprobe_ret: &mut UProbe =
7272
bpf.program_mut("osslreadretprobe").unwrap().try_into()?;
7373
program_ossreadprobe_ret.load()?;
7474
program_ossreadprobe_ret.attach(
75-
"SSL_read",
75+
Some("SSL_read"),
76+
0,
7677
&application_definition.openssl_lib,
7778
None,
78-
None,
7979
)?;
8080
// attach probes for write
8181
let program_osswriteprobe: &mut UProbe =
8282
bpf.program_mut("osslwriteprobe").unwrap().try_into()?;
8383
program_osswriteprobe.load()?;
8484
program_osswriteprobe.attach(
85-
"SSL_write",
85+
Some("SSL_write"),
86+
0,
8687
&application_definition.openssl_lib,
8788
None,
88-
None,
8989
)?;
9090
let program_osswriteprobe_ret: &mut UProbe =
9191
bpf.program_mut("osslwriteretprobe").unwrap().try_into()?;
9292
program_osswriteprobe_ret.load()?;
9393
program_osswriteprobe_ret.attach(
94-
"SSL_write",
94+
Some("SSL_write"),
95+
0,
9596
&application_definition.openssl_lib,
9697
None,
97-
None,
9898
)?;
9999
}
100100
}

uprobe-libcall-filter/uprobe-libcall-filter-common/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ user = [ "aya" ]
1212

1313

1414
[dependencies]
15-
aya = { git = "https://github.com/aya-rs/aya", optional = true }
15+
aya = { version = "0.13.1", default-features = false , optional = true }
1616

1717

1818
[lib]

uprobe-libcall-filter/uprobe-libcall-filter-ebpf/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ edition = "2024"
77

88

99
[dependencies]
10-
aya-ebpf = { git = "https://github.com/aya-rs/aya", branch = "main" }
11-
aya-ebpf-bindings = { git = "https://github.com/aya-rs/aya", branch = "main" }
12-
aya-log-ebpf = { git = "https://github.com/aya-rs/aya", branch = "main" }
10+
aya-ebpf = { version = "0.1.1", default-features = false }
11+
aya-log-ebpf = { version = "0.1.1", default-features = false }
12+
aya-ebpf-bindings = { version = "0.1.1", default-features = false }
1313
uprobe-libcall-filter-common = { path = "../uprobe-libcall-filter-common" }
1414
memoffset = "0.9"
1515

0 commit comments

Comments
 (0)