diff options
| author | zedddie <rust@zedddie.rs> | 2026-03-16 23:34:18 +0100 |
|---|---|---|
| committer | tuturuu <zedddiezxc@gmail.com> | 2026-03-16 23:35:40 +0100 |
| commit | 08c4b5220f35e36fca59b35af5a70ee76018efc2 (patch) | |
| tree | fabd0fcc295ada517b9885852fdaefb683eacea6 | |
| parent | 7b1bfbbed9f6abda4fcf692ccedd47b139c77f40 (diff) | |
fix ipv6 UDP bytes mismatch, add bunch of aliases
| -rw-r--r-- | src/sniffing/headers.rs | 24 |
1 files changed, 14 insertions, 10 deletions
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<PacketInfo, Box<dyn std::error::Error + Send + Sync + 'static>> { + +type GenericError = Box<dyn std::error::Error + Send + Sync + 'static>; +type SniffedPacket = Result<PacketInfo, Box<dyn std::error::Error + Send + Sync + 'static>>; + +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: <Ipv4>::try_from(&packet[12..16])?, + src_port: Port::from_be_bytes([packet[20], packet[21]]), + dst_ip: <Ipv4>::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<PacketInfo, Box<dyn std::error 6 => { 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: <Ipv6>::try_from(&packet[8..24])?, + src_port: Port::from_be_bytes([packet[40], packet[41]]), + dst_ip: <Ipv6>::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) } }; |