Add support for icmpv6

Cargo.toml

@@ -13,7 +13,7 @@ repository = "https://github.com/pythops/oryx"
 homepage = "https://github.com/pythops/oryx"
 
 [workspace.dependencies]
-network-types = "0.1.0"
+network-types = { git = "https://github.com/vadorovsky/network-types", rev = "b78424c" }
 
 [profile.release]
 lto = "fat"

oryx-common/src/lib.rs

@@ -4,7 +4,7 @@
 use core::mem;
 
 use network_types::{
-    arp::ArpHdr, eth::EthHdr, icmp::IcmpHdr, ip::IpHdr, sctp::SctpHdr, tcp::TcpHdr, udp::UdpHdr,
+    arp::ArpHdr, eth::EthHdr, icmp::Icmp, ip::IpHdr, sctp::SctpHdr, tcp::TcpHdr, udp::UdpHdr,
 };
 
 pub mod protocols;
@@ -64,5 +64,5 @@ pub enum ProtoHdr {
     Tcp(TcpHdr),
     Udp(UdpHdr),
     Sctp(SctpHdr),
-    Icmp(IcmpHdr),
+    Icmp(Icmp),
 }

oryx-common/src/protocols.rs

@@ -40,7 +40,7 @@ impl TransportProtocol {
 
 // Network Protocols
 
-pub const NB_NETWORK_PROTOCOL: u16 = 3;
+pub const NB_NETWORK_PROTOCOL: u16 = 4;
 
 #[derive(Debug, Copy, Clone, PartialEq, AsRefStr, Display, EnumString)]
 #[repr(C)]
@@ -52,15 +52,19 @@ pub enum NetworkProtocol {
     Ipv6 = 1,
 
     #[strum(ascii_case_insensitive)]
-    Icmp = 2,
+    Icmpv4 = 2,
+
+    #[strum(ascii_case_insensitive)]
+    Icmpv6 = 3,
 }
 
 impl NetworkProtocol {
-    pub fn all() -> [NetworkProtocol; 3] {
+    pub fn all() -> [NetworkProtocol; 4] {
         [
             NetworkProtocol::Ipv4,
             NetworkProtocol::Ipv6,
-            NetworkProtocol::Icmp,
+            NetworkProtocol::Icmpv4,
+            NetworkProtocol::Icmpv6,
         ]
     }
 }

oryx-ebpf/Cargo.toml

@@ -10,7 +10,7 @@ homepage = "https://github.com/pythops/oryx"
 [dependencies]
 aya-ebpf = "0.1.1"
 oryx-common = { path = "../oryx-common" }
-network-types = "0.1.0"
+network-types = { git = "https://github.com/vadorovsky/network-types", rev = "b78424c" }
 
 [[bin]]
 name = "oryx"

oryx-ebpf/src/main.rs

@@ -12,7 +12,7 @@ use core::mem;
 use network_types::{
     arp::ArpHdr,
     eth::{EthHdr, EtherType},
-    icmp::IcmpHdr,
+    icmp::{Icmp, IcmpHdr, IcmpV6Hdr},
     ip::{IpHdr, IpProto, Ipv4Hdr, Ipv6Hdr},
     sctp::SctpHdr,
     tcp::TcpHdr,
@@ -285,7 +285,7 @@ fn process(ctx: TcContext) -> Result<i32, ()> {
                     }
                 }
                 IpProto::Icmp => {
-                    if filter_packet(Protocol::Network(NetworkProtocol::Icmp)) {
+                    if filter_packet(Protocol::Network(NetworkProtocol::Icmpv4)) {
                         return Ok(TC_ACT_PIPE);
                     }
                     let icmp_header: *const IcmpHdr = ptr_at(&ctx, EthHdr::LEN + Ipv4Hdr::LEN)?;
@@ -296,7 +296,7 @@ fn process(ctx: TcContext) -> Result<i32, ()> {
                                 header: *eth_header,
                                 payload: RawPacket::Ip(
                                     IpHdr::V4(*ipv4_header),
-                                    ProtoHdr::Icmp(*icmp_header),
+                                    ProtoHdr::Icmp(Icmp::V4(*icmp_header)),
                                 ),
                             },
                             pid,
@@ -421,19 +421,19 @@ fn process(ctx: TcContext) -> Result<i32, ()> {
                         });
                     }
                 }
-                IpProto::Icmp => {
-                    if filter_packet(Protocol::Network(NetworkProtocol::Icmp)) {
+                IpProto::Ipv6Icmp => {
+                    if filter_packet(Protocol::Network(NetworkProtocol::Icmpv6)) {
                         return Ok(TC_ACT_PIPE);
                     }
-                    let icmp_header: *const IcmpHdr = ptr_at(&ctx, EthHdr::LEN + Ipv6Hdr::LEN)?;
+                    let icmp_header: *const IcmpV6Hdr = ptr_at(&ctx, EthHdr::LEN + Ipv6Hdr::LEN)?;
 
                     unsafe {
                         submit(RawData {
                             frame: RawFrame {
                                 header: *eth_header,
                                 payload: RawPacket::Ip(
                                     IpHdr::V6(*ipv6_header),
-                                    ProtoHdr::Icmp(*icmp_header),
+                                    ProtoHdr::Icmp(Icmp::V6(*icmp_header)),
                                 ),
                             },
                             pid,

oryx-tui/Cargo.toml

@@ -30,6 +30,7 @@ serde_json = "1"
 serde = { version = "1", features = ["derive"] }
 regex = "1"
 chrono = "0.4"
+strum = { version = "0.27", features = ["derive"] }
 
 [[bin]]
 name = "oryx"

oryx-tui/src/export.rs

@@ -10,7 +10,7 @@ use crate::{
     app::AppResult,
     packet::{
         AppPacket, NetworkPacket,
-        network::{IpPacket, IpProto},
+        network::{IpPacket, ip::IpProto},
     },
 };
 
@@ -112,7 +112,7 @@ pub fn export(packets: &[AppPacket]) -> AppResult<()> {
                         writeln!(
                             file,
                             "{:39}  {:^11}  {:39}  {:^11}  {:10}  {:10}  {:10}",
-                            ipv4_packet.src_ip, "-", ipv4_packet.dst_ip, "-", "ICMP", pid, date
+                            ipv4_packet.src_ip, "-", ipv4_packet.dst_ip, "-", "ICMPv4", pid, date
                         )?;
                     }
                 },
@@ -160,7 +160,7 @@ pub fn export(packets: &[AppPacket]) -> AppResult<()> {
                         writeln!(
                             file,
                             "{:39}  {:^11}  {:39}  {:^11}  {:10}  {:10}  {:10}",
-                            ipv6_packet.src_ip, "-", ipv6_packet.dst_ip, "-", "ICMP", pid, date
+                            ipv6_packet.src_ip, "-", ipv6_packet.dst_ip, "-", "ICMPv6", pid, date
                         )?;
                     }
                 },