From 08c4b5220f35e36fca59b35af5a70ee76018efc2 Mon Sep 17 00:00:00 2001 From: zedddie Date: Mon, 16 Mar 2026 23:34:18 +0100 Subject: fix ipv6 UDP bytes mismatch, add bunch of aliases --- src/sniffing/headers.rs | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/sniffing/headers.rs b/src/sniffing/headers.rs index 9b605b9..516b19e 100644 --- a/src/sniffing/headers.rs +++ b/src/sniffing/headers.rs @@ -40,16 +40,20 @@ impl PacketInfo { } } } -pub fn sniff_raw_packets(packet: &[u8]) -> Result> { + +type GenericError = Box; +type SniffedPacket = Result>; + +pub fn sniff_raw_packets(packet: &[u8]) -> SniffedPacket { let ver = packet[0] >> 4; dbg!(ver); match ver { 4 => { let v4 = PacketInfo::V4{ - src_ip: <[u8; 4]>::try_from(&packet[12..16])?, - src_port: u16::from_be_bytes([packet[20], packet[21]]), - dst_ip: <[u8; 4]>::try_from(&packet[16..20])?, - dst_port: u16::from_be_bytes([packet[22], packet[23]]), + src_ip: ::try_from(&packet[12..16])?, + src_port: Port::from_be_bytes([packet[20], packet[21]]), + dst_ip: ::try_from(&packet[16..20])?, + dst_port: Port::from_be_bytes([packet[22], packet[23]]), protocol: match packet[9] { 6 => Protocol::TCP, 17 => Protocol::UDP, @@ -66,13 +70,13 @@ pub fn sniff_raw_packets(packet: &[u8]) -> Result { println!("im in 6!"); let v6 = PacketInfo::V6{ - src_ip: <[u8; 16]>::try_from(&packet[8..24])?, - src_port: u16::from_be_bytes([packet[40], packet[41]]), - dst_ip: <[u8; 16]>::try_from(&packet[24..40])?, - dst_port: u16::from_be_bytes([packet[42], packet[43]]), + src_ip: ::try_from(&packet[8..24])?, + src_port: Port::from_be_bytes([packet[40], packet[41]]), + dst_ip: ::try_from(&packet[24..40])?, + dst_port: Port::from_be_bytes([packet[42], packet[43]]), protocol: match packet[6] { 6 => Protocol::TCP, - 4 => Protocol::UDP, + 17 => Protocol::UDP, p => Protocol::Unsupported(p) } }; -- cgit v1.2.3 From e8c1fbd7d4c77215bb76e4fcd04a2434615e433c Mon Sep 17 00:00:00 2001 From: zedddie Date: Mon, 16 Mar 2026 23:34:55 +0100 Subject: add fixme hardcoded IPv4 port offset --- src/sniffing/headers.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/sniffing/headers.rs b/src/sniffing/headers.rs index 516b19e..644a6b2 100644 --- a/src/sniffing/headers.rs +++ b/src/sniffing/headers.rs @@ -49,6 +49,7 @@ pub fn sniff_raw_packets(packet: &[u8]) -> SniffedPacket { dbg!(ver); match ver { 4 => { + // FIXME: hardcoded IPv4 port offset let v4 = PacketInfo::V4{ src_ip: ::try_from(&packet[12..16])?, src_port: Port::from_be_bytes([packet[20], packet[21]]), -- cgit v1.2.3 From 81e1ed42a0d0ef0ee2cd6092b23a0238c46e0daa Mon Sep 17 00:00:00 2001 From: zedddie Date: Mon, 16 Mar 2026 23:50:51 +0100 Subject: add dns field and check --- src/sniffing/headers.rs | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/sniffing/headers.rs b/src/sniffing/headers.rs index 644a6b2..050f2d3 100644 --- a/src/sniffing/headers.rs +++ b/src/sniffing/headers.rs @@ -20,7 +20,8 @@ pub enum PacketInfo { src_port: Port, dst_ip: Ipv4, dst_port: Port, - protocol: Protocol + protocol: Protocol, + dns: bool }, // V6 { @@ -28,7 +29,8 @@ pub enum PacketInfo { src_port: Port, dst_ip: Ipv6, dst_port: Port, - protocol: Protocol + protocol: Protocol, + dns: bool } } @@ -49,17 +51,21 @@ pub fn sniff_raw_packets(packet: &[u8]) -> SniffedPacket { dbg!(ver); match ver { 4 => { + let dst_port = Port::from_be_bytes([packet[22], packet[23]]); + let dns; + if dst_port == 53 { dns = true; } else { dns = false; }; // FIXME: hardcoded IPv4 port offset let v4 = PacketInfo::V4{ src_ip: ::try_from(&packet[12..16])?, src_port: Port::from_be_bytes([packet[20], packet[21]]), dst_ip: ::try_from(&packet[16..20])?, - dst_port: Port::from_be_bytes([packet[22], packet[23]]), + dst_port, protocol: match packet[9] { 6 => Protocol::TCP, 17 => Protocol::UDP, p => Protocol::Unsupported(p) - } + }, + dns }; if !matches!(v4.protocol(), Protocol::Unsupported(_)) { println!("{v4:?}"); @@ -70,16 +76,20 @@ pub fn sniff_raw_packets(packet: &[u8]) -> SniffedPacket { }, 6 => { println!("im in 6!"); + let dst_port = Port::from_be_bytes([packet[22], packet[23]]); + let dns; + if dst_port == 53 { dns = true; } else { dns = false; }; let v6 = PacketInfo::V6{ src_ip: ::try_from(&packet[8..24])?, src_port: Port::from_be_bytes([packet[40], packet[41]]), dst_ip: ::try_from(&packet[24..40])?, - dst_port: Port::from_be_bytes([packet[42], packet[43]]), + dst_port, protocol: match packet[6] { 6 => Protocol::TCP, 17 => Protocol::UDP, p => Protocol::Unsupported(p) - } + }, + dns }; if !matches!(v6.protocol(), Protocol::Unsupported(_)) { println!("{v6:?}"); -- cgit v1.2.3 From 2eb03ac7688387e15d3b210f1946896380d38080 Mon Sep 17 00:00:00 2001 From: zedddie Date: Tue, 17 Mar 2026 00:01:42 +0100 Subject: add a Packet type alias and comment out debug thingies :< --- src/sniffing/headers.rs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/sniffing/headers.rs b/src/sniffing/headers.rs index 050f2d3..a5b0480 100644 --- a/src/sniffing/headers.rs +++ b/src/sniffing/headers.rs @@ -43,12 +43,13 @@ impl PacketInfo { } } +// TODO: move these to some appropriate file for code readability. type GenericError = Box; type SniffedPacket = Result>; +type Packet = [u8]; -pub fn sniff_raw_packets(packet: &[u8]) -> SniffedPacket { +pub fn sniff_raw_packets(packet: &Packet) -> SniffedPacket { let ver = packet[0] >> 4; - dbg!(ver); match ver { 4 => { let dst_port = Port::from_be_bytes([packet[22], packet[23]]); @@ -70,12 +71,13 @@ pub fn sniff_raw_packets(packet: &[u8]) -> SniffedPacket { if !matches!(v4.protocol(), Protocol::Unsupported(_)) { println!("{v4:?}"); } else { - println!("oppsie unsupported"); + // TODO: make --debug option which will include this diagnostic, for general use this + // should be off + // println!("oppsie unsupported protocol: {:?}", v4.protocol()); } Ok(v4) }, 6 => { - println!("im in 6!"); let dst_port = Port::from_be_bytes([packet[22], packet[23]]); let dns; if dst_port == 53 { dns = true; } else { dns = false; }; @@ -94,7 +96,9 @@ pub fn sniff_raw_packets(packet: &[u8]) -> SniffedPacket { if !matches!(v6.protocol(), Protocol::Unsupported(_)) { println!("{v6:?}"); } else { - println!("oppsie unsupported"); + // TODO: make --debug option which will include this diagnostic, for general use this + // should be off + // println!("oppsie unsupported protocol: {:?}", v6.protocol()); } Ok(v6) }, -- cgit v1.2.3