code cleanup and documentation
This commit is contained in:
@@ -2,8 +2,8 @@ pub struct UDPMessage {
|
||||
id: u32,
|
||||
msg_type: u8,
|
||||
length: u16,
|
||||
body: [u8; 985],
|
||||
signature: [u8; 32],
|
||||
body: Vec<u8>,
|
||||
signature: Vec<u8>,
|
||||
}
|
||||
|
||||
pub struct HandshakeMessage {
|
||||
@@ -21,8 +21,8 @@ impl UDPMessage {
|
||||
id: id,
|
||||
msg_type: 0,
|
||||
length: 0,
|
||||
body: [0; 985],
|
||||
signature: [0; 32],
|
||||
body: vec![0; 985],
|
||||
signature: vec![0; 32],
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,30 +31,28 @@ impl UDPMessage {
|
||||
id: id,
|
||||
msg_type: 129,
|
||||
length: 0,
|
||||
body: [0; 985],
|
||||
signature: [0; 32],
|
||||
body: vec![0; 985],
|
||||
signature: vec![0; 32],
|
||||
}
|
||||
}
|
||||
|
||||
pub fn parse(received_message: [u8; 1024]) -> UDPMessage {
|
||||
pub fn parse(received_message: Vec<u8>) -> UDPMessage {
|
||||
let id_bytes: [u8; 4] = received_message[0..4]
|
||||
.try_into()
|
||||
.expect("Taille incorrecte");
|
||||
let length_bytes: [u8; 2] = received_message[5..7]
|
||||
.try_into()
|
||||
.expect("Taille incorrecte");
|
||||
let name_bytes: [u8; 985] = received_message[7..992]
|
||||
.try_into()
|
||||
.expect("Taille incorrecte");
|
||||
let signature_bytes: [u8; 32] = received_message[992..1024]
|
||||
.try_into()
|
||||
.expect("Taille incorrecte");
|
||||
let msg_length = u16::from_be_bytes(length_bytes);
|
||||
let name_bytes = &received_message[7..msg_length as usize + 8];
|
||||
let signature_bytes =
|
||||
&received_message[msg_length as usize + 8..msg_length as usize + 9 + 32];
|
||||
UDPMessage {
|
||||
id: u32::from_be_bytes(id_bytes),
|
||||
msg_type: received_message[4],
|
||||
length: u16::from_be_bytes(length_bytes),
|
||||
body: name_bytes,
|
||||
signature: signature_bytes,
|
||||
body: name_bytes.to_vec(),
|
||||
signature: signature_bytes.to_vec(),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -146,23 +144,21 @@ impl HandshakeMessage {
|
||||
}
|
||||
}
|
||||
|
||||
fn convert_to_u16(bytes: [u8; 2]) -> u16 {
|
||||
((bytes[0] as u16) << 8) | (bytes[1] as u16)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
// Note this useful idiom: importing names from outer (for mod tests) scope.
|
||||
use super::*;
|
||||
|
||||
/*#[tokio::test]
|
||||
async fn creating_cryptographic_signature() {
|
||||
/// creates an handshake message
|
||||
#[tokio::test]
|
||||
async fn creating_handshake_msg() {
|
||||
let username = String::from("charlie_kirk");
|
||||
let handshake = HandshakeMessage::hello(0, 12, username);
|
||||
handshake.display();
|
||||
}*/
|
||||
}
|
||||
|
||||
/*#[tokio::test]
|
||||
/// parses an handshake message
|
||||
#[tokio::test]
|
||||
async fn parse_handshakemessage() {
|
||||
let username = String::from("charlie_kirk");
|
||||
let handshake = HandshakeMessage::hello(0, 12, username);
|
||||
@@ -170,5 +166,5 @@ mod tests {
|
||||
let parsed = HandshakeMessage::parse(ser);
|
||||
handshake.display();
|
||||
parsed.display();
|
||||
}*/
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user