bob/p2p
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

wip registering ip addresses

Browse Source
This commit is contained in:
wikano
2025-12-18 00:34:57 +01:00
parent e902070c82
commit 6ac06ccfe5
4 changed files with 187 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
client-network/src/messages_structure.rs
View File

@@ -11,18 +11,60 @@ pub struct HandshakeMessage {
msg_type: u8,
length: u16,
extensions: u32,
name: [u8; 981],
signature: [u8; 32],
name: Vec<u8>,
signature: Vec<u8>,
}
impl UDPMessage {
pub fn ping(id: u32) -> UDPMessage {
UDPMessage { id: id, msg_type: 0, length: 0, body: [0; 985], signature: [0; 32]}
UDPMessage {
id: id,
msg_type: 0,
length: 0,
body: [0; 985],
signature: [0; 32],
}
}
pub fn error(id: u32) -> UDPMessage {
UDPMessage { id: id, msg_type: 129, length: 0, body: [0; 985], signature: [0; 32]}
UDPMessage {
id: id,
msg_type: 129,
length: 0,
body: [0; 985],
signature: [0; 32],
}
}
pub fn parse(received_message: [u8; 1024]) -> 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");
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,
}
}
pub fn display(&self) {
println!("ID: {:?}", self.id);
println!("Message Type: {}", self.msg_type);
println!("Length: {:?}", self.length);
let good_length = usize::min(self.length as usize, 985);
println!("name: {:?}", &self.body[..good_length]);
println!("Signature: {:?}", self.signature);
}
}
@@ -32,69 +74,74 @@ impl HandshakeMessage {
println!("Message Type: {}", self.msg_type);
println!("Length: {:?}", self.length);
println!("extensions: {:?}", self.extensions);
let good_length = usize::min(self.length as usize, 981);
println!("name: {:?}", &self.name[..good_length]);
println!("name: {:?}", &self.name[..(self.length - 4) as usize]);
println!("Signature: {:?}", self.signature);
}
pub fn hello(id: u32, length: u16, username: String) -> HandshakeMessage {
let username_bytes = username.as_bytes();
let mut name: [u8; 981] = [0; 981];
let length_to_copy = username_bytes.len().min(981);
name[..length_to_copy].copy_from_slice(&username_bytes[..length_to_copy]);
HandshakeMessage {id: id, msg_type: 1, length: length, extensions: 0, name: name, signature: [0;32]}
let name_vec = username.trim_end_matches(char::from(0)).as_bytes().to_vec();
HandshakeMessage {
id: id,
msg_type: 1,
length: length,
extensions: 0,
name: name_vec,
signature: vec![0; 64],
}
}
pub fn helloReply(id: u32, length: u16, username: String) -> HandshakeMessage {
let username_bytes = username.as_bytes();
let mut name: [u8; 981] = [0; 981];
let length_to_copy = username_bytes.len().min(981);
name[..length_to_copy].copy_from_slice(&username_bytes[..length_to_copy]);
HandshakeMessage {id: id, msg_type: 130, length: length, extensions: 0, name: name, signature: [0;32]}
let name_vec = username.trim_end_matches(char::from(0)).as_bytes().to_vec();
HandshakeMessage {
id: id,
msg_type: 130,
length: length,
extensions: 0,
name: name_vec,
signature: vec![0; 64],
}
}
pub fn serialize(&self) -> [u8; 1024] {
let mut buffer = [0u8; 1024];
let mut offset = 0;
pub fn serialize(&self) -> Vec<u8> {
let mut out = Vec::with_capacity(4 + 1 + 2 + 4 + self.name.len() + self.signature.len());
buffer[offset..offset + 4].copy_from_slice(&self.id.to_be_bytes());
offset += 4;
// id: u32 little-endian
out.extend_from_slice(&self.id.to_be_bytes());
buffer[offset] = self.msg_type;
offset += 1;
// msg_type: u8
out.push(self.msg_type);
buffer[offset..offset + 2].copy_from_slice(&self.length.to_be_bytes());
offset += 2;
out.extend_from_slice(&self.length.to_be_bytes());
buffer[offset..offset + 4].copy_from_slice(&self.extensions.to_be_bytes());
offset += 4;
out.extend_from_slice(&self.extensions.to_be_bytes());
buffer[offset..offset + 981].copy_from_slice(&self.name);
offset += 981;
out.extend_from_slice(&self.name);
buffer[offset..offset + 32].copy_from_slice(&self.signature);
buffer
out.extend_from_slice(&self.signature);
out
}
pub fn parse(received_message: [u8; 1024]) -> HandshakeMessage {
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 extensions_bytes: [u8; 4] = received_message[7..11].try_into().expect("Taille incorrecte");
let name_bytes: [u8; 981] = received_message[11..992].try_into().expect("Taille incorrecte");
let signature_bytes: [u8; 32] = received_message[992..1024].try_into().expect("Taille incorrecte");
pub fn parse(received_message: Vec<u8>) -> HandshakeMessage {
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 msg_length = u16::from_be_bytes(length_bytes);
let extensions_bytes: [u8; 4] = received_message[7..11]
.try_into()
.expect("Taille incorrecte");
let name_bytes = &received_message[11..12 + msg_length as usize];
let signature_bytes =
&received_message[12 + msg_length as usize..(13 + msg_length + 32) as usize];
HandshakeMessage {
id: u32::from_be_bytes(id_bytes),
msg_type: received_message[4],
length: u16::from_be_bytes(length_bytes),
extensions: u32::from_be_bytes(extensions_bytes),
name: name_bytes,
signature: signature_bytes,
name: name_bytes.to_vec(),
signature: signature_bytes.to_vec(),
}
}
}
@@ -103,8 +150,6 @@ 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.
@@ -116,7 +161,7 @@ mod tests {
let handshake = HandshakeMessage::hello(0, 12, username);
handshake.display();
}*/
/*#[tokio::test]
async fn parse_handshakemessage() {
let username = String::from("charlie_kirk");
@@ -127,4 +172,3 @@ mod tests {
parsed.display();
}*/
}