Skip to content

Commit c695f73

Browse files
committed
release v0.6.1 (#60)
1 parent 090cab0 commit c695f73

File tree

7 files changed

+46
-33
lines changed

7 files changed

+46
-33
lines changed

Cargo.lock

Lines changed: 22 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ members = ["xtask", "oryx-tui", "oryx-common"]
55
[workspace.package]
66
description = "TUI for sniffing network traffic using eBPF"
77
authors = ["Badr Badri <contact@pythops.com>"]
8-
version = "0.6.0"
8+
version = "0.6.1"
99
readme = "Readme.md"
1010
license = "GPL-3.0"
1111
edition = "2021"

Release.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## v0.6.1 - 2025-06-07
2+
3+
- Fix ebpf load crash
4+
- Add date to AppPacket and show it in export file
5+
16
## v0.6 - 2025-05-30
27

38
- Show ethernet header infos

oryx-ebpf/Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

oryx-ebpf/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "oryx-ebpf"
3-
version = "0.6.0"
3+
version = "0.6.1"
44
description = "oryx eBPF"
55
license = "GPL-3.0"
66
edition = "2021"
@@ -31,6 +31,7 @@ rpath = false
3131
lto = "fat"
3232
panic = "abort"
3333
codegen-units = 1
34+
strip = false
3435

3536
[workspace]
3637
members = []

oryx-ebpf/src/main.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ static BLOCKLIST_IPV4: HashMap<u32, [u16; MAX_RULES_PORT]> =
4646
HashMap::<u32, [u16; MAX_RULES_PORT]>::with_max_entries(MAX_FIREWALL_RULES, 0);
4747

4848
#[no_mangle]
49-
static TRAFFIC_DIRECTION: i32 = 0;
49+
static PID_HELPER_AVAILABILITY: u8 = 0;
5050

5151
#[no_mangle]
52-
static PID_HELPER_AVAILABILITY: u8 = 0;
52+
static TRAFFIC_DIRECTION: i32 = 0;
5353

5454
#[classifier]
5555
pub fn oryx(ctx: TcContext) -> i32 {
@@ -160,9 +160,9 @@ fn process(ctx: TcContext) -> Result<i32, ()> {
160160
let pid = if is_ingress() {
161161
None
162162
} else {
163-
let pid_helper_available = unsafe { core::ptr::read_volatile(&PID_HELPER_AVAILABILITY) };
163+
let is_pid_helper_available = unsafe { core::ptr::read_volatile(&PID_HELPER_AVAILABILITY) };
164164

165-
if pid_helper_available == 1 {
165+
if is_pid_helper_available == 1 {
166166
Some((bpf_get_current_pid_tgid() >> 32) as u32)
167167
} else {
168168
None

oryx-tui/src/ebpf/egress.rs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,14 @@ pub fn load_egress(
6060

6161
let traffic_direction = EbpfTrafficDirection::Egress as i32;
6262

63-
let pid_helper_available = is_pid_helper_available() as u8;
64-
6563
#[cfg(debug_assertions)]
6664
let mut bpf = match EbpfLoader::new()
6765
.set_global("TRAFFIC_DIRECTION", &traffic_direction, true)
68-
.set_global("PID_HELPER_AVAILABILITY", &pid_helper_available, false)
66+
.set_global(
67+
"PID_HELPER_AVAILABILITY",
68+
&(is_pid_helper_available() as u8),
69+
true,
70+
)
6971
.load(include_bytes_aligned!(env!("ORYX_BIN_PATH")))
7072
{
7173
Ok(v) => v,
@@ -84,6 +86,11 @@ pub fn load_egress(
8486
#[cfg(not(debug_assertions))]
8587
let mut bpf = match EbpfLoader::new()
8688
.set_global("TRAFFIC_DIRECTION", &traffic_direction, true)
89+
.set_global(
90+
"PID_HELPER_AVAILABILITY",
91+
&(is_pid_helper_available() as u8),
92+
true,
93+
)
8794
.load(include_bytes_aligned!(env!("ORYX_BIN_PATH")))
8895
{
8996
Ok(v) => v,

0 commit comments

Comments
 (0)