Skip to content

Add support for IGMP #78

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

Merged
pythops merged 11 commits into from
Jan 30, 2026
Merged

Add support for IGMP #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ecdb5af
support igmpv1
pythops Jan 24, 2026
ce845a8
fix linting
pythops Jan 24, 2026
1ec144f
update
pythops Jan 24, 2026
8797d32
Add igmpv2
pythops Jan 24, 2026
dbad7a3
Add igmpv3
pythops Jan 25, 2026
d29d32f
fix
pythops Jan 25, 2026
9ba71f6
fix ipv4 ihl display val
pythops Jan 26, 2026
9b609fc
update protocols list from cli
pythops Jan 27, 2026
79af1cc
bump dep
pythops Jan 29, 2026
00ec679
update
pythops Jan 29, 2026
215cf02
display igmp in the stats
pythops Jan 29, 2026
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
148 changes: 68 additions & 80 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repository = "https://github.com/pythops/oryx"
homepage = "https://github.com/pythops/oryx"

[workspace.dependencies]
network-types = { git = "https://github.com/vadorovsky/network-types", rev = "b78424c" }
network-types = { git = "https://github.com/vadorovsky/network-types", rev = "c6f9c28" }

[profile.release]
opt-level = 3
Expand Down
25 changes: 24 additions & 1 deletion oryx-common/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,14 @@
use core::mem;

use network_types::{
arp::ArpHdr, eth::EthHdr, icmp::Icmp, ip::IpHdr, sctp::SctpHdr, tcp::TcpHdr, udp::UdpHdr,
arp::ArpHdr,
eth::EthHdr,
icmp::Icmp,
igmp::{IGMPv1Hdr, IGMPv2Hdr, IGMPv3MembershipQueryHdr, IGMPv3MembershipReportHdr},
ip::IpHdr,
sctp::SctpHdr,
tcp::TcpHdr,
udp::UdpHdr,
};

pub mod protocols;
Expand Down Expand Up @@ -65,4 +72,20 @@ pub enum ProtoHdr {
Udp(UdpHdr),
Sctp(SctpHdr),
Icmp(Icmp),
Igmp(IgmpHdr),
}

#[derive(Copy, Clone)]
#[repr(C)]
pub enum IgmpHdr {
V1(IGMPv1Hdr),
V2(IGMPv2Hdr),
V3(IGMPv3Hdr),
}

#[derive(Copy, Clone)]
#[repr(C)]
pub enum IGMPv3Hdr {
Query(IGMPv3MembershipQueryHdr),
Report(IGMPv3MembershipReportHdr),
}
8 changes: 6 additions & 2 deletions oryx-common/src/protocols.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ impl TransportProtocol {

// Network Protocols

pub const NB_NETWORK_PROTOCOL: u16 = 4;
pub const NB_NETWORK_PROTOCOL: u16 = 5;

#[derive(Debug, Copy, Clone, PartialEq, AsRefStr, Display, EnumString)]
#[repr(C)]
Expand All @@ -56,15 +56,19 @@ pub enum NetworkProtocol {

#[strum(ascii_case_insensitive)]
Icmpv6 = 3,

#[strum(ascii_case_insensitive)]
Igmp = 4,
}

impl NetworkProtocol {
pub fn all() -> [NetworkProtocol; 4] {
pub fn all() -> [NetworkProtocol; 5] {
[
NetworkProtocol::Ipv4,
NetworkProtocol::Ipv6,
NetworkProtocol::Icmpv4,
NetworkProtocol::Icmpv6,
NetworkProtocol::Igmp,
]
}
}
Expand Down
44 changes: 13 additions & 31 deletions oryx-ebpf/Cargo.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions oryx-ebpf/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ homepage = "https://github.com/pythops/oryx"
[dependencies]
aya-ebpf = "0.1.1"
oryx-common = { path = "../oryx-common" }
network-types = { git = "https://github.com/vadorovsky/network-types", rev = "b78424c" }
branches = { version = "0.3", default-features = false }
network-types = { git = "https://github.com/vadorovsky/network-types", rev = "c6f9c28" }
branches = { version = "0.4", default-features = false }

[[bin]]
name = "oryx"
Expand Down
137 changes: 136 additions & 1 deletion oryx-ebpf/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@ use network_types::{
arp::ArpHdr,
eth::{EthHdr, EtherType},
icmp::{Icmp, IcmpHdr, IcmpV6Hdr},
igmp::{IGMPv1Hdr, IGMPv2Hdr, IGMPv3MembershipQueryHdr, IGMPv3MembershipReportHdr},
ip::{IpHdr, IpProto, Ipv4Hdr, Ipv6Hdr},
sctp::SctpHdr,
tcp::TcpHdr,
udp::UdpHdr,
};
use oryx_common::{
MAX_FIREWALL_RULES, MAX_RULES_PORT, ProtoHdr, RawData, RawFrame, RawPacket,
IGMPv3Hdr, IgmpHdr, MAX_FIREWALL_RULES, MAX_RULES_PORT, ProtoHdr, RawData, RawFrame, RawPacket,
protocols::{LinkProtocol, NetworkProtocol, Protocol, TransportProtocol},
};

Expand Down Expand Up @@ -304,6 +305,140 @@ fn process(ctx: TcContext) -> Result<i32, ()> {
});
}
}

IpProto::Igmp => {
if filter_packet(Protocol::Network(NetworkProtocol::Igmp)) {
return Ok(TC_ACT_PIPE);
}

let payload_length = unsafe {
u16::from_be_bytes((*ipv4_header).tot_len) - (*ipv4_header).ihl() as u16
};

let ihl: u8 = ctx.load(EthHdr::LEN).map_err(|_| ())?;
let ihl = (ihl & 0x0F) * 4;

let igmp_type: u8 = ctx.load(EthHdr::LEN + ihl as usize).map_err(|_| ())?;

match igmp_type {
0x11 => {
if payload_length == 8 {
// v1 or v2
let max_response_time: u8 =
ctx.load(EthHdr::LEN + ihl as usize + 1).map_err(|_| ())?;

if max_response_time == 0 {
//v1
let igmp_header: *const IGMPv1Hdr =
ptr_at(&ctx, EthHdr::LEN + ihl as usize)?;

unsafe {
submit(RawData {
frame: RawFrame {
header: *eth_header,
payload: RawPacket::Ip(
IpHdr::V4(*ipv4_header),
ProtoHdr::Igmp(IgmpHdr::V1(*igmp_header)),
),
},
pid,
});
}
} else {
// v2
let igmp_header: *const IGMPv2Hdr =
ptr_at(&ctx, EthHdr::LEN + ihl as usize)?;

unsafe {
submit(RawData {
frame: RawFrame {
header: *eth_header,
payload: RawPacket::Ip(
IpHdr::V4(*ipv4_header),
ProtoHdr::Igmp(IgmpHdr::V2(*igmp_header)),
),
},
pid,
});
}
}
} else {
// v3
let igmp_header: *const IGMPv3MembershipQueryHdr =
ptr_at(&ctx, EthHdr::LEN + ihl as usize)?;

unsafe {
submit(RawData {
frame: RawFrame {
header: *eth_header,
payload: RawPacket::Ip(
IpHdr::V4(*ipv4_header),
ProtoHdr::Igmp(IgmpHdr::V3(IGMPv3Hdr::Query(
*igmp_header,
))),
),
},
pid,
});
}
}
}
0x12 => {
let igmp_header: *const IGMPv1Hdr =
ptr_at(&ctx, EthHdr::LEN + ihl as usize)?;

unsafe {
submit(RawData {
frame: RawFrame {
header: *eth_header,
payload: RawPacket::Ip(
IpHdr::V4(*ipv4_header),
ProtoHdr::Igmp(IgmpHdr::V1(*igmp_header)),
),
},
pid,
});
}
}
0x16 | 0x17 => {
let igmp_header: *const IGMPv2Hdr =
ptr_at(&ctx, EthHdr::LEN + ihl as usize)?;

unsafe {
submit(RawData {
frame: RawFrame {
header: *eth_header,
payload: RawPacket::Ip(
IpHdr::V4(*ipv4_header),
ProtoHdr::Igmp(IgmpHdr::V2(*igmp_header)),
),
},
pid,
});
}
}
0x22 => {
let igmp_header: *const IGMPv3MembershipReportHdr =
ptr_at(&ctx, EthHdr::LEN + ihl as usize)?;

unsafe {
submit(RawData {
frame: RawFrame {
header: *eth_header,
payload: RawPacket::Ip(
IpHdr::V4(*ipv4_header),
ProtoHdr::Igmp(IgmpHdr::V3(IGMPv3Hdr::Report(
*igmp_header,
))),
),
},
pid,
});
}
}
_ => {}
}
}
_ => {}
}
}
Expand Down
2 changes: 1 addition & 1 deletion oryx-tui/src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ pub fn cli() -> Command {
.value_delimiter(',')
.num_args(1..)
.default_value("all")
.value_parser(["ipv4", "ipv6", "icmp", "all"]),
.value_parser(["ipv4", "ipv6", "icmpv4", "icmpv6", "igmp", "all"]),
)
.arg(
arg!(--link <link>)
Expand Down
11 changes: 11 additions & 0 deletions oryx-tui/src/export.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,13 @@ pub fn export(packets: &PacketStore) -> Result<()> {
ipv4_packet.src_ip, "-", ipv4_packet.dst_ip, "-", "ICMPv4", pid, date
)?;
}
IpProto::Igmp(_) => {
writeln!(
file,
"{:39} {:^11} {:39} {:^11} {:10} {:10} {:10}",
ipv4_packet.src_ip, "-", ipv4_packet.dst_ip, "-", "IGMP", pid, date
)?;
}
},
IpPacket::V6(ipv6_packet) => match ipv6_packet.proto {
IpProto::Tcp(p) => {
Expand Down Expand Up @@ -184,6 +191,10 @@ pub fn export(packets: &PacketStore) -> Result<()> {
ipv6_packet.src_ip, "-", ipv6_packet.dst_ip, "-", "ICMPv6", pid, date
)?;
}
IpProto::Igmp(_) => {
//IGMP is for IPv4 only
unreachable!()
}
},
},
}
Expand Down
10 changes: 10 additions & 0 deletions oryx-tui/src/filter/network.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,16 @@ impl NetworkFilter {
},
"ICMPv6",
]),
Row::new(vec![
{
if self.selected_protocols.contains(&NetworkProtocol::Igmp) {
" "
} else {
""
}
},
"IGMP",
]),
];

let network_filters_table = Table::new(network_filters, widths)
Expand Down
Loading