From 3eece7ecd9760afbe36e659d9f72312a8462d43b Mon Sep 17 00:00:00 2001 From: Raine Date: Sun, 15 Oct 2023 18:06:34 +0200 Subject: [PATCH] fix: parsing --- domo_node/config.toml | 2 +- domo_node/src/app.rs | 80 ++++++++++++++++++++ domo_node/src/connection/server.rs | 17 ++++- domo_node/src/main.rs | 97 +------------------------ domo_proto/src/packet/raw_packet/vec.rs | 13 ++-- 5 files changed, 105 insertions(+), 104 deletions(-) create mode 100644 domo_node/src/app.rs diff --git a/domo_node/config.toml b/domo_node/config.toml index fed5190..e79669e 100644 --- a/domo_node/config.toml +++ b/domo_node/config.toml @@ -2,4 +2,4 @@ bind = "127.0.0.1:4480" [node] -device_id = "ffffffff" \ No newline at end of file +device_id = "ffffffff" diff --git a/domo_node/src/app.rs b/domo_node/src/app.rs new file mode 100644 index 0000000..0aea84b --- /dev/null +++ b/domo_node/src/app.rs @@ -0,0 +1,80 @@ +use std::io; +use log::{error, trace, warn}; +use tokio::sync::mpsc::channel; +use domo_proto::commands::node_management::NodeManagementCommand; +use domo_proto::identifier::Identifier; +use domo_proto::packet::{Packet, ToPacket}; +use domo_proto::packet::packet_data::PacketData; +use domo_proto::packet::raw_packet::RawPacket; +use crate::{CONFIG, prelude}; +use crate::config::node::NodeType; +use crate::connection::server::Server; + +impl NodeType { + pub async fn start(self) -> io::Result<()> { + match self { + NodeType::Master { bind } => { + let server = Server::new( + bind, + Some( + Identifier::from( + hex::decode(CONFIG.with_borrow(|c| c.node.device_id.clone())) + .map_err(|_| io::Error::new(io::ErrorKind::InvalidInput, "could not parse hex"))? + ) + ), + ).await?; + + { + let p = NodeManagementCommand::Ping.to_packet( + Identifier::random(), + server.device_id(), + Identifier::random(), + Identifier::default(), + ); + std::fs::write("./packet", Into::>::into(p))?; + } + + loop { + match server.recv_packet().await { + (Ok(p), Some(s)) => { + if p.dest != server.device_id() { + if let Some(d) = server.devices().get(&p.dest) { + let _ = &server.send(d.socket_addr, p).await; + } + continue; + } + match p.data { + PacketData::NodeManagement(NodeManagementCommand::Ping) => { + trace!("ping from: [{s}->{}]", p.src); + let _ = server.send(s, NodeManagementCommand::Ping.to_packet( + server.device_id(), + p.src, + Identifier::random(), + p.packet_id, + )).await; + } + _ => {} + } + } + (Err(e), Some(source)) => { + error!("{source} sent intelligible data: {e}"); + let device_id = server.device_id(); + if let Err(e) = server.send(source, + prelude::quick_err::net_broken_packet( + device_id, + Identifier::random(), + ), + ).await { + error!("could not send error packet: {e}"); + } + } + _ => warn!("dropped packet") + } + } + } + NodeType::Bridge { .. } => {} + NodeType::Subnet { .. } => {} + } + Ok(()) + } +} \ No newline at end of file diff --git a/domo_node/src/connection/server.rs b/domo_node/src/connection/server.rs index 7d3c4e7..19943e4 100644 --- a/domo_node/src/connection/server.rs +++ b/domo_node/src/connection/server.rs @@ -5,6 +5,8 @@ use std::net::SocketAddr; use std::io; use domo_proto::packet::{FULL_PACKET_SIZE, Packet}; use std::io::ErrorKind; +use log::error; +use domo_proto::packet::raw_packet::RawPacket; pub struct Device { /// Device identifier @@ -29,7 +31,7 @@ impl Server { } /// Receive 1 packet. - pub async fn recv_packet(&mut self) -> (io::Result, Option) { + pub async fn recv_packet(&self) -> (io::Result, Option) { let mut buf = vec![0; FULL_PACKET_SIZE]; let (size, socket_addr) = match self.sock.recv_from(&mut buf).await { Ok(v) => v, @@ -37,12 +39,19 @@ impl Server { }; ( - Packet::try_from(buf[..size].to_vec()) - .map_err(|_| io::Error::new(ErrorKind::InvalidData, "Received invalid data")), + Packet::try_from(buf[..size].to_vec()), Some(socket_addr) ) } + pub async fn send(&self, addr: SocketAddr, packet: Packet) -> io::Result<()> { + self.sock().send_to( + Into::>::into(RawPacket::from(packet)).as_slice(), + addr + ).await?; + Ok(()) + } + pub fn device_id(&self) -> Identifier { self.device_id.clone() } @@ -51,7 +60,7 @@ impl Server { &self.sock } - pub fn devices(& self) -> &HashMap { + pub fn devices(&self) -> &HashMap { &self.devices } } diff --git a/domo_node/src/main.rs b/domo_node/src/main.rs index 9b284a9..f1c3722 100644 --- a/domo_node/src/main.rs +++ b/domo_node/src/main.rs @@ -1,18 +1,11 @@ -use crate::config::node::NodeType; use log::{debug, error, info, trace, warn}; use std::{env, io}; use std::cell::RefCell; -use std::error::Error; -use tokio::net::UdpSocket; -use domo_proto::packet::{FULL_PACKET_SIZE, ToPacket}; -use connection::server::Server; -use domo_proto::commands::node_management::NodeManagementCommand; -use domo_proto::identifier::Identifier; -use domo_proto::packet::raw_packet::RawPacket; pub mod prelude; pub mod config; pub mod connection; +pub mod app; thread_local! { static CONFIG: RefCell = RefCell::new(config::Config::from_path( @@ -39,91 +32,9 @@ fn main() -> io::Result<()> { ); - match CONFIG.with_borrow(|c| c.node.node_type.clone()) { - NodeType::Master { bind } => runtime.block_on(async { - let mut server = Server::new( - bind, - Some( - Identifier::from( - hex::decode(CONFIG.with_borrow(|c| c.node.device_id.clone())) - .unwrap() - ) - ), - ).await.unwrap(); - - info!("bound server on {} as {}", server.sock().local_addr().unwrap(), server.device_id()); - - loop { - match server.recv_packet().await { - (Ok(packet), Some(source)) => { - if packet.dest != server.device_id() { - if let Some(d) = server.devices().get(&packet.dest) { - if let Err(e) = server.sock().send_to(packet.build_full_packet().as_slice(), d.socket_addr).await { - error!("Error forwarding to {}: {}", d.device_id, e); - continue - } - trace!("fwd {} -> {}", packet.packet_id, packet.dest); - } else { - if let Err(e) = server.sock().send_to( - prelude::quick_err::net_dest_unreachable( - server.device_id(), - packet.dest, - packet.packet_id - ).build_full_packet().as_slice(), - source - ).await { - error!("Could not send error packet: {e}"); - }; - } - continue; - } - match packet.command >> 4 { - // Node management - 0x0 => { - if let Ok(nm) = NodeManagementCommand::try_from(RawPacket::from(packet)) { - trace!("{nm:?}"); - } - } - // Property control - 0x1 => {} - _ => { - let device_id = server.device_id(); - match server.sock().send_to( - prelude::quick_err::net_invalid_packet( - device_id, - packet.src, - packet.packet_id, - ).build_full_packet().as_slice(), - source, - ).await { - Ok(_) => {} - Err(e) => error!("could not send error packet: {e}") - } - } - } - } - (Err(e), Some(source)) => { - error!("{source} sent intelligible data: {e}"); - let device_id = server.device_id(); - if let Err(e) = server.sock().send_to( - prelude::quick_err::net_broken_packet( - device_id, - Identifier::random(), - ).build_full_packet().as_slice(), - source, - ).await { - error!("could not send error packet: {e}"); - } - } - _ => warn!("dropped intelligible packet") - } - } - }), - NodeType::Bridge { bind, master_address } => runtime.block_on(async { - - }), - NodeType::Subnet { master_address: _ } => unimplemented!() - } + runtime.block_on(async { + CONFIG.with_borrow(|c| c.node.node_type.clone()).start().await; + }); Ok(()) } diff --git a/domo_proto/src/packet/raw_packet/vec.rs b/domo_proto/src/packet/raw_packet/vec.rs index ca3c6e0..610aba8 100644 --- a/domo_proto/src/packet/raw_packet/vec.rs +++ b/domo_proto/src/packet/raw_packet/vec.rs @@ -9,13 +9,14 @@ impl TryFrom> for RawPacket { if data.len() < PACKET_HEADER_SIZE { return Err(io::Error::new(io::ErrorKind::InvalidData, "Can't parse data into RawPacket")) } - let data_length = u16::from_be_bytes([data[0x12], data[0x13]]) as usize; - if data.len() < 0x14 + data_length + 4 { + let data_length = (((data[0x12] as u16) << 8) | data[0x13] as u16) as usize; + if data.len() < 0x14 + data_length { return Err(io::Error::new(io::ErrorKind::InvalidData, "Can't parse data into RawPacket")) } - let checksum = as_u32_be(data[(data.len() - 5)..].as_ref()); - if checksum != crc32fast::hash(data[..(data.len() - 4)].as_ref()) { - return Err(io::Error::new(io::ErrorKind::InvalidData, "Checksum does not match")) + let checksum = as_u32_be(data[(data.len() - 4)..].as_ref()); + let built_checksum = crc32fast::hash(data[..(data.len() - 4)].as_ref()); + if checksum != built_checksum { + return Err(io::Error::new(io::ErrorKind::InvalidData, format!("Checksum does not match {checksum:X?} != {built_checksum:X?}"))) } Ok(RawPacket { version: data[0], @@ -25,7 +26,7 @@ impl TryFrom> for RawPacket { reply_to: as_u32_be(data[0x0D..0x11].as_ref()), command: data[0x11], data_length, - data: data[0x14..data_length].to_vec(), + data: data[0x14..(0x14 + data_length)].to_vec(), checksum, }) }