From 7a1155c0bd52314de79f790609b1c00bbd7527f6 Mon Sep 17 00:00:00 2001 From: Tiago Batista Cardoso Date: Sat, 24 Jan 2026 22:32:01 +0100 Subject: [PATCH] carre --- Download/12.text | Bin 4 -> 0 bytes Download/13.text | Bin 4 -> 0 bytes Download/README | Bin 51 -> 0 bytes client-network/src/message_handling.rs | 2 +- client-network/src/registration.rs | 2 +- 5 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 Download/12.text delete mode 100644 Download/13.text delete mode 100644 Download/README diff --git a/Download/12.text b/Download/12.text deleted file mode 100644 index 45ba044c3840ab5567637e81e50aefa81e475543..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4 LcmZQDG~xmP0R;eV diff --git a/Download/13.text b/Download/13.text deleted file mode 100644 index 36bfdb0501469458ba9b508a3754ab7a7b299b61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4 LcmZQDH0A;T0S5qY diff --git a/Download/README b/Download/README deleted file mode 100644 index a3fb69c21205bdc0d14203fbe86e62529cc5a1c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 51 zcmZPwIJ`M4<>;=Xds1~2vNMmiD3lzTsgRtJTUwNte{}Ydc7<|<^rKBjT9XvgauSQH HD)qPkbE_8| diff --git a/client-network/src/message_handling.rs b/client-network/src/message_handling.rs index 11842a2..f50c660 100644 --- a/client-network/src/message_handling.rs +++ b/client-network/src/message_handling.rs @@ -314,7 +314,7 @@ pub fn parse_message( ERROR => { if let Ok(err_received) = - String::from_utf8(received_message[LENGTH..(msg_length + LENGTH)].to_vec()) + String::from_utf8(received_message[LENGTH..(msg_length + LENGTH + 4)].to_vec()) { let err_msg = format!("Error received from peer {} : {}", ip, err_received); let _ = cmd_tx_clone.send(NetworkEvent::Error(err_msg)); diff --git a/client-network/src/registration.rs b/client-network/src/registration.rs index 8d83ba5..608a054 100644 --- a/client-network/src/registration.rs +++ b/client-network/src/registration.rs @@ -66,7 +66,6 @@ pub async fn perform_handshake( match server_addr_query.await { Some(sockaddr_bytes) => { sd.set_servername(username); - sd.set_serveraddress(sockaddr_bytes.to_string()); // first: &SocketAddr let mut payload = Vec::new(); payload.extend_from_slice(&0u32.to_be_bytes()); @@ -74,6 +73,7 @@ pub async fn perform_handshake( let hello_handshake = construct_message(1, payload, id, crypto_pair); if is_server_handshake { sd.add_message(id, EventType::Hello); + sd.set_serveraddress(sockaddr_bytes.to_string()); } else { sd.add_message(id, EventType::HelloThenRootRequest); }