feat(secure): add RmcSerialize macro for convenience serializing structs

src/main.rs

@@ -284,9 +284,3 @@ mod test{
         println!("packet: {:?}", packet);
     }
 }
-
-#[derive(RmcSerialize)]
-#[rmc_struct(0)]
-struct MatchmakeParam{
-    params: Vec<(String, Variant)>
-}

src/rmc/structures/connection_data.rs

@@ -17,6 +17,8 @@ impl<'a> RmcSerialize for ConnectionData<'a>{
             self.special_protocols.serialize(v).expect("unable to write special protocols");
             self.special_station_url.serialize(v).expect("unable to write special station url");
             v.write_all(bytes_of(&self.date_time)).expect("unable to write date time");
+
+            Ok(())
         })
     }
 

src/rmc/structures/rmc_struct.rs

@@ -1,5 +1,7 @@
-use std::io::Write;
+use std::io::{Cursor, Read, Write};
 use bytemuck::bytes_of;
+use crate::endianness::{IS_BIG_ENDIAN, ReadExtensions};
+use crate::rmc::structures::Error::VersionMismatch;
 use crate::rmc::structures::Result;
 
 #[repr(C, packed)]
@@ -8,12 +10,12 @@ struct StructureHeader{
     length: u32
 }
 
-pub fn write_struct(mut writer: &mut dyn Write, version: u8, pred: impl Fn(&mut Vec<u8>)) -> Result<()> {
+pub fn write_struct(mut writer: &mut dyn Write, version: u8, pred: impl FnOnce(&mut Vec<u8>) -> Result<()> ) -> Result<()> {
     writer.write_all(&[version])?;
 
     let mut scratch_space: Vec<u8> = Vec::new();
 
-    (pred)(&mut scratch_space);
+    (pred)(&mut scratch_space)?;
 
     let u32_size= scratch_space.len() as u32;
 
@@ -23,3 +25,20 @@ pub fn write_struct(mut writer: &mut dyn Write, version: u8, pred: impl Fn(&mut
     Ok(())
 }
 
+pub fn read_struct<T: Sized>(mut reader: &mut dyn Read, version: u8, pred: impl FnOnce(&mut Cursor<Vec<u8>>) -> Result<T>) -> Result<T> {
+    let ver: u8 = reader.read_struct(IS_BIG_ENDIAN)?;
+
+    if ver != version{
+        return Err(VersionMismatch(ver));
+    }
+
+    let size: u32 = reader.read_struct(IS_BIG_ENDIAN)?;
+
+    let mut vec = vec![0u8; size as usize];
+
+    reader.read_exact(&mut vec)?;
+
+    let mut cursor = Cursor::new(vec);
+
+    Ok(pred(&mut cursor)?)
+}