zedddie/nsc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request 'small-fixes & improvements' (#3) from small-fixes into main

Browse source 
Reviewed-on: https://codeberg.org/NamelessTeam/nsc/pulls/3
This commit is contained in:
zedddie 2026-03-17 00:04:20 +01:00
commit 0f333db702
1 changed files with 37 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/sniffing/headers.rs
View file

@ -20,7 +20,8 @@ pub enum PacketInfo {
src_port: Port, src_port: Port,
dst_ip: Ipv4, dst_ip: Ipv4,
dst_port: Port, dst_port: Port,
protocol: Protocol protocol: Protocol,
dns: bool
}, },
// <https://www.geeksforgeeks.org/computer-networks/internet-protocol-version-6-ipv6-header/> // <https://www.geeksforgeeks.org/computer-networks/internet-protocol-version-6-ipv6-header/>
V6 { V6 {
@ -28,7 +29,8 @@ pub enum PacketInfo {
src_port: Port, src_port: Port,
dst_ip: Ipv6, dst_ip: Ipv6,
dst_port: Port, dst_port: Port,
protocol: Protocol protocol: Protocol,
dns: bool
} }
} }
@ -40,46 +42,63 @@ impl PacketInfo {
} }
} }
} }
pub fn sniff_raw_packets(packet: &[u8]) -> Result<PacketInfo, Box<dyn std::error::Error + Send + Sync + 'static>> {
// TODO: move these to some appropriate file for code readability.
type GenericError = Box<dyn std::error::Error + Send + Sync + 'static>;
type SniffedPacket = Result<PacketInfo, Box<dyn std::error::Error + Send + Sync + 'static>>;
type Packet = [u8];
pub fn sniff_raw_packets(packet: &Packet) -> SniffedPacket {
let ver = packet[0] >> 4; let ver = packet[0] >> 4;
dbg!(ver);
match ver { match ver {
4 => { 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{ let v4 = PacketInfo::V4{
src_ip: <[u8; 4]>::try_from(&packet[12..16])?, src_ip: <Ipv4>::try_from(&packet[12..16])?,
src_port: u16::from_be_bytes([packet[20], packet[21]]), src_port: Port::from_be_bytes([packet[20], packet[21]]),
dst_ip: <[u8; 4]>::try_from(&packet[16..20])?, dst_ip: <Ipv4>::try_from(&packet[16..20])?,
dst_port: u16::from_be_bytes([packet[22], packet[23]]), dst_port,
protocol: match packet[9] { protocol: match packet[9] {
6 => Protocol::TCP, 6 => Protocol::TCP,
17 => Protocol::UDP, 17 => Protocol::UDP,
p => Protocol::Unsupported(p) p => Protocol::Unsupported(p)
} },
dns
}; };
if !matches!(v4.protocol(), Protocol::Unsupported(_)) { if !matches!(v4.protocol(), Protocol::Unsupported(_)) {
println!("{v4:?}"); println!("{v4:?}");
} else { } 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) Ok(v4)
}, },
6 => { 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{ let v6 = PacketInfo::V6{
src_ip: <[u8; 16]>::try_from(&packet[8..24])?, src_ip: <Ipv6>::try_from(&packet[8..24])?,
src_port: u16::from_be_bytes([packet[40], packet[41]]), src_port: Port::from_be_bytes([packet[40], packet[41]]),
dst_ip: <[u8; 16]>::try_from(&packet[24..40])?, dst_ip: <Ipv6>::try_from(&packet[24..40])?,
dst_port: u16::from_be_bytes([packet[42], packet[43]]), dst_port,
protocol: match packet[6] { protocol: match packet[6] {
6 => Protocol::TCP, 6 => Protocol::TCP,
4 => Protocol::UDP, 17 => Protocol::UDP,
p => Protocol::Unsupported(p) p => Protocol::Unsupported(p)
} },
dns
}; };
if !matches!(v6.protocol(), Protocol::Unsupported(_)) { if !matches!(v6.protocol(), Protocol::Unsupported(_)) {
println!("{v6:?}"); println!("{v6:?}");
} else { } 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) Ok(v6)
}, },