bob/p2p
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

base: bob:fbbd8cd6406907f297893cc3bc900127d2ad9446
Branches Tags
bob:master bob:bigfix bob:address_fetch_fix bob:download_progress bob:nat_transversal bob:tmp
..
compare: bob:download_progress
Branches Tags
bob:master bob:bigfix bob:address_fetch_fix bob:download_progress bob:nat_transversal bob:tmp

2 Commits
fbbd8cd640 ... download_p

Author SHA1 Message Date
Tiago Batista Cardoso
fc7886c94c progress bar 2026-01-25 00:54:54 +01:00
Tiago Batista Cardoso
f69629cd52 [feature] better socket address fetching logic 2026-01-25 00:02:06 +01:00
7 changed files with 455 additions and 339 deletions
Expand all files Collapse all files

412
client-gui/src/gui_app.rs
View File

@@ -5,8 +5,9 @@ use client_network::{
}; };
use crossbeam_channel::{Receiver, Sender}; use crossbeam_channel::{Receiver, Sender};
use egui::{ use egui::{
Align, CentralPanel, CollapsingHeader, Color32, Context, CornerRadius, Frame, Layout, Response, Align, CentralPanel, CollapsingHeader, Color32, Context, CornerRadius, Frame, Layout,
ScrollArea, SidePanel, Stroke, TopBottomPanel, Ui, ViewportCommand, ProgressBar, Response, ScrollArea, SidePanel, Stroke, TopBottomPanel, Ui, Vec2,
ViewportCommand,
}; };
use std::collections::HashSet; use std::collections::HashSet;
use std::{collections::HashMap, fmt::format, io::Seek}; use std::{collections::HashMap, fmt::format, io::Seek};
@@ -54,6 +55,13 @@ pub struct P2PClientApp {
current_downloading_file_map: MerkleTree, current_downloading_file_map: MerkleTree,
remaining_chunks: HashSet<[u8; 32]>, remaining_chunks: HashSet<[u8; 32]>,
// total number of chunks expected for the current download (set when download starts)
current_total_chunks: Option<usize>,
// number of chunks received so far (count of removed remaining_chunks)
current_received_chunks: usize,
root_downloading_file: String, root_downloading_file: String,
} }
@@ -87,6 +95,8 @@ impl P2PClientApp {
active_server: "".to_string(), active_server: "".to_string(),
shared_tree: generate_base_tree(), shared_tree: generate_base_tree(),
current_downloading_file_map: current_downloading_file_map, current_downloading_file_map: current_downloading_file_map,
current_total_chunks: None,
current_received_chunks: 0,
root_downloading_file: "".to_string(), root_downloading_file: "".to_string(),
remaining_chunks: HashSet::new(), remaining_chunks: HashSet::new(),
} }
@@ -103,6 +113,14 @@ impl P2PClientApp {
pub fn clear_success(&mut self) { pub fn clear_success(&mut self) {
self.success_message = None; self.success_message = None;
} }
fn set_current_total_chunks(&mut self, len: Option<usize>) {
self.current_total_chunks = len
}
fn set_current_received_chunks(&mut self, arg: usize) {
self.current_received_chunks = arg
}
} }
// --- eframe::App Trait Implementation --- // --- eframe::App Trait Implementation ---
@@ -262,7 +280,6 @@ impl eframe::App for P2PClientApp {
if let Some(addr) = &self.active_peer { if let Some(addr) = &self.active_peer {
if let Some(roottree) = self.loaded_fs.get(addr) { if let Some(roottree) = self.loaded_fs.get(addr) {
if let Some(root) = roottree.data.get(&hash) { if let Some(root) = roottree.data.get(&hash) {
self.current_downloading_file_map.root = hash;
self.root_downloading_file = name; self.root_downloading_file = name;
let _ = self let _ = self
.current_downloading_file_map .current_downloading_file_map
@@ -292,6 +309,7 @@ impl eframe::App for P2PClientApp {
true, true,
)); ));
self.remaining_chunks.insert(entry); self.remaining_chunks.insert(entry);
self.set_current_total_chunks(Some(self.remaining_chunks.len()));
} }
self.remaining_chunks.remove(&hash); self.remaining_chunks.remove(&hash);
} }
@@ -300,12 +318,18 @@ impl eframe::App for P2PClientApp {
} }
_ => {} _ => {}
} }
println!("remaining chunks size: {}", self.remaining_chunks.len());
if let Some(total) = self.current_total_chunks {
// recompute received (safer than incrementing)
let received = total.saturating_sub(self.remaining_chunks.len());
self.current_received_chunks = received;
}
if self.remaining_chunks.is_empty() { if self.remaining_chunks.is_empty() {
let file = OpenOptions::new().append(true).create(true).open( /*let file = OpenOptions::new()
"./Download/".to_string() .append(true)
+ &remove_null_bytes(&self.root_downloading_file.clone()), .create(true)
); .open(self.root_downloading_file.clone());
if let Some(current) = self if let Some(current) = self
.current_downloading_file_map .current_downloading_file_map
@@ -324,10 +348,10 @@ impl eframe::App for P2PClientApp {
eprintln!("error creaation file: {}", e); eprintln!("error creaation file: {}", e);
} }
} }
} else { }*/
eprintln!("error root absent"); self.current_total_chunks = None;
} self.current_received_chunks = 0;
println!("bigfile téléchargé {}", self.root_downloading_file); println!("bigfile téléchargé");
} }
} }
NetworkEvent::Success(msg, peer_username) => { NetworkEvent::Success(msg, peer_username) => {
@@ -407,26 +431,35 @@ impl eframe::App for P2PClientApp {
TopBottomPanel::bottom("bottom_panel").show(ctx, |ui| { TopBottomPanel::bottom("bottom_panel").show(ctx, |ui| {
ui.horizontal(|ui| { ui.horizontal(|ui| {
match self.server_status { match self.server_status {
ServerStatus::Loading => { ServerStatus::Loading => ui.spinner(),
ui.spinner(); ServerStatus::Connected => ui.label("Registered but no server peer chosen..."),
} ServerStatus::NotConnected => ui.label("No connection.."),
ServerStatus::Connected => { ServerStatus::ConnectedHandshake => ui.label("📡"),
ui.label("Registered but no server peer chosen..."); };
}
ServerStatus::NotConnected => { ui.add_space(8.0); // small gap
ui.label("No connection..");
} // desired progress bar width
ServerStatus::ConnectedHandshake => { let bar_width = 220.0f32;
let str = format!("📡"); // push it to the right by adding space equal to remaining width minus bar width
ui.label(str); let push = (ui.available_width() - bar_width).max(0.0);
} ui.add_space(push);
if let Some(total) = self.current_total_chunks {
let received = self.current_received_chunks;
let frac = if total == 0 {
1.0
} else {
received as f32 / total as f32
};
ui.add(
ProgressBar::new(frac)
.show_percentage()
.animate(true)
.desired_height(10.0),
);
} }
ui.add_space(ui.available_width() - 30.0);
// formater mm:ss
let secs = self.remaining.as_secs();
let minutes = secs / 60;
let seconds = secs % 60;
ui.label(format!("{:02}:{:02}", minutes, seconds));
}); });
}); });
@@ -457,92 +490,103 @@ impl eframe::App for P2PClientApp {
}); });
ui.separator(); ui.separator();
ScrollArea::vertical().show(ui, |ui| { ScrollArea::vertical()
if self.known_peers.is_empty() { .auto_shrink([false; 2])
ui.add_space(10.0); .show(ui, |ui| {
ui.label("No active peers."); ui.style_mut().visuals.widgets.inactive.bg_fill =
} else { ui.style().visuals.widgets.inactive.bg_fill; // no-op to get mutable borrow
for peer in &self.known_peers { if self.known_peers.is_empty() {
let is_active = ui.add_space(10.0);
self.active_peer.as_ref().map_or(false, |id| id == &peer.0); // if peer.id == self.active_peer_id ui.label("No active peers.");
} else {
for peer in &self.known_peers {
let is_active =
self.active_peer.as_ref().map_or(false, |id| id == &peer.0); // if peer.id == self.active_peer_id
let selectable: Response; let selectable: Response;
// if &self.active_server == &peer.0 { // if &self.active_server == &peer.0 {
// // Create a frame with green background and render the selectable inside it. // // Create a frame with green background and render the selectable inside it.
// // Adjust rounding, padding and stroke as desired. // // Adjust rounding, padding and stroke as desired.
// let frame = Frame { // let frame = Frame {
// fill: Color32::DARK_BLUE, // fill: Color32::DARK_BLUE,
// stroke: Stroke::default(), // stroke: Stroke::default(),
// corner_radius: CornerRadius::from(0.5), // corner_radius: CornerRadius::from(0.5),
// ..Default::default() // ..Default::default()
// }; // };
// let internal = frame.show(ui, |ui| { // let internal = frame.show(ui, |ui| {
// // horizontal row: label on the left, spinner on the right // // horizontal row: label on the left, spinner on the right
// ui.horizontal(|ui| { // ui.horizontal(|ui| {
// // let selectable label take remaining space // // let selectable label take remaining space
// ui.with_layout(Layout::left_to_right(Align::Center), |ui| { // ui.with_layout(Layout::left_to_right(Align::Center), |ui| {
// ui.add_space(0.0); // ensure layout established // ui.add_space(0.0); // ensure layout established
// return ui.selectable_label( // return ui.selectable_label(
// is_active, // is_active,
// format!("{}", peer.0), // format!("{}", peer.0),
// ); // );
// }) // })
// .inner // return Response from the inner closure if your egui version does so // .inner // return Response from the inner closure if your egui version does so
// }) // })
// }); // });
// selectable = internal.inner.inner; // selectable = internal.inner.inner;
// } else { // } else {
// selectable = ui.selectable_label(is_active, format!("{}", peer.0)); // selectable = ui.selectable_label(is_active, format!("{}", peer.0));
// } // }
// place spinner to the right of the label // place spinner to the right of the label
ui.horizontal(|ui| { ui.horizontal(|ui| {
// Use same width for the label widget as the selectable we already created: // Use same width for the label widget as the selectable we already created:
// Recreate selectable inline so both label and spinner share the same row. // Recreate selectable inline so both label and spinner share the same row.
let resp = if &self.active_server == &peer.0 { let resp = if &self.active_server == &peer.0 {
// draw with frame inline // draw with frame inline
let frame = Frame { let frame = Frame {
fill: Color32::DARK_BLUE, fill: Color32::DARK_BLUE,
stroke: Stroke::default(), stroke: Stroke::default(),
corner_radius: CornerRadius::from(0.5), corner_radius: CornerRadius::from(0.5),
..Default::default() ..Default::default()
};
frame
.show(ui, |ui| {
ui.selectable_label(
is_active,
format!("{}", peer.0),
)
})
.inner
} else {
ui.selectable_label(is_active, format!("{}", peer.0))
}; };
frame
.show(ui, |ui| {
ui.selectable_label(is_active, format!("{}", peer.0))
})
.inner
} else {
ui.selectable_label(is_active, format!("{}", peer.0))
};
ui.add_space(4.0); // small gap ui.add_space(4.0); // small gap
if self.loading_peers.contains(&peer.0) { if self.loading_peers.contains(&peer.0) {
// push spinner to right by expanding a spacer before it // push spinner to right by expanding a spacer before it
ui.with_layout(Layout::right_to_left(Align::Center), |ui| { ui.with_layout(
ui.spinner(); Layout::right_to_left(Align::Center),
}); |ui| {
} ui.spinner();
},
// use resp (click handling etc.) );
if resp.clicked() {
// switch to displaying this peer's tree
self.active_peer = Some(peer.0.clone());
// Request root content if not loaded
if !self
.loaded_fs
.contains_key(self.active_peer.as_ref().unwrap())
{
//todo!();
let _ = self.network_cmd_tx.send(NetworkCommand::Discover(
peer.0.clone(),
"root".to_string(),
self.connected_address.clone(),
));
} }
}
resp.context_menu(|ui| { // use resp (click handling etc.)
if resp.clicked() {
// switch to displaying this peer's tree
self.active_peer = Some(peer.0.clone());
// Request root content if not loaded
if !self
.loaded_fs
.contains_key(self.active_peer.as_ref().unwrap())
{
//todo!();
let _ =
self.network_cmd_tx.send(NetworkCommand::Discover(
peer.0.clone(),
"root".to_string(),
self.connected_address.clone(),
));
}
}
resp.context_menu(|ui| {
// ... action // ... action
match self.server_status { match self.server_status {
ServerStatus::Connected => { ServerStatus::Connected => {
@@ -593,78 +637,78 @@ impl eframe::App for P2PClientApp {
// ... autres boutons // ... autres boutons
}); });
}); });
// if self.loading_peers.contains(&peer.0) { // if self.loading_peers.contains(&peer.0) {
// ui.spinner(); // ui.spinner();
// } // }
//if selectable.clicked() { //if selectable.clicked() {
// switch to displaying this peer's tree // switch to displaying this peer's tree
//self.active_peer = Some(peer.0.clone()); //self.active_peer = Some(peer.0.clone());
//// Request root content if not loaded //// Request root content if not loaded
//if !self //if !self
// .loaded_fs // .loaded_fs
// .contains_key(self.active_peer.as_ref().unwrap()) // .contains_key(self.active_peer.as_ref().unwrap())
//{ //{
// //todo!(); // //todo!();
// let _ = self.network_cmd_tx.send(NetworkCommand::Discover( // let _ = self.network_cmd_tx.send(NetworkCommand::Discover(
// peer.0.clone(), // peer.0.clone(),
// "root".to_string(), // "root".to_string(),
// self.connected_address.clone(), // self.connected_address.clone(),
// )); // ));
//} //}
//} //}
//selectable.context_menu(|ui| { //selectable.context_menu(|ui| {
// // ... action // // ... action
// match self.server_status { // match self.server_status {
// ServerStatus::Connected => { // ServerStatus::Connected => {
// if ui // if ui
// .button("Utiliser le peer en tant que serveur") // .button("Utiliser le peer en tant que serveur")
// .clicked() // .clicked()
// { // {
// self.active_server = peer.0.to_string(); // self.active_server = peer.0.to_string();
// let res = self.network_cmd_tx.send( // let res = self.network_cmd_tx.send(
// NetworkCommand::ServerHandshake( // NetworkCommand::ServerHandshake(
// peer.0.to_string(), // peer.0.to_string(),
// self.connected_address.clone(), // self.connected_address.clone(),
// ), // ),
// ); // );
// } // }
// } // }
// _ => {} // _ => {}
// } // }
// if ui.button("Send Ping").clicked() { // if ui.button("Send Ping").clicked() {
// let res = self.network_cmd_tx.send(NetworkCommand::Ping( // let res = self.network_cmd_tx.send(NetworkCommand::Ping(
// peer.0.to_string(), // peer.0.to_string(),
// self.connected_address.clone(), // self.connected_address.clone(),
// )); // ));
// self.loading_peers.push(peer.0.to_owned()); // self.loading_peers.push(peer.0.to_owned());
// } // }
// if ui.button("Send Nat Traversal Request").clicked() { // if ui.button("Send Nat Traversal Request").clicked() {
// match self.network_cmd_tx.send(NetworkCommand::NatTraversal( // match self.network_cmd_tx.send(NetworkCommand::NatTraversal(
// peer.0.to_string(), // peer.0.to_string(),
// self.connected_address.clone(), // self.connected_address.clone(),
// )) { // )) {
// Ok(_) => { // Ok(_) => {
// print!("[+] successfully sent nat traversal request") // print!("[+] successfully sent nat traversal request")
// } // }
// Err(_) => { // Err(_) => {
// print!("[-] failed to send nat traversal request") // print!("[-] failed to send nat traversal request")
// } // }
// } // }
// } // }
// if ui.button("Infos").clicked() { // if ui.button("Infos").clicked() {
// // action 3 // // action 3
// ui.close(); // ui.close();
// } // }
// // ... autres boutons // // ... autres boutons
//}); //});
}
} }
} });
});
}); });
CentralPanel::default().show(ctx, |ui| { CentralPanel::default().show(ctx, |ui| {
@@ -678,13 +722,17 @@ impl eframe::App for P2PClientApp {
ui.separator(); ui.separator();
if let Some(active_peer) = &self.active_peer { if let Some(active_peer) = &self.active_peer {
if let Some(tree) = self.loaded_fs.get(active_peer) { if let Some(tree) = self.loaded_fs.clone().get(active_peer) {
ScrollArea::vertical().show(ui, |ui| { ScrollArea::vertical().show(ui, |ui| {
// Start drawing the tree from the root hash // Start drawing the tree from the root hash
self.draw_file_tree(ui, tree); self.draw_file_tree(ui, tree);
}); });
} else { } else {
ui.label(format!("Loading root for peer: {}", active_peer)); ui.horizontal(|ui| {
ui.label(format!("Loading root for peer: {}", active_peer));
ui.add_space(8.0);
ui.spinner(); // or conditional: if is_loading { ui.spinner(); }
});
} }
} else { } else {
ui.label("Connect to a peer to view a file tree."); ui.label("Connect to a peer to view a file tree.");
@@ -734,7 +782,7 @@ impl eframe::App for P2PClientApp {
// --- Helper for Drawing the Recursive File Tree --- // --- Helper for Drawing the Recursive File Tree ---
impl P2PClientApp { impl P2PClientApp {
fn draw_file_tree(&self, ui: &mut Ui, tree: &MerkleTree) { fn draw_file_tree(&mut self, ui: &mut Ui, tree: &MerkleTree) {
assert!(self.active_peer.is_some()); assert!(self.active_peer.is_some());
assert!( assert!(
self.loaded_fs self.loaded_fs
@@ -751,7 +799,7 @@ impl P2PClientApp {
} }
fn draw_file_node( fn draw_file_node(
&self, &mut self,
ui: &mut Ui, ui: &mut Ui,
to_draw: NodeHash, to_draw: NodeHash,
tree: &MerkleTree, tree: &MerkleTree,

11
client-network/src/data.rs
View File

@@ -473,15 +473,8 @@ pub fn big_or_chunk_to_file(tree: &MerkleTree, node: &MerkleNode, file: &mut Fil
} }
} }
MerkleNode::Chunk(chunk) => { MerkleNode::Chunk(chunk) => {
if !chunk.data.is_empty() { println!("wrote data");
// Enlève le premier élément let _ = file.write_all(&chunk.data);
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"); println!("invalid type of file");

163
client-network/src/datum_parsing.rs
View File

@@ -11,103 +11,84 @@ pub fn parse_received_datum(
datum_length: usize, datum_length: usize,
) -> Option<([u8; 32], MerkleNode)> { ) -> Option<([u8; 32], MerkleNode)> {
let hash_name: [u8; 32] = recevied_datum[..32].try_into().expect("error"); let hash_name: [u8; 32] = recevied_datum[..32].try_into().expect("error");
let value = &recevied_datum[32..datum_length]; let value = &recevied_datum[32..recevied_datum.len()];
let value_slice = value.to_vec(); let value_slice = value.to_vec();
println!("valueslice: {:?}, {}", value_slice, value_slice.len()); println!("valueslice: {:?}, {}", value_slice, value_slice.len());
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);
println!( // envoyer un datum request
"((value_slice.len() - 1) / 32) {} ", dir_entries.push(DirectoryEntry {
((value_slice.len() - 1) / 32) filename: name.try_into().expect("incorrect size"),
); content_hash: hash,
// Créer une instance de Sha256 });
let mut hasher = Sha256::new(); }
// Alimenter le hasher avec les données let current = DirectoryNode::new(dir_entries);
hasher.update(value_slice.clone()); match current {
Ok(current_node) => Some((hash_name, MerkleNode::Directory(current_node))),
// Obtention du résultat Err(e) => {
let result = hasher.finalize(); println!("{}", e);
if result.to_vec() != hash_name.to_vec() { None
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 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"));
}
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,
} }
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];
// 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,
} }
} }

90
client-network/src/lib.rs
View File

@@ -73,7 +73,7 @@ impl P2PSharedData {
let mut threads = Vec::new(); let mut threads = Vec::new();
let senders = MultipleSenders::new(5, &shared_socket, cmd_tx, &mut threads); let senders = MultipleSenders::new(1, &shared_socket, cmd_tx, &mut threads);
let shared_senders = Arc::new(senders); let shared_senders = Arc::new(senders);
let server_name = Arc::new(Mutex::new("".to_string())); let server_name = Arc::new(Mutex::new("".to_string()));
let server_address = Arc::new(Mutex::new("".to_string())); let server_address = Arc::new(Mutex::new("".to_string()));
@@ -340,9 +340,53 @@ pub fn start_p2p_executor(
sd.messages_list(), sd.messages_list(),
sd.handshake_peers.get_username_peerinfo_map(), 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 = sd.set_servername(username.to_owned());
perform_handshake(&sd, username, ip, event_tx.clone(), true).await; 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 { } else {
println!("no shared data"); println!("no shared data");
} }
@@ -360,7 +404,9 @@ pub fn start_p2p_executor(
NetworkCommand::Discover(username, hash, ip) => { NetworkCommand::Discover(username, hash, ip) => {
// envoie un handshake au peer, puis un root request // envoie un handshake au peer, puis un root request
if let Some(sd) = shared_data.as_ref() { 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 { match res {
Some(peerinfo) => { Some(peerinfo) => {
let id = generate_id(); let id = generate_id();
@@ -395,14 +441,31 @@ pub fn start_p2p_executor(
} }
None => { None => {
// envoyer un handshake // envoyer un handshake
let res = perform_handshake( match perform_handshake(
&sd, &sd,
username, username.to_owned(),
ip, ip,
event_tx.clone(), 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 { } else {
@@ -756,7 +819,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() { if addresses.is_empty() {
return Err(FetchSocketAddressError::NoRegisteredAddresses); return Err(FetchSocketAddressError::NoRegisteredAddresses);
} else if !addresses.iter().any(|a| matches!(a, SocketAddr::V4(_))) { } else if !addresses.iter().any(|a| matches!(a, SocketAddr::V4(_))) {

26
client-network/src/message_handling.rs
View File

@@ -314,7 +314,7 @@ pub fn parse_message(
ERROR => { ERROR => {
if let Ok(err_received) = if let Ok(err_received) =
String::from_utf8(received_message[LENGTH..(msg_length + LENGTH + 4)].to_vec()) String::from_utf8(received_message[LENGTH..(msg_length + LENGTH)].to_vec())
{ {
let err_msg = format!("Error received from peer {} : {}", ip, err_received); 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, "".to_owned()));
@@ -370,11 +370,14 @@ pub fn parse_message(
// envoyer la root request // envoyer la root request
let _ = &guard.remove_entry(&id); let _ = &guard.remove_entry(&id);
println!("message {} retiré de la liste", id); println!("message {} retiré de la liste", id);
let new_id = generate_id();
let rootrequest = let rootrequest = construct_message(
construct_message(ROOTREQUEST, Vec::new(), new_id, crypto_pair); ROOTREQUEST,
let _ = &guard.insert(new_id, EventType::RootRequest); Vec::new(),
println!("root requesst sent"); generate_id(),
crypto_pair,
);
//&guard.insert(, v)
return rootrequest; return rootrequest;
} }
EventType::Hello => { EventType::Hello => {
@@ -389,7 +392,6 @@ pub fn parse_message(
} }
ROOTREPLY => { ROOTREPLY => {
// recuperer le pseudo du peers ayant repondu // recuperer le pseudo du peers ayant repondu
println!("root reply received");
let peers_exist = handhsake_history.get_peer_info_ip(ip.to_string()); let peers_exist = handhsake_history.get_peer_info_ip(ip.to_string());
match peers_exist { match peers_exist {
Some(peerinfo) => { Some(peerinfo) => {
@@ -427,9 +429,7 @@ pub fn parse_message(
constructed_message = datumreqest; constructed_message = datumreqest;
guard.insert(new_id, EventType::DatumRequest); guard.insert(new_id, EventType::DatumRequest);
} }
_ => { _ => {}
println!("event not prensent");
}
} }
} }
None => {} None => {}
@@ -468,6 +468,7 @@ pub fn parse_message(
} }
} }
EventType::DatumRequestBig => { EventType::DatumRequestBig => {
let _ = &guard.remove_entry(&id);
println!("message {} retiré de la liste", id); println!("message {} retiré de la liste", id);
let received_length = u16::from_be_bytes( let received_length = u16::from_be_bytes(
received_message[TYPE..LENGTH] received_message[TYPE..LENGTH]
@@ -480,7 +481,6 @@ pub fn parse_message(
parse_received_datum(received_datum.to_vec(), received_length as usize); parse_received_datum(received_datum.to_vec(), received_length as usize);
match parsed_node { match parsed_node {
Some(tuple) => { Some(tuple) => {
let _ = &guard.remove_entry(&id);
let _ = cmd_tx.send(NetworkEvent::DataReceived( let _ = cmd_tx.send(NetworkEvent::DataReceived(
tuple.0, tuple.0,
tuple.1, tuple.1,
@@ -488,9 +488,7 @@ pub fn parse_message(
)); ));
println!("datareceived event sent"); println!("datareceived event sent");
} }
None => { None => {}
println!("message corrompu, nouvelle tentative");
}
} }
} }
_ => {} _ => {}

5
client-network/src/messages_channels.rs
View File

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

87
client-network/src/registration.rs
View File

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