wip messages creation & handling

client-network/src/registration.rs

@@ -4,6 +4,7 @@ use getrandom::Error;
 use crate::cryptographic_signature::{CryptographicSignature, formatPubKey, sign_message};
 use crate::message_handling::EventType;
 use crate::messages_channels::{Message, MultipleSenders};
+use crate::messages_structure::construct_message;
 use std::collections::HashMap;
 use std::net::SocketAddr;
 use std::net::UdpSocket;
@@ -72,17 +73,17 @@ pub fn register_ip_addresses(
     messages_list: &Mutex<HashMap<i32, EventType>>,
     id: i32,
 ) {
-    let username_size = crypto_pair.username.len();
-    let hello_handshake = HandshakeMessage::hello(
-        id as u32,
-        username_size as u16 + 4,
-        crypto_pair.username.clone(),
-    );
-    //HandshakeMessage::display(&hello_handshake);
-    let hello_handshake_serialized = hello_handshake.serialize();
-    let message_signed = sign_message(crypto_pair, &hello_handshake_serialized);
-    senders.send_via(0, message_signed, server_uri, false);
-    let mut list = messages_list.lock().expect("Failed to lock messages_list");
+    let mut payload = Vec::new();
+    payload.extend_from_slice(&0u32.to_be_bytes());
+    payload.extend_from_slice(&crypto_pair.username.clone().as_bytes());
+    let hello_handshake = construct_message(1, payload, id, crypto_pair);
+    match hello_handshake {
+        Some(handshake_message) => {
+            senders.send_via(0, handshake_message, server_uri, false);
+        }
+        None => {}
+    }
+    /*let mut list = messages_list.lock().expect("Failed to lock messages_list");
     match list.get(&id) {
         Some(_) => {
             list.remove(&id);
@@ -91,7 +92,7 @@ pub fn register_ip_addresses(
             list.insert(id, EventType::ServerHelloReply);
         }
     }
-    println!("message sent: {}", &id);
+    println!("message sent: {}", &id);*/
     // 3. Perform the insertion
     /*let mut buf = [0u8; 1024];
     socket.recv_from(&mut buf).expect("receive failed");