Merge remote-tracking branch 'origin' into bigfix

.gitignore

@@ -1 +1,2 @@
-/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(|cc| {
+        Box::new(|_| {
             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,7 +1,15 @@
 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;
@@ -24,9 +32,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) = 3,
+    Big(BigNode) = 2,
     // list of 2 to 32 hashes pointing to Directory or BigDirectory nodes.
-    BigDirectory(BigDirectoryNode) = 4,
+    BigDirectory(BigDirectoryNode) = 3,
 }
 
 #[derive(Debug, Clone)]
@@ -39,6 +47,9 @@ 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)]
@@ -143,8 +154,8 @@ impl MerkleNode {
         match self {
             MerkleNode::Chunk(_) => 0,
             MerkleNode::Directory(_) => 1,
-            MerkleNode::Big(_) => 3,
-            MerkleNode::BigDirectory(_) => 4,
+            MerkleNode::Big(_) => 2,
+            MerkleNode::BigDirectory(_) => 3,
         }
     }
 
@@ -176,3 +187,343 @@ 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) => {
+            if !chunk.data.is_empty() {
+                // Enlève le premier élément
+                let mut data = chunk.data.clone(); // Clone pour éviter de modifier l'original
+                data.remove(0); // Enlève le premier élément
+                println!("wrote data {:?}", data);
+                let _ = file.write(&data);
+            } else {
+                println!("chunk.data is empty, nothing to write");
+            }
+        }
+        _ => {
+            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,78 +11,103 @@ 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 sigstart = datum_length - 64;
-    let value = &recevied_datum[32..sigstart];
+    let value = &recevied_datum[32..datum_length];
     let value_slice = value.to_vec();
-    let datum_type = value_slice[0];
-    match datum_type {
-        CHUNK => Some((
-            hash_name,
-            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..nb_entries {
-                offset = (offset as u8 + 64 * i) as usize;
-                let name = &recevied_datum[offset..offset + 32];
-                let mut hash = [0u8; 32];
-                hash.copy_from_slice(&recevied_datum[offset + 32..offset + 64]);
-                // envoyer un datum request
-                dir_entries.push(DirectoryEntry {
-                    filename: name.try_into().expect("incorrect size"),
-                    content_hash: hash,
-                });
-            }
+    println!("valueslice: {:?}, {}", value_slice, value_slice.len());
 
-            let current = DirectoryNode::new(dir_entries);
-            match current {
-                Ok(current_node) => Some((hash_name, MerkleNode::Directory(current_node))),
-                Err(e) => {
-                    println!("{}", e);
-                    None
+    println!(
+        "((value_slice.len() - 1) / 32) {} ",
+        ((value_slice.len() - 1) / 32)
+    );
+    // Créer une instance de Sha256
+    let mut hasher = Sha256::new();
+
+    // Alimenter le hasher avec les données
+    hasher.update(value_slice.clone());
+
+    // Obtention du résultat
+    let result = hasher.finalize();
+    if result.to_vec() != hash_name.to_vec() {
+        println!("{:?},{:?}", result.to_vec(), hash_name.to_vec());
+        None
+    } else {
+        println!("hashes equals!");
+        let datum_type = value_slice[0];
+        match datum_type {
+            CHUNK => Some((
+                hash_name,
+                MerkleNode::Chunk(crate::ChunkNode { data: value_slice }),
+            )),
+            DIRECTORY => {
+                let mut dir_entries = Vec::new();
+                let mut offset = 1 as usize;
+                for i in 0..((value_slice.len() - 1) / 64) as u8 {
+                    offset = (1 + 64 * i as usize) as usize;
+                    println!("offset:{}, i:{}", offset, i);
+                    let name = &value_slice[offset..offset + 32];
+                    let mut hash = [0u8; 32];
+                    hash.copy_from_slice(&value_slice[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"),
+                        content_hash: hash,
+                    });
+                }
+
+                let current = DirectoryNode::new(dir_entries);
+                match current {
+                    Ok(current_node) => Some((hash_name, MerkleNode::Directory(current_node))),
+                    Err(e) => {
+                        println!("{}", e);
+                        None
+                    }
                 }
             }
-        }
-        BIG => {
-            let chlidren: Vec<NodeHash> = Vec::new();
-            Some((
-                hash_name,
-                MerkleNode::Big(crate::BigNode {
-                    children_hashes: chlidren,
-                }),
-            ))
-            /*let chlidren: Vec<NodeHash> = Vec::new();
-            tree.data.insert(
-                hash_name,
-                MerkleNode::Big(crate::BigNode {
-                    children_hashes: chlidren,
-                }),
-            );*/
-        }
-        BIGDIRECTORY => {
-            let nb_entries = value_slice[1];
-            let mut dir_entries = Vec::new();
-            let mut offset = 1 as usize;
-            for i in 0..nb_entries {
-                offset = (offset as u8 + 64 * i) as usize;
-                let name = &recevied_datum[offset..offset + 32];
-                let mut hash = [0u8; 32];
-                hash.copy_from_slice(&recevied_datum[offset + 32..offset + 64]);
-                // envoyer un datum request
-                dir_entries.push(hash);
-            }
+            BIG => {
+                let mut bigdir_entries: 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];
 
-            let current = BigDirectoryNode::new(dir_entries);
-            match current {
-                Ok(current_node) => Some((hash_name, MerkleNode::BigDirectory(current_node))),
-                Err(e) => {
-                    println!("{}", e);
-                    None
+                    // 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,
+                    }),
+                ))
+            }
+            BIGDIRECTORY => {
+                let mut bigdir_entries: 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"));
+                }
+
+                let current = BigDirectoryNode::new(bigdir_entries);
+                match current {
+                    Ok(current_node) => Some((hash_name, MerkleNode::BigDirectory(current_node))),
+                    Err(e) => {
+                        println!("{}", e);
+                        None
+                    }
                 }
             }
+            _ => None,
         }
-        _ => None,
     }
 }

client-network/src/lib.rs

@@ -13,18 +13,23 @@ 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::{NATTRAVERSALREQUEST, PING, ROOTREQUEST, construct_message},
+    messages_structure::{
+        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},
@@ -68,7 +73,7 @@ impl P2PSharedData {
 
         let mut threads = Vec::new();
 
-        let senders = MultipleSenders::new(1, &shared_socket, cmd_tx, &mut threads);
+        let senders = MultipleSenders::new(5, &shared_socket, cmd_tx, &mut threads);
         let shared_senders = Arc::new(senders);
         let server_name = Arc::new(Mutex::new("".to_string()));
         let server_address = Arc::new(Mutex::new("".to_string()));
@@ -176,7 +181,11 @@ pub enum NetworkCommand {
     Disconnect(),
     ResetServerPeer(),
     Discover(String, String, String),
-    GetChildren(String, String),
+    GetChildren([u8; 32], String, bool),
+    SendDatum(MerkleNode, [u8; 32], String),
+    SendNoDatum(Vec<u8>, String),
+    SendRootReply(Vec<u8>, String),
+    InitDownload([u8; 32], String, String),
     // ...
 }
 
@@ -185,15 +194,17 @@ pub enum NetworkEvent {
     Connected(String),
     ConnectedHandshake(),
     Disconnected(),
-    Error(String),
-    Success(String),
-    PeerConnected(String),
+    Error(String, String),
+    Success(String, String),
     PeerListUpdated(Vec<(String, bool)>),
-    FileTreeReceived([u8; 32], MerkleNode), // peer_id, content
-    DataReceived(String, MerkleNode),
+    FileTreeReceived([u8; 32], MerkleNode, String), // peer_id, content
+    DataReceived([u8; 32], MerkleNode, String),
     FileTreeRootReceived(String, NodeHash),
     HandshakeFailed(),
     ServerHandshakeFailed(String),
+    DatumRequest([u8; 32], String),
+    RootRequest(String),
+    InitDownload([u8; 32], String, String),
     // ...
 }
 
@@ -234,6 +245,84 @@ 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() {
@@ -250,9 +339,53 @@ 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;
+                            }
 
-                            let res =
-                                perform_handshake(&sd, username, ip, event_tx.clone(), true).await;
+                            sd.set_servername(username.to_owned());
+                            sd.set_serveraddress(server_address.to_string());
+                            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");
                         }
@@ -270,7 +403,9 @@ 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.handshake_peers.get_peer_info_username(username.clone());
+                            let res = sd
+                                .handshake_peers
+                                .get_peer_info_username(username.to_owned());
                             match res {
                                 Some(peerinfo) => {
                                     let id = generate_id();
@@ -305,22 +440,72 @@ pub fn start_p2p_executor(
                                 }
                                 None => {
                                     // envoyer un handshake
-                                    let res = perform_handshake(
+                                    match perform_handshake(
                                         &sd,
-                                        username,
+                                        username.to_owned(),
                                         ip,
                                         event_tx.clone(),
-                                        false,
+                                        (false, "".to_string()),
                                     )
-                                    .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(username, hash) => {
-                        // envoie un datum request au peer
+                    NetworkCommand::GetChildren(hash, ip, is_file) => {
+                        if let Some(sd) = shared_data.as_ref() {
+                            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");
@@ -338,7 +523,8 @@ pub fn start_p2p_executor(
                             Err(e) => {
                                 let mut err_msg = String::from("failed to initialize socket: ");
                                 err_msg += &e.to_string();
-                                let res = event_tx.send(NetworkEvent::Error(err_msg));
+                                let res =
+                                    event_tx.send(NetworkEvent::Error(err_msg, name.to_owned()));
                                 let res = event_tx.send(NetworkEvent::Disconnected());
                                 None
                             }
@@ -348,7 +534,8 @@ 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 = event_tx.send(NetworkEvent::Error(err_msg));
+                                let res =
+                                    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));
@@ -372,6 +559,7 @@ 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");
@@ -388,14 +576,21 @@ pub fn start_p2p_executor(
                                                 current.push(i);
                                             }
                                         }
-                                        let res =
-                                            event_tx.send(NetworkEvent::PeerListUpdated(peers));
+                                        match event_tx.send(NetworkEvent::PeerListUpdated(peers)) {
+                                            Ok(_) => {}
+                                            Err(err) => {
+                                                println!(
+                                                    "Network Event Error : {}",
+                                                    err.to_string()
+                                                );
+                                            }
+                                        };
                                     }
                                     Err(e) => {
                                         eprintln!("invalid UTF-8 in socket address bytes: {}", e);
                                     }
                                 },
-                                Err(e) => println!("error"),
+                                Err(e) => println!("error : {}", e),
                             }
                         }
                     }
@@ -407,29 +602,17 @@ 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, ip, shared_data.as_ref()).await;
+                                get_socket_address(str.to_owned(), ip, shared_data.as_ref()).await;
                             match peer_address {
                                 Ok(addr) => {
-                                    //if let Some(ping) = pingrequest {
-                                    //    sd.senders_ref().add_message_to_retry_queue(
-                                    //        ping.clone(),
-                                    //        addr.to_string(),
-                                    //        false,
-                                    //    );
-                                    //    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()
-                                    ))) {
+                                    match event_tx.send(NetworkEvent::Success(
+                                        format!(
+                                            "Successfully sent ping message to {}.",
+                                            addr.to_string(),
+                                        ),
+                                        str.to_owned(),
+                                    )) {
                                         Ok(_) => {}
                                         Err(e) => {
                                             eprintln!("NetworkEvent error : {}", e);
@@ -437,7 +620,9 @@ pub fn start_p2p_executor(
                                     };
                                 }
                                 Err(err_msg) => {
-                                    match event_tx.send(NetworkEvent::Error(err_msg.to_string())) {
+                                    match event_tx
+                                        .send(NetworkEvent::Error(err_msg.to_string(), str))
+                                    {
                                         Ok(_) => {}
                                         Err(e) => {
                                             eprintln!("NetworkEvent error : {}", e);
@@ -504,7 +689,9 @@ pub fn start_p2p_executor(
                                     );
                                 }
                                 Err(err_msg) => {
-                                    match event_tx.send(NetworkEvent::Error(err_msg.to_string())) {
+                                    match event_tx
+                                        .send(NetworkEvent::Error(err_msg.to_string(), username))
+                                    {
                                         Ok(_) => {}
                                         Err(e) => {
                                             eprintln!("NetworkEvent error : {}", e);
@@ -623,7 +810,16 @@ pub async fn get_socket_address(
         }
     };
 
-    let addresses = parse_addresses(&s); // assumes parse_addresses: &str -> Vec<SocketAddr>
+    let addresses: 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,15 +1,10 @@
-use tokio::sync::oneshot;
-
 use crate::{
-    NetworkEvent, NodeHash, P2PSharedData,
-    cryptographic_signature::{
-        CryptographicSignature, get_peer_key, sign_message, verify_signature,
-    },
+    NetworkEvent, NodeHash,
+    cryptographic_signature::{CryptographicSignature, get_peer_key, verify_signature},
     datum_parsing::parse_received_datum,
     messages_channels::MultipleSenders,
     messages_structure::construct_message,
     peers_refresh::HandshakeHistory,
-    registration,
     server_communication::generate_id,
     timestamp::Timestamp,
 };
@@ -32,6 +27,7 @@ pub enum EventType {
     Ping,
     NatTraversal,
     DatumRequest,
+    DatumRequestBig,
     Unknown,
 }
 
@@ -45,6 +41,7 @@ impl EventType {
             EventType::NatTraversal => "NatTraversal".to_owned(),
             EventType::DatumRequest => "DatumRequest".to_owned(),
             EventType::Unknown => "Unknown".to_owned(),
+            EventType::DatumRequestBig => "DatumRequestBig".to_owned(),
         }
     }
 
@@ -320,10 +317,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));
+                let _ = cmd_tx_clone.send(NetworkEvent::Error(err_msg, "".to_owned()));
             } else {
                 let err_msg = format!("Error received from peer {} : N/A", ip,);
-                let _ = cmd_tx_clone.send(NetworkEvent::Error(err_msg));
+                let _ = cmd_tx_clone.send(NetworkEvent::Error(err_msg, "".to_owned()));
             }
         }
 
@@ -373,14 +370,11 @@ pub fn parse_message(
                             // envoyer la root request
                             let _ = &guard.remove_entry(&id);
                             println!("message {} retiré de la liste", id);
-
-                            let rootrequest = construct_message(
-                                ROOTREQUEST,
-                                Vec::new(),
-                                generate_id(),
-                                crypto_pair,
-                            );
-                            //&guard.insert(, v)
+                            let new_id = generate_id();
+                            let rootrequest =
+                                construct_message(ROOTREQUEST, Vec::new(), new_id, crypto_pair);
+                            let _ = &guard.insert(new_id, EventType::RootRequest);
+                            println!("root requesst sent");
                             return rootrequest;
                         }
                         EventType::Hello => {
@@ -395,6 +389,7 @@ pub fn parse_message(
         }
         ROOTREPLY => {
             // recuperer le pseudo du peers ayant repondu
+            println!("root reply received");
             let peers_exist = handhsake_history.get_peer_info_ip(ip.to_string());
             match peers_exist {
                 Some(peerinfo) => {
@@ -432,7 +427,9 @@ pub fn parse_message(
                                     constructed_message = datumreqest;
                                     guard.insert(new_id, EventType::DatumRequest);
                                 }
-                                _ => {}
+                                _ => {
+                                    println!("event not prensent");
+                                }
                             }
                         }
                         None => {}
@@ -461,17 +458,62 @@ 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(tuple.0, tuple.1));
+                                let _ = cmd_tx.send(NetworkEvent::FileTreeReceived(
+                                    tuple.0,
+                                    tuple.1,
+                                    ip.to_string(),
+                                ));
                             }
                             None => {}
                         }
                     }
+                    EventType::DatumRequestBig => {
+                        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 _ = &guard.remove_entry(&id);
+                                let _ = cmd_tx.send(NetworkEvent::DataReceived(
+                                    tuple.0,
+                                    tuple.1,
+                                    ip.to_string(),
+                                ));
+                                println!("datareceived event sent");
+                            }
+                            None => {
+                                println!("message corrompu, nouvelle tentative");
+                            }
+                        }
+                    }
                     _ => {}
                 },
                 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_channels.rs

@@ -234,7 +234,8 @@ pub fn start_retry_thread(
                             );
                             let base: u64 = 2;
 
-                            let backoff = base.saturating_pow(attempt as u32); // 2^1 == 2 seconds
+                            // let backoff = base.saturating_pow(attempt as u32); // 2^1 == 2 seconds
+                            let backoff = 1;
                             let newretry = RetryMessage {
                                 next_try: SystemTime::now()
                                     .duration_since(UNIX_EPOCH)
@@ -272,7 +273,7 @@ pub fn start_receving_thread(
     let messages_received_clone = shared_data.messages_received();
     let servername_clone = shared_data.servername();
     let thread = thread::spawn(move || {
-        let mut buf = [0u8; 1024];
+        let mut buf = [0u8; 1500];
         loop {
             match sock_clone.recv_from(&mut buf) {
                 Ok((amt, src)) => {

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(240));
+            thread::sleep(Duration::from_secs(60));
         }
     });
     Worker::spawn(handle, crate::threads_handling::WorkerType::PING)

client-network/src/registration.rs

@@ -2,6 +2,7 @@ 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;
@@ -50,52 +51,77 @@ pub fn parse_addresses(input: &String) -> Vec<SocketAddr> {
 ///
 /// registers the IP addresses by sending a Hello request to the server.
 ///
+
 pub async fn perform_handshake(
     sd: &P2PSharedData,
     username: String,
     ip: String,
     event_tx: Sender<NetworkEvent>,
-    is_server_handshake: bool,
-) {
+    is_server_handshake: (bool, String),
+) -> 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);
-            }
 
-            match hello_handshake {
-                Some(handshake_message) => {
-                    senders.send_dispatch(
-                        handshake_message,
-                        sockaddr_bytes.to_string(),
-                        is_server_handshake,
-                        sd.messages_list(),
-                    );
+    let address = {
+        if is_server_handshake.0 {
+            is_server_handshake.1
+        } else {
+            let server_addr_query =
+                get_socket_address(username.clone(), ip.clone(), Some(sd)).await;
+
+            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();
-            let res = event_tx.send(NetworkEvent::Error(err_msg));
-        }
+    };
+
+    if address.eq(&"".to_string()) {
+        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(_) => {
@@ -112,37 +138,5 @@ pub async fn perform_handshake(
     let hello_handshake_received = UDPMessage::parse(buf.to_vec());
     hello_handshake_received.display();*/
     //TODO
-}
-
-#[cfg(test)]
-mod tests {
-
-    /*///
-    /// does the procedure to register with the server
-    ///
-    #[tokio::test]
-    async fn registering_with_server() {
-        let username = String::from("gameixtreize");
-        let server_uri = String::from("https://jch.irif.fr:8443");
-        let crypto_pair = CryptographicSignature::new(username);
-        if let Err(e) = register_with_the_server(crypto_pair, server_uri).await {
-            eprintln!("Error during registration: {}", e);
-        }
-    }*/
-
-    /*///
-    /// retreives the socket address of a given peer
-    ///
-    #[tokio::test]
-    async fn retreive_socket_addr() {
-        let username = String::from("ipjkndqfshjldfsjlbsdfjhhj");
-        match get_socket_address(username).await {
-            Ok(body) => {
-                println!("{:?}", body);
-            }
-            Err(e) => {
-                eprintln!("Erreur HTTP: {}", e);
-            }
-        }
-    }*/
+    return true;
 }

rapport.txt

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

todo.md

@@ -1,24 +1,11 @@
 # 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 :
-
-rechercher les fichiers d'un pair
-telechargement des fichiers
-choisir un dossier à partager
-choisir le nombre de canaux
+- proposer des fichiers
+- telechargement des fichiers
+- receivers threads
+- ask for nat traversal
 
 ## autre
 
@@ -26,6 +13,7 @@ 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
@@ -44,3 +32,6 @@ socket ipv6
 - 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