working

.gitignore

@@ -1,2 +1 @@
-/target
+/target
-target/

client-gui/src/main.rs

@@ -32,7 +32,7 @@ async fn main() -> eframe::Result<()> {
     eframe::run_native(
         "p2p-merkle client",
         options,
-        Box::new(|_| {
+        Box::new(|cc| {
             let app = P2PClientApp::new(network_cmd_tx, network_event_rx);
             Ok(Box::new(app))
         }),

client-network/src/cryptographic_signature.rs

@@ -134,7 +134,7 @@ pub fn sign_message(crypto_pair: &CryptographicSignature, message: &Vec<u8>) ->
 #[cfg(test)]
 mod tests {
     use super::*;
-    /*
+
     ///
     /// creates a cryptographic signature
     ///
@@ -144,7 +144,7 @@ mod tests {
         let crypto_pair = CryptographicSignature::new(username);
         let formatted_pubkey = formatPubKey(crypto_pair);
         println!("pubkey : {}", formatted_pubkey);
-    }*/
+    }
 
     /*#[test]
     fn signing_message() {

client-network/src/data.rs

@@ -1,15 +1,7 @@
 use rand::{Rng, rng};
-use sha2::{Digest, Sha256};
 use std::collections::HashMap;
 use std::hash::{DefaultHasher, Hash, Hasher};
 
-use std::fs::{File, OpenOptions, create_dir};
-use std::io::{self, Write};
-
-use std::env;
-
-use crate::data;
-
 // --- Constants ---
 pub const MAX_CHUNK_DATA_SIZE: usize = 1024;
 pub const MAX_DIRECTORY_ENTRIES: usize = 16;
@@ -32,9 +24,9 @@ pub enum MerkleNode {
     // 0 to 16 directory entries.
     Directory(DirectoryNode) = 1,
     // list of 2 to 32 hashes pointing to Chunk or Big nodes.
-    Big(BigNode) = 2,
+    Big(BigNode) = 3,
     // list of 2 to 32 hashes pointing to Directory or BigDirectory nodes.
-    BigDirectory(BigDirectoryNode) = 3,
+    BigDirectory(BigDirectoryNode) = 4,
 }
 
 #[derive(Debug, Clone)]
@@ -47,9 +39,6 @@ impl MerkleTree {
     pub fn new(data: HashMap<NodeHash, MerkleNode>, root: NodeHash) -> MerkleTree {
         MerkleTree { data, root }
     }
-    pub fn clear_data(&mut self) {
-        self.data.clear();
-    }
 }
 
 #[derive(Debug, Clone)]
@@ -154,8 +143,8 @@ impl MerkleNode {
         match self {
             MerkleNode::Chunk(_) => 0,
             MerkleNode::Directory(_) => 1,
-            MerkleNode::Big(_) => 2,
+            MerkleNode::Big(_) => 3,
-            MerkleNode::BigDirectory(_) => 3,
+            MerkleNode::BigDirectory(_) => 4,
         }
     }
 
@@ -187,336 +176,3 @@ impl MerkleNode {
         bytes
     }
 }
-
-fn hash(data: &[u8]) -> NodeHash {
-    let root_hash = Sha256::digest(&data);
-    println!("root hash: {:?}", root_hash);
-    let res: NodeHash = root_hash.try_into().expect("incorrect size");
-    res
-    /*let mut hasher = DefaultHasher::new();
-    data.hash(&mut hasher);
-    let hash_u64 = hasher.finish();
-
-    let mut hash_array = [0u8; FILENAME_HASH_SIZE];
-    // Simple way to spread a 64-bit hash across 32 bytes for a unique-ish ID
-    for i in 0..8 {
-        hash_array[i] = (hash_u64 >> (i * 8)) as u8;
-    }
-    hash_array // The rest remains 0, satisfying the 32-byte requirement
-    */
-}
-
-fn generate_random_filename() -> [u8; FILENAME_HASH_SIZE] {
-    let mut rng = rand::rng();
-    let mut filename_bytes = [0; FILENAME_HASH_SIZE];
-
-    // Generate a random length for the base name
-    let name_len = rng.random_range(5..21);
-
-    // Generate random alphanumeric characters
-    for i in 0..name_len {
-        let char_code = rng.random_range(97..123); // 'a' through 'z'
-        if i < FILENAME_HASH_SIZE {
-            filename_bytes[i] = char_code as u8;
-        }
-    }
-
-    // Append a common extension
-    let ext = if rng.random_bool(0.5) { ".txt" } else { ".dat" };
-    let ext_bytes = ext.as_bytes();
-    let start_index = name_len.min(FILENAME_HASH_SIZE - ext_bytes.len());
-    if start_index < FILENAME_HASH_SIZE {
-        filename_bytes[start_index..(start_index + ext_bytes.len())].copy_from_slice(ext_bytes);
-    }
-
-    filename_bytes
-}
-
-fn generate_random_file_node(
-    storage: &mut HashMap<NodeHash, MerkleNode>,
-) -> Result<NodeHash, String> {
-    let mut rng = rng();
-    let is_big = rng.random_bool(0.2); // 20% chance of being a big file
-
-    if !is_big {
-        // Generate a simple Chunk Node
-        let node = MerkleNode::Chunk(ChunkNode::new_random());
-        let hash = hash(&node.serialize());
-        storage.insert(hash, node);
-        Ok(hash)
-    } else {
-        // Generate a Big Node (a file composed of chunks)
-        let num_children = rng.random_range(MIN_BIG_CHILDREN..=MAX_BIG_CHILDREN.min(8)); // Limit complexity
-        let mut children_hashes = Vec::with_capacity(num_children);
-
-        for _ in 0..num_children {
-            // Children must be Chunk or Big; for simplicity, we only generate Chunk children here.
-            let chunk_node = MerkleNode::Chunk(ChunkNode::new_random());
-            let chunk_hash = hash(&chunk_node.serialize());
-            storage.insert(chunk_hash, chunk_node);
-            children_hashes.push(chunk_hash);
-        }
-
-        let node = MerkleNode::Big(BigNode::new(children_hashes)?);
-        let hash = hash(&node.serialize());
-        storage.insert(hash, node);
-        Ok(hash)
-    }
-}
-
-fn generate_random_directory_node(
-    depth: u32,
-    max_depth: u32,
-    storage: &mut HashMap<NodeHash, MerkleNode>,
-) -> Result<NodeHash, String> {
-    let mut rng = rng();
-    let current_depth = depth + 1;
-    let is_big_dir = rng.random_bool(0.3) && current_depth < max_depth;
-
-    if !is_big_dir || current_depth >= max_depth {
-        // Generate a simple Directory Node (leaf level directory)
-        let num_entries = rng.random_range(1..=MAX_DIRECTORY_ENTRIES.min(5)); // Limit directory size for testing
-        let mut entries = Vec::with_capacity(num_entries);
-
-        for _ in 0..num_entries {
-            if rng.random_bool(0.7) {
-                // 70% chance of creating a file (Chunk/Big)
-                let file_hash = generate_random_file_node(storage)?;
-                let entry = DirectoryEntry {
-                    filename: generate_random_filename(),
-                    content_hash: file_hash,
-                };
-                entries.push(entry);
-            } else if current_depth < max_depth {
-                // 30% chance of creating a subdirectory
-                let dir_hash = generate_random_directory_node(current_depth, max_depth, storage)?;
-
-                // Create a basic directory entry name
-                let mut filename_bytes = [0; 32];
-                let subdir_name = format!("dir_{}", current_depth);
-                filename_bytes[..subdir_name.len()].copy_from_slice(subdir_name.as_bytes());
-
-                let entry = DirectoryEntry {
-                    filename: filename_bytes,
-                    content_hash: dir_hash,
-                };
-                entries.push(entry);
-            }
-        }
-
-        let node = MerkleNode::Directory(DirectoryNode::new(entries)?);
-        let hash = hash(&node.serialize());
-        storage.insert(hash, node);
-        Ok(hash)
-    } else {
-        // Generate a BigDirectory Node (internal directory structure)
-        let num_children = rng.random_range(MIN_BIG_CHILDREN..=MAX_BIG_CHILDREN.min(4)); // Limit children count
-        let mut children = Vec::with_capacity(num_children);
-
-        for _ in 0..num_children {
-            // Children must be Directory or BigDirectory
-            let child_hash = generate_random_directory_node(current_depth, max_depth, storage)?;
-            children.push(child_hash);
-        }
-
-        let node = MerkleNode::BigDirectory(BigDirectoryNode::new(children)?);
-        let hash = hash(&node.serialize());
-        storage.insert(hash, node);
-        Ok(hash)
-    }
-}
-
-pub fn generate_random_tree(
-    max_depth: u32,
-) -> Result<(NodeHash, HashMap<NodeHash, MerkleNode>), String> {
-    let mut storage = HashMap::new();
-
-    // Start tree generation from the root directory at depth 0
-    let root_hash = generate_random_directory_node(0, max_depth, &mut storage)?;
-
-    Ok((root_hash, storage))
-}
-
-pub fn generate_base_tree() -> MerkleTree {
-    let mut res = HashMap::new();
-
-    let bob_content = "where is bob".to_string().into_bytes();
-    let alice_content = "alice".to_string().into_bytes();
-    let oscar_content = "oscar is the opponent".to_string().into_bytes();
-
-    let mut children_nodes = Vec::new();
-    for i in 0..10 {
-        let mut i_nodes = Vec::new();
-        for j in 0..10 {
-            let node1 = MerkleNode::Chunk(ChunkNode::new(bob_content.clone()).unwrap());
-            let hash = hash(&node1.serialize());
-            i_nodes.push(hash);
-            res.insert(hash, node1);
-        }
-        let bignode = MerkleNode::Big(BigNode::new(i_nodes).unwrap());
-        let hashbig = hash(&bignode.serialize());
-        children_nodes.push(hashbig);
-        res.insert(hashbig, bignode);
-    }
-
-    let bignode = MerkleNode::Big(BigNode::new(children_nodes).unwrap());
-    let hashbig = hash(&bignode.serialize());
-
-    let node1 = MerkleNode::Chunk(ChunkNode::new(bob_content).unwrap());
-    let hash1 = hash(&node1.serialize());
-
-    let node2 = MerkleNode::Chunk(ChunkNode::new(alice_content).unwrap());
-    let hash2 = hash(&node2.serialize());
-
-    //res.insert(hash1, node1);
-    //res.insert(hash2, node2);
-    res.insert(hashbig, bignode);
-
-    let node3 = MerkleNode::Chunk(ChunkNode::new(oscar_content).unwrap());
-    let hash3 = hash(&node3.serialize());
-
-    //res.insert(hash3, node3);
-
-    let dir1 = MerkleNode::Directory(DirectoryNode {
-        entries: [DirectoryEntry {
-            filename: generate_random_filename(),
-            content_hash: hash3,
-        }]
-        .to_vec(),
-    });
-    let hash_dir1 = hash(&dir1.serialize());
-
-    //res.insert(hash_dir1, dir1);
-
-    let root = MerkleNode::Directory(DirectoryNode {
-        entries: [
-            DirectoryEntry {
-                filename: generate_random_filename(),
-                content_hash: hashbig,
-            },
-            /*DirectoryEntry {
-                filename: generate_random_filename(),
-                content_hash: hash2,
-            },
-            DirectoryEntry {
-                filename: generate_random_filename(),
-                content_hash: hash_dir1,
-            },*/
-        ]
-        .to_vec(),
-    });
-
-    let root_hash = Sha256::digest(&root.serialize());
-    println!("root hash: {:?}", root_hash);
-    res.insert(root_hash.try_into().expect("incorrect size"), root);
-
-    MerkleTree::new(res, root_hash.try_into().expect("incorrect size"))
-}
-
-pub fn node_to_file(tree: &MerkleTree, node: &MerkleNode, path: String, i: u8) {
-    match node.clone() {
-        MerkleNode::Directory(dir) => {
-            if i != 0 {
-                let new_path = format!("{}/fold_{}", path.clone(), i);
-                match create_dir(new_path.clone()) {
-                    Ok(_) => println!("Directory created successfully!"),
-                    Err(e) => println!("Failed to create directory: {}", e),
-                }
-            }
-            for entry in dir.entries {
-                // creer un fichier pour chaque entry
-                if let Ok(filename_str) = String::from_utf8(entry.filename.to_vec()) {
-                    let new_name = format!("{}{}", path.clone(), remove_null_bytes(&filename_str));
-
-                    println!("new_name: {}", new_name);
-                    let file = OpenOptions::new()
-                        .append(true)
-                        .create(true)
-                        .open(new_name.clone());
-                    match file {
-                        Ok(mut fileok) => {
-                            if let Some(current) = tree.data.get(&entry.content_hash) {
-                                big_or_chunk_to_file(&tree, &current, &mut fileok);
-                            }
-                        }
-                        Err(e) => {
-                            eprintln!("error creaation file: {}", e);
-                        }
-                    }
-                }
-            }
-        }
-        MerkleNode::BigDirectory(bigdir) => {
-            for entry in bigdir.children_hashes.iter() {
-                if let Some(current) = tree.data.get(entry) {
-                    node_to_file(tree, current, path.clone(), i + 1);
-                }
-            }
-        }
-        _ => {
-            eprintln!("invalid type of dir");
-        }
-    }
-}
-
-pub fn remove_null_bytes(input: &str) -> String {
-    input.chars().filter(|&c| c != '\0').collect()
-}
-
-pub fn big_or_chunk_to_file(tree: &MerkleTree, node: &MerkleNode, file: &mut File) {
-    match node {
-        MerkleNode::Big(big) => {
-            for entry in big.children_hashes.iter() {
-                if let Some(current) = tree.data.get(entry) {
-                    big_or_chunk_to_file(tree, current, file);
-                }
-            }
-        }
-        MerkleNode::Chunk(chunk) => {
-            println!("wrote data");
-            let _ = file.write_all(&chunk.data);
-        }
-        _ => {
-            println!("invalid type of file");
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    ///
-    /// creates a cryptographic signature
-    ///
-    #[test]
-    fn test_saving_tree() {
-        if let Ok(current_dir) = env::current_dir() {
-            println!("Current working directory: {:?}", current_dir);
-        }
-
-        println!("--------- tree test starts ------------");
-
-        match create_dir("../Download/") {
-            Ok(_) => println!("Directory created successfully!"),
-            Err(e) => println!("Failed to create directory: {}", e),
-        }
-        let tree = generate_base_tree();
-
-        println!("--------- test tree created ------------");
-        if let Some(root_node) = tree.data.get(&tree.root) {
-            node_to_file(&tree, root_node, "../Download/".to_string(), 0);
-        }
-    }
-
-    /*#[test]
-    fn signing_message() {
-        let username = String::from("gamixtreize");
-        let crypto_pair = CryptographicSignature::new(username.clone());
-        let handshake = HandshakeMessage::hello(0, 12, username);
-        let ser = handshake.serialize();
-        let signed_message = sign_message(&crypto_pair, &ser);
-        println!("unsigned_message: {:?}", ser);
-        println!("signed_message: {:?}", signed_message);
-    }*/
-}

client-network/src/datum_parsing.rs

@@ -11,9 +11,9 @@ pub fn parse_received_datum(
     datum_length: usize,
 ) -> Option<([u8; 32], MerkleNode)> {
     let hash_name: [u8; 32] = recevied_datum[..32].try_into().expect("error");
-    let value = &recevied_datum[32..recevied_datum.len()];
+    let sigstart = datum_length - 64;
+    let value = &recevied_datum[32..sigstart];
     let value_slice = value.to_vec();
-    println!("valueslice: {:?}, {}", value_slice, value_slice.len());
     let datum_type = value_slice[0];
     match datum_type {
         CHUNK => Some((
@@ -21,17 +21,14 @@ pub fn parse_received_datum(
             MerkleNode::Chunk(crate::ChunkNode { data: value_slice }),
         )),
         DIRECTORY => {
+            let nb_entries = value_slice[1];
             let mut dir_entries = Vec::new();
             let mut offset = 1 as usize;
-            for i in 0..((value_slice.len() - 1) / 64) as u8 {
+            for i in 0..nb_entries {
-                offset = (1 + 64 * i as usize) as usize;
+                offset = (offset as u8 + 64 * i) as usize;
-                println!("offset:{}, i:{}", offset, i);
+                let name = &recevied_datum[offset..offset + 32];
-                let name = &value_slice[offset..offset + 32];
                 let mut hash = [0u8; 32];
-                hash.copy_from_slice(&value_slice[offset + 32..offset + 64]);
+                hash.copy_from_slice(&recevied_datum[offset + 32..offset + 64]);
-                let dp_name = String::from_utf8(name.to_vec()).expect("err");
-                println!("name:{}", dp_name);
-
                 // envoyer un datum request
                 dir_entries.push(DirectoryEntry {
                     filename: name.try_into().expect("incorrect size"),
@@ -49,38 +46,35 @@ pub fn parse_received_datum(
             }
         }
         BIG => {
-            let mut bigdir_entries: Vec<NodeHash> = Vec::new();
+            let chlidren: Vec<NodeHash> = Vec::new();
-            let mut offset = 1 as usize;
-            for i in 0..((value_slice.len() - 1) / 32) as u8 {
-                offset = (1 + 32 * i as usize) as usize;
-                println!("offset:{}, i:{}", offset, i);
-                let hash = &value_slice[offset..offset + 32];
-
-                // envoyer un datum request
-                bigdir_entries.push(hash.try_into().expect("incorrect size"));
-            }
-
-            println!("its a BIG bro");
             Some((
                 hash_name,
                 MerkleNode::Big(crate::BigNode {
-                    children_hashes: bigdir_entries,
+                    children_hashes: chlidren,
                 }),
             ))
+            /*let chlidren: Vec<NodeHash> = Vec::new();
+            tree.data.insert(
+                hash_name,
+                MerkleNode::Big(crate::BigNode {
+                    children_hashes: chlidren,
+                }),
+            );*/
         }
         BIGDIRECTORY => {
-            let mut bigdir_entries: Vec<NodeHash> = Vec::new();
+            let nb_entries = value_slice[1];
+            let mut dir_entries = Vec::new();
             let mut offset = 1 as usize;
-            for i in 0..((value_slice.len() - 1) / 32) as u8 {
+            for i in 0..nb_entries {
-                offset = (1 + 32 * i as usize) as usize;
+                offset = (offset as u8 + 64 * i) as usize;
-                println!("offset:{}, i:{}", offset, i);
+                let name = &recevied_datum[offset..offset + 32];
-                let hash = &value_slice[offset..offset + 32];
+                let mut hash = [0u8; 32];
-
+                hash.copy_from_slice(&recevied_datum[offset + 32..offset + 64]);
                 // envoyer un datum request
-                bigdir_entries.push(hash.try_into().expect("incorrect size"));
+                dir_entries.push(hash);
             }
 
-            let current = BigDirectoryNode::new(bigdir_entries);
+            let current = BigDirectoryNode::new(dir_entries);
             match current {
                 Ok(current_node) => Some((hash_name, MerkleNode::BigDirectory(current_node))),
                 Err(e) => {

client-network/src/lib.rs

@@ -13,23 +13,18 @@ mod threads_handling;
 mod timestamp;
 
 use crate::fetchsocketaddresserror::FetchSocketAddressError;
-use crate::messages_structure::ROOTREPLY;
 use crate::peers_refresh::*;
 use crate::timestamp::Timestamp;
 use crate::{
     cryptographic_signature::CryptographicSignature,
     message_handling::EventType,
     messages_channels::{MultipleSenders, start_receving_thread, start_retry_thread},
-    messages_structure::{
+    messages_structure::{NATTRAVERSALREQUEST, PING, ROOTREQUEST, construct_message},
-        DATUM, DATUMREQUEST, NATTRAVERSALREQUEST, NATTRAVERSALREQUEST2, NODATUM, PING, ROOTREQUEST,
-        construct_message,
-    },
     peers_refresh::HandshakeHistory,
     registration::{parse_addresses, perform_handshake, register_with_the_server},
     server_communication::{generate_id, get_peer_list},
     threads_handling::Worker,
 };
-use std::collections::HashSet;
 use std::{
     io::Error,
     net::{IpAddr, Ipv4Addr, UdpSocket},
@@ -181,11 +176,7 @@ pub enum NetworkCommand {
     Disconnect(),
     ResetServerPeer(),
     Discover(String, String, String),
-    GetChildren([u8; 32], String, bool),
+    GetChildren(String, String),
-    SendDatum(MerkleNode, [u8; 32], String),
-    SendNoDatum(Vec<u8>, String),
-    SendRootReply(Vec<u8>, String),
-    InitDownload([u8; 32], String, String),
     // ...
 }
 
@@ -194,17 +185,15 @@ pub enum NetworkEvent {
     Connected(String),
     ConnectedHandshake(),
     Disconnected(),
-    Error(String, String),
+    Error(String),
-    Success(String, String),
+    Success(String),
+    PeerConnected(String),
     PeerListUpdated(Vec<(String, bool)>),
-    FileTreeReceived([u8; 32], MerkleNode, String), // peer_id, content
+    FileTreeReceived([u8; 32], MerkleNode), // peer_id, content
-    DataReceived([u8; 32], MerkleNode, String),
+    DataReceived(String, MerkleNode),
     FileTreeRootReceived(String, NodeHash),
     HandshakeFailed(),
     ServerHandshakeFailed(String),
-    DatumRequest([u8; 32], String),
-    RootRequest(String),
-    InitDownload([u8; 32], String, String),
     // ...
 }
 
@@ -245,84 +234,6 @@ pub fn start_p2p_executor(
             // Check for commands from the GUI
             if let Ok(cmd) = cmd_rx.try_recv() {
                 match cmd {
-                    NetworkCommand::InitDownload(hash, ip, name) => {
-                        if let Some(sd) = shared_data.as_ref() {
-                            if let Some(res) = sd.handshake_peers.get_peer_info_username(ip) {
-                                let _ = event_tx.send(NetworkEvent::InitDownload(
-                                    hash,
-                                    res.ip.to_string(),
-                                    name.to_string(),
-                                ));
-                            }
-                        }
-                    }
-                    NetworkCommand::SendRootReply(node_hash, addr) => {
-                        if let Some(sd) = shared_data.as_mut() {
-                            let mut payload = Vec::new();
-                            payload.extend_from_slice(&node_hash);
-                            let new_id = generate_id();
-                            let message =
-                                construct_message(ROOTREPLY, payload, new_id, sd.cryptopair_ref());
-
-                            match message {
-                                None => {}
-                                Some(resp_msg) => {
-                                    println!("msg_sent:{:?}", resp_msg);
-                                    sd.senders_ref().send_dispatch(
-                                        resp_msg,
-                                        addr.clone(),
-                                        false,
-                                        sd.messages_list(),
-                                    );
-                                }
-                            }
-                        }
-                    }
-                    NetworkCommand::SendNoDatum(node_hash, addr) => {
-                        if let Some(sd) = shared_data.as_mut() {
-                            let mut payload = Vec::new();
-                            payload.extend_from_slice(&node_hash);
-                            let new_id = generate_id();
-                            let message =
-                                construct_message(NODATUM, payload, new_id, sd.cryptopair_ref());
-
-                            match message {
-                                None => {}
-                                Some(resp_msg) => {
-                                    println!("msg_sent:{:?}", resp_msg);
-                                    sd.senders_ref().send_dispatch(
-                                        resp_msg,
-                                        addr.clone(),
-                                        false,
-                                        sd.messages_list(),
-                                    );
-                                }
-                            }
-                        }
-                    }
-                    NetworkCommand::SendDatum(merklennode, node_hash, addr) => {
-                        if let Some(sd) = shared_data.as_mut() {
-                            let mut payload = Vec::new();
-                            payload.extend_from_slice(&node_hash);
-                            payload.extend_from_slice(&merklennode.serialize());
-                            let new_id = generate_id();
-                            let message =
-                                construct_message(DATUM, payload, new_id, sd.cryptopair_ref());
-
-                            match message {
-                                None => {}
-                                Some(resp_msg) => {
-                                    println!("msg_sent:{:?}", resp_msg);
-                                    sd.senders_ref().send_dispatch(
-                                        resp_msg,
-                                        addr.clone(),
-                                        false,
-                                        sd.messages_list(),
-                                    );
-                                }
-                            }
-                        }
-                    }
                     NetworkCommand::ServerHandshake(username, ip) => {
                         println!("server handshake called");
                         if let Some(sd) = shared_data.as_mut() {
@@ -339,53 +250,9 @@ pub fn start_p2p_executor(
                                 sd.messages_list(),
                                 sd.handshake_peers.get_username_peerinfo_map(),
                             );
-                            let server_address = {
-                                match get_server_address(username.to_owned(), ip.to_owned()).await {
-                                    Some(addr) => addr.to_string(),
-                                    None => {
-                                        match event_tx.send(NetworkEvent::Error(
-                                            "Couldn't fetch server socket address.".to_owned(),
-                                            username.to_owned(),
-                                        )) {
-                                            Ok(_) => {}
-                                            Err(e) => {
-                                                println!("Network Event Error : {}", e.to_string());
-                                            }
-                                        }
-                                        "".to_owned()
-                                    }
-                                }
-                            };
-                            if server_address.to_owned().eq(&"".to_owned()) {
-                                continue;
-                            }
 
-                            sd.set_servername(username.to_owned());
+                            let res =
-                            sd.set_serveraddress(server_address.to_string());
+                                perform_handshake(&sd, username, ip, event_tx.clone(), true).await;
-                            println!("SET SERVERADDRESS");
-
-                            match perform_handshake(
-                                &sd,
-                                username.to_owned(),
-                                ip,
-                                event_tx.clone(),
-                                (true, server_address.to_string()),
-                            )
-                            .await
-                            {
-                                true => {
-                                    match event_tx.send(NetworkEvent::Success(
-                                        "Handshake established ✔️".to_string(),
-                                        username.to_owned(),
-                                    )) {
-                                        Ok(_) => {}
-                                        Err(err) => {
-                                            println!("Network Event Error : {}", err.to_string());
-                                        }
-                                    };
-                                }
-                                false => {}
-                            };
                         } else {
                             println!("no shared data");
                         }
@@ -403,9 +270,7 @@ pub fn start_p2p_executor(
                     NetworkCommand::Discover(username, hash, ip) => {
                         // envoie un handshake au peer, puis un root request
                         if let Some(sd) = shared_data.as_ref() {
-                            let res = sd
+                            let res = sd.handshake_peers.get_peer_info_username(username.clone());
-                                .handshake_peers
-                                .get_peer_info_username(username.to_owned());
                             match res {
                                 Some(peerinfo) => {
                                     let id = generate_id();
@@ -440,72 +305,22 @@ pub fn start_p2p_executor(
                                 }
                                 None => {
                                     // envoyer un handshake
-                                    match perform_handshake(
+                                    let res = perform_handshake(
                                         &sd,
-                                        username.to_owned(),
+                                        username,
                                         ip,
                                         event_tx.clone(),
-                                        (false, "".to_string()),
+                                        false,
                                     )
-                                    .await
+                                    .await;
-                                    {
-                                        true => {
-                                            match event_tx.send(NetworkEvent::Success(
-                                                "Handshake established ✔️".to_string(),
-                                                username.to_owned(),
-                                            )) {
-                                                Ok(_) => {}
-                                                Err(err) => {
-                                                    println!(
-                                                        "Network Event Error : {}",
-                                                        err.to_string()
-                                                    );
-                                                }
-                                            };
-                                        }
-                                        false => {}
-                                    }
                                 }
                             }
                         } else {
                             println!("no shared data");
                         }
                     }
-                    NetworkCommand::GetChildren(hash, ip, is_file) => {
+                    NetworkCommand::GetChildren(username, hash) => {
-                        if let Some(sd) = shared_data.as_ref() {
+                        // envoie un datum request au peer
-                            let mut payload = Vec::new();
-                            payload.extend_from_slice(&hash);
-                            let new_id = generate_id();
-                            let datumreqest = construct_message(
-                                DATUMREQUEST,
-                                payload,
-                                new_id,
-                                sd.cryptopair_ref(),
-                            );
-                            match datumreqest {
-                                None => {}
-                                Some(resp_msg) => {
-                                    if is_file {
-                                        sd.add_message(new_id, EventType::DatumRequestBig);
-                                    } else {
-                                        sd.add_message(new_id, EventType::DatumRequest);
-                                    }
-                                    println!("msg_sent:{:?}", resp_msg);
-                                    sd.senders_ref().add_message_to_retry_queue(
-                                        resp_msg.clone(),
-                                        ip.clone(),
-                                        false,
-                                    );
-
-                                    sd.senders_ref().send_dispatch(
-                                        resp_msg,
-                                        ip.clone(),
-                                        false,
-                                        sd.messages_list(),
-                                    );
-                                }
-                            }
-                        }
                     }
                     NetworkCommand::RequestDirectoryContent(_, _) => {
                         println!("[Network] RequestDirectoryContent() called");
@@ -523,8 +338,7 @@ pub fn start_p2p_executor(
                             Err(e) => {
                                 let mut err_msg = String::from("failed to initialize socket: ");
                                 err_msg += &e.to_string();
-                                let res =
+                                let res = event_tx.send(NetworkEvent::Error(err_msg));
-                                    event_tx.send(NetworkEvent::Error(err_msg, name.to_owned()));
                                 let res = event_tx.send(NetworkEvent::Disconnected());
                                 None
                             }
@@ -534,8 +348,7 @@ pub fn start_p2p_executor(
                             if let Err(e) = register_with_the_server(&sd.cryptopair(), &ip).await {
                                 let mut err_msg = String::from("request failed: ");
                                 err_msg += &e.to_string();
-                                let res =
+                                let res = event_tx.send(NetworkEvent::Error(err_msg));
-                                    event_tx.send(NetworkEvent::Error(err_msg, name.to_owned()));
                                 let res = event_tx.send(NetworkEvent::Disconnected());
                             } else {
                                 let res = event_tx.send(NetworkEvent::Connected(ip));
@@ -559,7 +372,6 @@ pub fn start_p2p_executor(
                         if ip == "" {
                             let res = event_tx.send(NetworkEvent::Error(
                                 "Not registered to any server".to_string(),
-                                "".to_owned(),
                             ));
                         } else {
                             println!("cc");
@@ -576,21 +388,14 @@ pub fn start_p2p_executor(
                                                 current.push(i);
                                             }
                                         }
-                                        match event_tx.send(NetworkEvent::PeerListUpdated(peers)) {
+                                        let res =
-                                            Ok(_) => {}
+                                            event_tx.send(NetworkEvent::PeerListUpdated(peers));
-                                            Err(err) => {
-                                                println!(
-                                                    "Network Event Error : {}",
-                                                    err.to_string()
-                                                );
-                                            }
-                                        };
                                     }
                                     Err(e) => {
                                         eprintln!("invalid UTF-8 in socket address bytes: {}", e);
                                     }
                                 },
-                                Err(e) => println!("error : {}", e),
+                                Err(e) => println!("error"),
                             }
                         }
                     }
@@ -602,17 +407,29 @@ pub fn start_p2p_executor(
                         if let Some(sd) = shared_data.as_ref() {
                             let id = generate_id();
                             sd.add_message(id, EventType::Ping);
+                            let pingrequest =
+                                construct_message(PING, Vec::new(), id, sd.cryptopair_ref());
                             let peer_address =
-                                get_socket_address(str.to_owned(), ip, shared_data.as_ref()).await;
+                                get_socket_address(str, ip, shared_data.as_ref()).await;
                             match peer_address {
                                 Ok(addr) => {
-                                    match event_tx.send(NetworkEvent::Success(
+                                    //if let Some(ping) = pingrequest {
-                                        format!(
+                                    //    sd.senders_ref().add_message_to_retry_queue(
-                                            "Successfully sent ping message to {}.",
+                                    //        ping.clone(),
-                                            addr.to_string(),
+                                    //        addr.to_string(),
-                                        ),
+                                    //        false,
-                                        str.to_owned(),
+                                    //    );
-                                    )) {
+                                    //    sd.senders_ref().send_dispatch(
+                                    //        ping,
+                                    //        addr.to_string(),
+                                    //        false,
+                                    //        sd.messages_list(),
+                                    //    );
+                                    //}
+                                    match event_tx.send(NetworkEvent::Success(format!(
+                                        "Successfully sent ping message to {}.",
+                                        addr.to_string()
+                                    ))) {
                                         Ok(_) => {}
                                         Err(e) => {
                                             eprintln!("NetworkEvent error : {}", e);
@@ -620,9 +437,7 @@ pub fn start_p2p_executor(
                                     };
                                 }
                                 Err(err_msg) => {
-                                    match event_tx
+                                    match event_tx.send(NetworkEvent::Error(err_msg.to_string())) {
-                                        .send(NetworkEvent::Error(err_msg.to_string(), str))
-                                    {
                                         Ok(_) => {}
                                         Err(e) => {
                                             eprintln!("NetworkEvent error : {}", e);
@@ -689,9 +504,7 @@ pub fn start_p2p_executor(
                                     );
                                 }
                                 Err(err_msg) => {
-                                    match event_tx
+                                    match event_tx.send(NetworkEvent::Error(err_msg.to_string())) {
-                                        .send(NetworkEvent::Error(err_msg.to_string(), username))
-                                    {
                                         Ok(_) => {}
                                         Err(e) => {
                                             eprintln!("NetworkEvent error : {}", e);
@@ -810,16 +623,7 @@ pub async fn get_socket_address(
         }
     };
 
-    let addresses: Vec<SocketAddr> = {
+    let addresses = parse_addresses(&s); // assumes parse_addresses: &str -> Vec<SocketAddr>
-        let temp = parse_addresses(&s);
-        temp.iter()
-            .filter_map(|a| match a {
-                SocketAddr::V4(_) => Some(*a),
-                SocketAddr::V6(_) => None,
-            })
-            .collect()
-    };
-
     if addresses.is_empty() {
         return Err(FetchSocketAddressError::NoRegisteredAddresses);
     } else if !addresses.iter().any(|a| matches!(a, SocketAddr::V4(_))) {

client-network/src/message_handling.rs

@@ -1,10 +1,15 @@
+use tokio::sync::oneshot;
+
 use crate::{
-    NetworkEvent, NodeHash,
+    NetworkEvent, NodeHash, P2PSharedData,
-    cryptographic_signature::{CryptographicSignature, get_peer_key, verify_signature},
+    cryptographic_signature::{
+        CryptographicSignature, get_peer_key, sign_message, verify_signature,
+    },
     datum_parsing::parse_received_datum,
     messages_channels::MultipleSenders,
     messages_structure::construct_message,
     peers_refresh::HandshakeHistory,
+    registration,
     server_communication::generate_id,
     timestamp::Timestamp,
 };
@@ -27,7 +32,6 @@ pub enum EventType {
     Ping,
     NatTraversal,
     DatumRequest,
-    DatumRequestBig,
     Unknown,
 }
 
@@ -41,7 +45,6 @@ impl EventType {
             EventType::NatTraversal => "NatTraversal".to_owned(),
             EventType::DatumRequest => "DatumRequest".to_owned(),
             EventType::Unknown => "Unknown".to_owned(),
-            EventType::DatumRequestBig => "DatumRequestBig".to_owned(),
         }
     }
 
@@ -317,10 +320,10 @@ pub fn parse_message(
                 String::from_utf8(received_message[LENGTH..(msg_length + LENGTH)].to_vec())
             {
                 let err_msg = format!("Error received from peer {} : {}", ip, err_received);
-                let _ = cmd_tx_clone.send(NetworkEvent::Error(err_msg, "".to_owned()));
+                let _ = cmd_tx_clone.send(NetworkEvent::Error(err_msg));
             } else {
                 let err_msg = format!("Error received from peer {} : N/A", ip,);
-                let _ = cmd_tx_clone.send(NetworkEvent::Error(err_msg, "".to_owned()));
+                let _ = cmd_tx_clone.send(NetworkEvent::Error(err_msg));
             }
         }
 
@@ -458,35 +461,8 @@ pub fn parse_message(
                             parse_received_datum(received_datum.to_vec(), received_length as usize);
                         match parsed_node {
                             Some(tuple) => {
-                                let _ = cmd_tx.send(NetworkEvent::FileTreeReceived(
+                                let _ =
-                                    tuple.0,
+                                    cmd_tx.send(NetworkEvent::FileTreeReceived(tuple.0, tuple.1));
-                                    tuple.1,
-                                    ip.to_string(),
-                                ));
-                            }
-                            None => {}
-                        }
-                    }
-                    EventType::DatumRequestBig => {
-                        let _ = &guard.remove_entry(&id);
-                        println!("message {} retiré de la liste", id);
-                        let received_length = u16::from_be_bytes(
-                            received_message[TYPE..LENGTH]
-                                .try_into()
-                                .expect("incorrect size"),
-                        );
-                        println!("received length:{}", received_length);
-                        let received_datum = &received_message[LENGTH..];
-                        let parsed_node =
-                            parse_received_datum(received_datum.to_vec(), received_length as usize);
-                        match parsed_node {
-                            Some(tuple) => {
-                                let _ = cmd_tx.send(NetworkEvent::DataReceived(
-                                    tuple.0,
-                                    tuple.1,
-                                    ip.to_string(),
-                                ));
-                                println!("datareceived event sent");
                             }
                             None => {}
                         }
@@ -496,22 +472,6 @@ pub fn parse_message(
                 None => {}
             }
         }
-        ROOTREQUEST => {
-            println!("root request received");
-            let _ = cmd_tx.send(NetworkEvent::RootRequest(ip.to_string()));
-        }
-        DATUMREQUEST => {
-            let received_length = u16::from_be_bytes(
-                received_message[TYPE..LENGTH]
-                    .try_into()
-                    .expect("incorrect size"),
-            );
-            let received_hash = &received_message[LENGTH..LENGTH + received_length as usize];
-            let _ = cmd_tx.send(NetworkEvent::DatumRequest(
-                received_hash.try_into().expect("incorrect size"),
-                ip.to_string(),
-            ));
-        }
         _ => return None,
     };
     constructed_message

client-network/src/messages_structure.rs

@@ -224,7 +224,7 @@ impl HandshakeMessage {
 mod tests {
     // Note this useful idiom: importing names from outer (for mod tests) scope.
     use super::*;
-    /*
+
     /// creates an handshake message
     #[tokio::test]
     async fn creating_handshake_msg() {
@@ -242,5 +242,5 @@ mod tests {
         let parsed = HandshakeMessage::parse(ser);
         handshake.display();
         parsed.display();
-    }*/
+    }
 }

client-network/src/peers_refresh.rs

@@ -137,7 +137,7 @@ pub fn update_handshake(
                 }
             }
             drop(guard);
-            thread::sleep(Duration::from_secs(60));
+            thread::sleep(Duration::from_secs(240));
         }
     });
     Worker::spawn(handle, crate::threads_handling::WorkerType::PING)

client-network/src/registration.rs

@@ -2,7 +2,6 @@ use crate::NetworkEvent;
 use crate::P2PSharedData;
 use crate::cryptographic_signature::CryptographicSignature;
 use crate::get_server_address;
-use crate::get_socket_address;
 use crate::message_handling::EventType;
 use crate::messages_structure::construct_message;
 use crate::server_communication::generate_id;
@@ -56,71 +55,47 @@ pub async fn perform_handshake(
     username: String,
     ip: String,
     event_tx: Sender<NetworkEvent>,
-    is_server_handshake: (bool, String),
+    is_server_handshake: bool,
-) -> bool {
+) {
     println!("username: {}, ip: {}", username.clone(), ip.clone());
     let crypto_pair = sd.cryptopair_ref();
     let senders = sd.senders_ref();
 
     let id = generate_id();
+    let server_addr_query = get_server_address(username.clone(), ip.clone());
+    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());
+            payload.extend_from_slice(&crypto_pair.username.clone().as_bytes());
+            let hello_handshake = construct_message(1, payload, id, crypto_pair);
+            if is_server_handshake {
+                sd.add_message(id, EventType::Hello);
+            } else {
+                sd.add_message(id, EventType::HelloThenRootRequest);
+            }
 
-    let address = {
+            match hello_handshake {
-        if is_server_handshake.0 {
+                Some(handshake_message) => {
-            is_server_handshake.1
+                    senders.send_dispatch(
-        } else {
+                        handshake_message,
-            let server_addr_query =
+                        sockaddr_bytes.to_string(),
-                get_socket_address(username.clone(), ip.clone(), Some(sd)).await;
+                        is_server_handshake,
-
+                        sd.messages_list(),
-            match server_addr_query {
+                    );
-                Ok(sockaddr_bytes) => sockaddr_bytes.to_string(),
-                Err(err_msg) => {
-                    match event_tx.send(NetworkEvent::Error(
-                        err_msg.to_string(),
-                        username.to_owned(),
-                    )) {
-                        Ok(_) => {}
-                        Err(err) => {
-                            println!("Network Event Error : {}", err.to_string());
-                        }
-                    }
-                    "".to_string()
                 }
+                None => {}
             }
         }
-    };
+        None => {
-
+            let err_msg = format!("failed to retreive socket address:").to_string();
-    if address.eq(&"".to_string()) {
+            let res = event_tx.send(NetworkEvent::Error(err_msg));
-        return false;
-    }
-
-    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);
-    if is_server_handshake.0 {
-        sd.add_message(id, EventType::Hello);
-    } else {
-        sd.add_message(id, EventType::HelloThenRootRequest);
-    }
-
-    match hello_handshake {
-        Some(handshake_message) => {
-            senders.send_dispatch(
-                handshake_message,
-                address,
-                is_server_handshake.0,
-                sd.messages_list(),
-            );
         }
-        None => {}
     }
 
-    //let server_addr_query = get_socket_address(username.clone(), ip.clone(), Some(sd)).await;
-    //match server_addr_query {
-    //    Ok(sockaddr_bytes) => {}
-    //    Err(err_msg) => {}
-    //}
-
     /*let mut list = messages_list.lock().expect("Failed to lock messages_list");
     match list.get(&id) {
         Some(_) => {
@@ -137,7 +112,6 @@ pub async fn perform_handshake(
     let hello_handshake_received = UDPMessage::parse(buf.to_vec());
     hello_handshake_received.display();*/
     //TODO
-    return true;
 }
 
 #[cfg(test)]

rapport.txt

@@ -1 +0,0 @@
-https://docs.google.com/document/d/1emhrAfjJyJTWpBYx4IJGcCz0_iLVjDRAAdq2EZFchKo/edit?usp=sharing

todo.md

@@ -1,11 +1,24 @@
 # Todo
 
+## bugfix
+
+- ajouter hello et nat a l'exp backoff OK
+- peers n'ayant pas d'adresse OK
+- verifier le refresh des peers
+
+- setting in gui to act as a relay
+
+- make hello and helloreply messages set the first extension bit to announce that peer is available for nat traversal
+- implement actual nat traversal requests
+- implement nat traversal :
+    - if hello/helloreply doesnt work with a peer, find a peer that supports nat traversal (server in priority) then begin protocol
 
 ## fonctionnalités :
-- proposer des fichiers
+
-- telechargement des fichiers
+rechercher les fichiers d'un pair
-- receivers threads
+telechargement des fichiers
-- ask for nat traversal
+choisir un dossier à partager
+choisir le nombre de canaux
 
 ## autre
 
@@ -13,7 +26,6 @@ socket ipv6
 
 # FAIT
 
-rechercher les fichiers d'un pair OK
 - choisir un pseudo OK
 - get rsquest to the uri /peers/ OK
 - generation of the cryptographic key OK
@@ -32,6 +44,3 @@ rechercher les fichiers d'un pair OK
 - datum/nodatum and datum structures
 - nattraversal 1 and 2 structures
 - chunk, directory, big, bigdirectory structures
-- ajouter hello et nat a l'exp backoff OK
-- peers n'ayant pas d'adresse OK
-- verifier le refresh des peers OK