tmp #1

Merged
wikano merged 5 commits from tmp into master 2026-01-11 20:58:32 +00:00
2 changed files with 4 additions and 6 deletions
Showing only changes of commit 92f38c9c12 - Show all commits

View File

@@ -63,8 +63,7 @@ pub fn handle_recevied_message(
.expect("Taille incorrecte");
let msg_length = u16::from_be_bytes(length_bytes) as usize;
let ilength = u16::from_be_bytes(length_bytes);
let received_name =
&recevied_message[LENGTH + EXTENSIONS..LENGTH + EXTENSIONS + ilength as usize];
let received_name = &recevied_message[LENGTH + EXTENSIONS..LENGTH + ilength as usize];
let name = String::from_utf8(received_name.to_vec()).expect("wrong name");
if name.clone() == server_name.clone() {
is_resp_to_server_handshake = true;
@@ -172,8 +171,8 @@ pub fn parse_message(
match msgtype {
HELLO | HELLOREPLY | ROOTREPLY | NODATUM | NATTRAVERSALREQUEST | NATTRAVERSALREQUEST2 => {
let ilength = u16::from_be_bytes(length_bytes);
let received_name =
&received_message[LENGTH + EXTENSIONS..LENGTH + EXTENSIONS + ilength as usize];
println!("name received length: {}", ilength);
let received_name = &received_message[LENGTH + EXTENSIONS..LENGTH + ilength as usize];
let received_username = String::from_utf8(received_name.to_vec());
match received_username {
Ok(username) => {

View File

@@ -44,8 +44,7 @@ pub fn construct_message(
message.extend_from_slice(&a.to_be_bytes());
message.extend_from_slice(&payload);
let signature = sign_message(crypto_pair, &message);
message.extend_from_slice(&signature);
return Some(message);
return Some(signature);
}
PING | OK => {
message.extend_from_slice(&0u16.to_be_bytes());