strix/domo
strix/domo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat: new stuff

Browse source
This commit is contained in:
Strix 2023-10-15 18:06:34 +02:00
parent 3eece7ecd9
commit f88706bac8
No known key found for this signature in database
GPG key ID: 49B2E37B8915B774
20 changed files with 232 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

4
domo_proto/src/commands/node_management/vec.rs
View file

@ -5,7 +5,9 @@ impl Into<Vec<u8>> for NodeManagementCommand {
fn into(self) -> Vec<u8> {
match self {
NodeManagementCommand::Ping => vec![],
NodeManagementCommand::RegisterNode { device_id } => device_id.bytes.to_vec(),
NodeManagementCommand::RegisterNode { device_id } => {
vec![device_id.bytes[0], device_id.bytes[1], device_id.bytes[2], device_id.bytes[3]]
},
NodeManagementCommand::RemoveNode => vec![],
NodeManagementCommand::RegisterProperty { property_name, data_type, read_only } => {
let mut vec = vec![];

4
domo_proto/src/packet/packet_data.rs
View file

@ -31,7 +31,9 @@ impl PacketData {
impl TryFrom<RawPacket> for PacketData {
type Error = io::Error;
fn try_from(raw_packet: RawPacket) -> io::Result<Self> {
match raw_packet.command {
match {
raw_packet.command >> 4
} {
0x0 => Ok(PacketData::NodeManagement(NodeManagementCommand::try_from(raw_packet)?)),
0x1 => Ok(PacketData::PropertyControl(PropertyControlCommand::try_from(raw_packet)?)),
_ => Err(io::Error::new(io::ErrorKind::InvalidInput, "command group is unsupported"))

4
domo_proto/src/packet/raw_packet/packet.rs
View file

@ -40,6 +40,10 @@ impl Into<Packet> for RawPacket {
reply_to: Identifier::from(self.reply_to),
command: self.command,
data: PacketData::try_from(self.clone())
.map_err(|e| {
println!("{}", e);
e
})
.unwrap_or(PacketData::Raw(self.data)),
}
}

3
domo_proto/src/packet/raw_packet/vec.rs
View file

@ -10,10 +10,11 @@ impl TryFrom<Vec<u8>> for RawPacket {
return Err(io::Error::new(io::ErrorKind::InvalidData, "Can't parse data into RawPacket"))
}
let data_length = (((data[0x12] as u16) << 8) | data[0x13] as u16) as usize;
println!("LENGTH {data_length}");
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() - 4)..].as_ref());
let checksum = as_u32_be(data[(0x14 + data_length)..].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?}")))