wip big download

client-network/src/data.rs

@@ -8,6 +8,8 @@ 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;
@@ -30,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)]
@@ -45,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)]

client-network/src/datum_parsing.rs

@@ -49,6 +49,7 @@ pub fn parse_received_datum(
             }
         }
         BIG => {
+            println!("its a BIG bro");
             let chlidren: Vec<NodeHash> = Vec::new();
             Some((
                 hash_name,
@@ -56,13 +57,6 @@ pub fn parse_received_datum(
                     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();

client-network/src/lib.rs

@@ -25,6 +25,7 @@ use crate::{
     server_communication::{generate_id, get_peer_list},
     threads_handling::Worker,
 };
+use std::collections::HashSet;
 use std::{
     clone,
     io::Error,
@@ -149,10 +150,11 @@ pub enum NetworkCommand {
     Disconnect(),
     ResetServerPeer(),
     Discover(String, String, String),
-    GetChildren([u8; 32], String),
+    GetChildren([u8; 32], String, bool),
     SendDatum(MerkleNode, [u8; 32], String),
     SendNoDatum(Vec<u8>, String),
     SendRootReply(Vec<u8>, String),
+    InitDownload([u8; 32], String),
     // ...
 }
 
@@ -165,12 +167,13 @@ pub enum NetworkEvent {
     PeerConnected(String),
     PeerListUpdated(Vec<(String, bool)>),
     FileTreeReceived([u8; 32], MerkleNode, String), // peer_id, content
-    DataReceived(String, MerkleNode),
+    DataReceived([u8; 32], MerkleNode, String),
     FileTreeRootReceived(String, NodeHash),
     HandshakeFailed(),
     ServerHandshakeFailed(String),
     DatumRequest([u8; 32], String),
     RootRequest(String),
+    InitDownload([u8; 32], String),
     // ...
 }
 
@@ -211,6 +214,14 @@ 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) => {
+                        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()));
+                            }
+                        }
+                    }
                     NetworkCommand::SendRootReply(node_hash, addr) => {
                         if let Some(sd) = shared_data.as_mut() {
                             let mut payload = Vec::new();
@@ -363,7 +374,7 @@ pub fn start_p2p_executor(
                             println!("no shared data");
                         }
                     }
-                    NetworkCommand::GetChildren(hash, ip) => {
+                    NetworkCommand::GetChildren(hash, ip, is_file) => {
                         if let Some(sd) = shared_data.as_ref() {
                             let mut payload = Vec::new();
                             payload.extend_from_slice(&hash);
@@ -377,7 +388,11 @@ pub fn start_p2p_executor(
                             match datumreqest {
                                 None => {}
                                 Some(resp_msg) => {
-                                    sd.add_message(new_id, EventType::DatumRequest);
+                                    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(),

client-network/src/message_handling.rs

@@ -28,6 +28,7 @@ pub enum EventType {
     Ping,
     NatTraversal,
     DatumRequest,
+    DatumRequestBig,
 }
 
 const ID: usize = 4;
@@ -429,6 +430,29 @@ pub fn parse_message(
                             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"),
+                        );
+                        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 => {}
+                        }
+                    }
                     _ => {}
                 },
                 None => {}

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)