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

Compare commits

base: bob:a3648c2116825c66159b69308fdec07214704ece
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

5 Commits
a3648c2116 ... 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
TIBERGHIEN corentin
aec686b502 fix out of boudns 2026-01-24 23:59:15 +01:00
Tiago Batista Cardoso
95c2dfe83c pretty 2026-01-24 23:04:01 +01:00
Tiago Batista Cardoso
7a1155c0bd carre 2026-01-24 22:32:01 +01:00
9 changed files with 513 additions and 186 deletions
Expand all files Collapse all files

BIN
Download/12.text
View File

Binary file not shown.

BIN
Download/13.text
View File

Binary file not shown.

BIN
Download/README
View File

Binary file not shown.

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

@@ -1,12 +1,13 @@
use client_network::{ use client_network::{
ChunkNode, MerkleNode, MerkleTree, NetworkCommand, NetworkEvent, NodeHash, ChunkNode, MerkleNode, MerkleTree, NetworkCommand, NetworkEvent, NodeHash,
big_or_chunk_to_file, filename_to_string, generate_base_tree, node_hash_to_hex_string, big_or_chunk_to_file, filename_to_string, generate_base_tree, node_hash_to_hex_string,
remove_null_bytes, node_to_file, remove_null_bytes,
}; };
use crossbeam_channel::{Receiver, Sender}; use crossbeam_channel::{Receiver, Sender};
use egui::{ use egui::{
CentralPanel, CollapsingHeader, Color32, Context, CornerRadius, Frame, Response, ScrollArea, Align, CentralPanel, CollapsingHeader, Color32, Context, CornerRadius, Frame, Layout,
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};
@@ -32,6 +33,7 @@ pub struct P2PClientApp {
// GUI State // GUI State
status_message: String, status_message: String,
known_peers: Vec<(String, bool)>, known_peers: Vec<(String, bool)>,
loading_peers: Vec<String>,
connect_address_input: String, connect_address_input: String,
connected_address: String, connected_address: String,
connect_name_input: String, connect_name_input: String,
@@ -47,12 +49,19 @@ pub struct P2PClientApp {
show_network_popup: bool, // gérer selon besoin show_network_popup: bool, // gérer selon besoin
error_message: Option<String>, // Some(message) -> afficher, None -> rien error_message: Option<(String, String)>, // Some(message) -> afficher, None -> rien
success_message: Option<String>, // Some(message) -> afficher, None -> rien success_message: Option<(String, String)>, // Some(message) -> afficher, None -> rien
active_server: String, active_server: String,
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,
} }
@@ -73,6 +82,7 @@ impl P2PClientApp {
network_event_rx: event_rx, network_event_rx: event_rx,
status_message: "Client Initialized. Awaiting network status...".to_string(), status_message: "Client Initialized. Awaiting network status...".to_string(),
known_peers: Vec::new(), known_peers: Vec::new(),
loading_peers: Vec::new(),
connect_address_input: "https://jch.irif.fr:8443".to_string(), connect_address_input: "https://jch.irif.fr:8443".to_string(),
connected_address: "".to_string(), connected_address: "".to_string(),
loaded_fs, loaded_fs,
@@ -85,15 +95,17 @@ 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(),
} }
} }
pub fn show_error(&mut self, msg: impl Into<String>) { pub fn show_error(&mut self, msg: impl Into<String>, peer_username: impl Into<String>) {
self.error_message = Some(msg.into()); self.error_message = Some((msg.into(), peer_username.into()));
} }
pub fn show_success(&mut self, msg: impl Into<String>) { pub fn show_success(&mut self, msg: impl Into<String>, peer_username: impl Into<String>) {
self.success_message = Some(msg.into()); self.success_message = Some((msg.into(), peer_username.into()));
} }
pub fn clear_error(&mut self) { pub fn clear_error(&mut self) {
self.error_message = None; self.error_message = None;
@@ -101,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 ---
@@ -252,13 +272,15 @@ impl eframe::App for P2PClientApp {
self.known_peers.clear(); self.known_peers.clear();
self.server_status = ServerStatus::NotConnected; self.server_status = ServerStatus::NotConnected;
} }
NetworkEvent::Error(err) => { NetworkEvent::Error(err, peer_username) => {
self.show_error(err); self.loading_peers.retain(|s| s != peer_username.as_str());
self.show_error(err, peer_username);
} }
NetworkEvent::InitDownload(hash, ip) => { NetworkEvent::InitDownload(hash, ip, name) => {
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.root_downloading_file = name;
let _ = self let _ = self
.current_downloading_file_map .current_downloading_file_map
.data .data
@@ -287,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);
} }
@@ -295,19 +318,52 @@ impl eframe::App for P2PClientApp {
} }
_ => {} _ => {}
} }
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(self.root_downloading_file.clone());
if let Some(current) = self
.current_downloading_file_map
.data
.get(&self.current_downloading_file_map.root)
{
match file {
Ok(mut fileok) => {
big_or_chunk_to_file(
&self.current_downloading_file_map,
current,
&mut fileok,
);
}
Err(e) => {
eprintln!("error creaation file: {}", e);
}
}
}*/
self.current_total_chunks = None;
self.current_received_chunks = 0;
println!("bigfile téléchargé"); println!("bigfile téléchargé");
} }
} }
NetworkEvent::Success(msg) => { NetworkEvent::Success(msg, peer_username) => {
self.show_success(msg); self.loading_peers.retain(|s| s != peer_username.as_str());
self.show_success(msg, peer_username);
} }
NetworkEvent::HandshakeFailed() => {} NetworkEvent::HandshakeFailed() => {}
NetworkEvent::ServerHandshakeFailed(err) => { NetworkEvent::ServerHandshakeFailed(err) => {
self.active_server = "".to_string(); self.active_server = "".to_string();
self.server_status = ServerStatus::NotConnected; self.server_status = ServerStatus::NotConnected;
let err_msg = format!("Failed to connect to the server: {}", err); let err_msg = format!("Failed to connect to the server: {}", err);
self.show_error(err_msg); self.show_error(err_msg, "");
let res = self.network_cmd_tx.send(NetworkCommand::ResetServerPeer()); let res = self.network_cmd_tx.send(NetworkCommand::ResetServerPeer());
} }
} }
@@ -375,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));
}); });
}); });
@@ -425,97 +490,225 @@ 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| {
ui.selectable_label(is_active, format!("{}", peer.0)) // // horizontal row: label on the left, spinner on the right
}); // ui.horizontal(|ui| {
selectable = internal.inner; // // let selectable label take remaining space
} else { // ui.with_layout(Layout::left_to_right(Align::Center), |ui| {
selectable = ui.selectable_label(is_active, format!("{}", peer.0)); // ui.add_space(0.0); // ensure layout established
} // return ui.selectable_label(
// is_active,
// format!("{}", peer.0),
// );
// })
// .inner // return Response from the inner closure if your egui version does so
// })
// });
// selectable = internal.inner.inner;
// } else {
// selectable = ui.selectable_label(is_active, format!("{}", peer.0));
// }
if selectable.clicked() { // place spinner to the right of the label
// switch to displaying this peer's tree ui.horizontal(|ui| {
self.active_peer = Some(peer.0.clone()); // Use same width for the label widget as the selectable we already created:
// Request root content if not loaded // Recreate selectable inline so both label and spinner share the same row.
if !self let resp = if &self.active_server == &peer.0 {
.loaded_fs // draw with frame inline
.contains_key(self.active_peer.as_ref().unwrap()) let frame = Frame {
{ fill: Color32::DARK_BLUE,
//todo!(); stroke: Stroke::default(),
let _ = self.network_cmd_tx.send(NetworkCommand::Discover( corner_radius: CornerRadius::from(0.5),
peer.0.clone(), ..Default::default()
"root".to_string(), };
self.connected_address.clone(), frame
)); .show(ui, |ui| {
} ui.selectable_label(
} is_active,
selectable.context_menu(|ui| { format!("{}", peer.0),
// ... action )
match self.server_status { })
ServerStatus::Connected => { .inner
if ui } else {
.button("Utiliser le peer en tant que serveur") ui.selectable_label(is_active, format!("{}", peer.0))
.clicked() };
ui.add_space(4.0); // small gap
if self.loading_peers.contains(&peer.0) {
// push spinner to right by expanding a spacer before it
ui.with_layout(
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())
{ {
self.active_server = peer.0.to_string(); //todo!();
let res = self.network_cmd_tx.send( let _ =
NetworkCommand::ServerHandshake( self.network_cmd_tx.send(NetworkCommand::Discover(
peer.0.to_string(), peer.0.clone(),
"root".to_string(),
self.connected_address.clone(), self.connected_address.clone(),
), ));
);
} }
} }
_ => {} resp.context_menu(|ui| {
} // ... action
if ui.button("Send Ping").clicked() { match self.server_status {
let res = self.network_cmd_tx.send(NetworkCommand::Ping( ServerStatus::Connected => {
peer.0.to_string(), if ui
self.connected_address.clone(), .button("Utiliser le peer en tant que serveur")
)); .clicked()
} {
if ui.button("Send Nat Traversal Request").clicked() { self.active_server = peer.0.to_string();
match self.network_cmd_tx.send(NetworkCommand::NatTraversal( let res = self.network_cmd_tx.send(
peer.0.to_string(), NetworkCommand::ServerHandshake(
self.connected_address.clone(), peer.0.to_string(),
)) { self.connected_address.clone(),
Ok(_) => { ),
print!("[+] successfully sent nat traversal request") );
} }
Err(_) => {
print!("[-] failed to send nat traversal request")
} }
_ => {}
} }
} if ui.button("Send Ping").clicked() {
if ui.button("Infos").clicked() { let res = self.network_cmd_tx.send(NetworkCommand::Ping(
// action 3 peer.0.to_string(),
ui.close(); self.connected_address.clone(),
} ));
// ... autres boutons self.loading_peers.push(peer.0.to_owned());
}); }
if ui.button("Send Nat Traversal Request").clicked() {
match self.network_cmd_tx.send(
NetworkCommand::NatTraversal(
peer.0.to_string(),
self.connected_address.clone(),
),
) {
Ok(_) => {
print!(
"[+] successfully sent nat traversal request"
)
}
Err(_) => {
print!("[-] failed to send nat traversal request")
}
}
}
if ui.button("Infos").clicked() {
// action 3
ui.close();
}
// ... autres boutons
});
});
// if self.loading_peers.contains(&peer.0) {
// ui.spinner();
// }
//if selectable.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(),
// ));
//}
//}
//selectable.context_menu(|ui| {
// // ... action
// match self.server_status {
// ServerStatus::Connected => {
// if ui
// .button("Utiliser le peer en tant que serveur")
// .clicked()
// {
// self.active_server = peer.0.to_string();
// let res = self.network_cmd_tx.send(
// NetworkCommand::ServerHandshake(
// peer.0.to_string(),
// self.connected_address.clone(),
// ),
// );
// }
// }
// _ => {}
// }
// if ui.button("Send Ping").clicked() {
// let res = self.network_cmd_tx.send(NetworkCommand::Ping(
// peer.0.to_string(),
// self.connected_address.clone(),
// ));
// self.loading_peers.push(peer.0.to_owned());
// }
// if ui.button("Send Nat Traversal Request").clicked() {
// match self.network_cmd_tx.send(NetworkCommand::NatTraversal(
// peer.0.to_string(),
// self.connected_address.clone(),
// )) {
// Ok(_) => {
// print!("[+] successfully sent nat traversal request")
// }
// Err(_) => {
// print!("[-] failed to send nat traversal request")
// }
// }
// }
// if ui.button("Infos").clicked() {
// // action 3
// ui.close();
// }
// // ... autres boutons
//});
}
} }
} });
});
}); });
CentralPanel::default().show(ctx, |ui| { CentralPanel::default().show(ctx, |ui| {
@@ -529,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.");
@@ -554,7 +751,8 @@ impl eframe::App for P2PClientApp {
.resizable(false) .resizable(false)
.anchor(egui::Align2::CENTER_CENTER, [0.0, 0.0]) .anchor(egui::Align2::CENTER_CENTER, [0.0, 0.0])
.show(ctx, |ui| { .show(ctx, |ui| {
ui.label(&msg); ui.label(&msg.1);
ui.label(&msg.0);
if ui.button("OK").clicked() { if ui.button("OK").clicked() {
self.clear_error(); self.clear_error();
} }
@@ -568,7 +766,8 @@ impl eframe::App for P2PClientApp {
.resizable(false) .resizable(false)
.anchor(egui::Align2::CENTER_CENTER, [0.0, 0.0]) .anchor(egui::Align2::CENTER_CENTER, [0.0, 0.0])
.show(ctx, |ui| { .show(ctx, |ui| {
ui.label(&msg); ui.label(&msg.1);
ui.label(&msg.0);
if ui.button("OK").clicked() { if ui.button("OK").clicked() {
self.clear_success(); self.clear_success();
} }
@@ -583,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
@@ -600,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,
@@ -674,10 +873,16 @@ impl P2PClientApp {
.on_hover_text("Click to request file chunks...") .on_hover_text("Click to request file chunks...")
.clicked() .clicked()
{ {
if let Some(addr) = &self.active_peer { if let Some(name) = filename {
let _ = self if let Ok(nameb) = String::from_utf8(name.to_vec()) {
.network_cmd_tx if let Some(addr) = &self.active_peer {
.send(NetworkCommand::InitDownload(to_draw, addr.clone())); let _ = self.network_cmd_tx.send(NetworkCommand::InitDownload(
to_draw,
addr.clone(),
nameb,
));
}
}
} }
} }
} }

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

@@ -154,8 +154,8 @@ impl MerkleNode {
match self { match self {
MerkleNode::Chunk(_) => 0, MerkleNode::Chunk(_) => 0,
MerkleNode::Directory(_) => 1, MerkleNode::Directory(_) => 1,
MerkleNode::Big(_) => 3, MerkleNode::Big(_) => 2,
MerkleNode::BigDirectory(_) => 4, MerkleNode::BigDirectory(_) => 3,
} }
} }

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

@@ -11,7 +11,7 @@ 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]; let datum_type = value_slice[0];
@@ -49,12 +49,22 @@ pub fn parse_received_datum(
} }
} }
BIG => { 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"); println!("its a BIG bro");
let chlidren: Vec<NodeHash> = Vec::new();
Some(( Some((
hash_name, hash_name,
MerkleNode::Big(crate::BigNode { MerkleNode::Big(crate::BigNode {
children_hashes: chlidren, children_hashes: bigdir_entries,
}), }),
)) ))
} }

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

@@ -185,7 +185,7 @@ pub enum NetworkCommand {
SendDatum(MerkleNode, [u8; 32], String), SendDatum(MerkleNode, [u8; 32], String),
SendNoDatum(Vec<u8>, String), SendNoDatum(Vec<u8>, String),
SendRootReply(Vec<u8>, String), SendRootReply(Vec<u8>, String),
InitDownload([u8; 32], String), InitDownload([u8; 32], String, String),
// ... // ...
} }
@@ -194,8 +194,8 @@ pub enum NetworkEvent {
Connected(String), Connected(String),
ConnectedHandshake(), ConnectedHandshake(),
Disconnected(), Disconnected(),
Error(String), Error(String, String),
Success(String), Success(String, String),
PeerConnected(String), PeerConnected(String),
PeerListUpdated(Vec<(String, bool)>), PeerListUpdated(Vec<(String, bool)>),
FileTreeReceived([u8; 32], MerkleNode, String), // peer_id, content FileTreeReceived([u8; 32], MerkleNode, String), // peer_id, content
@@ -205,7 +205,7 @@ pub enum NetworkEvent {
ServerHandshakeFailed(String), ServerHandshakeFailed(String),
DatumRequest([u8; 32], String), DatumRequest([u8; 32], String),
RootRequest(String), RootRequest(String),
InitDownload([u8; 32], String), InitDownload([u8; 32], String, String),
// ... // ...
} }
@@ -246,11 +246,14 @@ pub fn start_p2p_executor(
// Check for commands from the GUI // Check for commands from the GUI
if let Ok(cmd) = cmd_rx.try_recv() { if let Ok(cmd) = cmd_rx.try_recv() {
match cmd { match cmd {
NetworkCommand::InitDownload(hash, ip) => { NetworkCommand::InitDownload(hash, ip, name) => {
if let Some(sd) = shared_data.as_ref() { if let Some(sd) = shared_data.as_ref() {
if let Some(res) = sd.handshake_peers.get_peer_info_username(ip) { if let Some(res) = sd.handshake_peers.get_peer_info_username(ip) {
let _ = event_tx let _ = event_tx.send(NetworkEvent::InitDownload(
.send(NetworkEvent::InitDownload(hash, res.ip.to_string())); hash,
res.ip.to_string(),
name.to_string(),
));
} }
} }
} }
@@ -337,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");
} }
@@ -357,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();
@@ -392,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 {
@@ -458,7 +524,8 @@ pub fn start_p2p_executor(
Err(e) => { Err(e) => {
let mut err_msg = String::from("failed to initialize socket: "); let mut err_msg = String::from("failed to initialize socket: ");
err_msg += &e.to_string(); 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()); let res = event_tx.send(NetworkEvent::Disconnected());
None None
} }
@@ -468,7 +535,8 @@ pub fn start_p2p_executor(
if let Err(e) = register_with_the_server(&sd.cryptopair(), &ip).await { if let Err(e) = register_with_the_server(&sd.cryptopair(), &ip).await {
let mut err_msg = String::from("request failed: "); let mut err_msg = String::from("request failed: ");
err_msg += &e.to_string(); 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()); let res = event_tx.send(NetworkEvent::Disconnected());
} else { } else {
let res = event_tx.send(NetworkEvent::Connected(ip)); let res = event_tx.send(NetworkEvent::Connected(ip));
@@ -492,6 +560,7 @@ pub fn start_p2p_executor(
if ip == "" { if ip == "" {
let res = event_tx.send(NetworkEvent::Error( let res = event_tx.send(NetworkEvent::Error(
"Not registered to any server".to_string(), "Not registered to any server".to_string(),
"".to_owned(),
)); ));
} else { } else {
println!("cc"); println!("cc");
@@ -530,7 +599,7 @@ pub fn start_p2p_executor(
let pingrequest = let pingrequest =
construct_message(PING, Vec::new(), id, sd.cryptopair_ref()); construct_message(PING, Vec::new(), id, sd.cryptopair_ref());
let peer_address = 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 { match peer_address {
Ok(addr) => { Ok(addr) => {
//if let Some(ping) = pingrequest { //if let Some(ping) = pingrequest {
@@ -546,10 +615,13 @@ pub fn start_p2p_executor(
// sd.messages_list(), // sd.messages_list(),
// ); // );
//} //}
match event_tx.send(NetworkEvent::Success(format!( match event_tx.send(NetworkEvent::Success(
"Successfully sent ping message to {}.", format!(
addr.to_string() "Successfully sent ping message to {}.",
))) { addr.to_string(),
),
str.to_owned(),
)) {
Ok(_) => {} Ok(_) => {}
Err(e) => { Err(e) => {
eprintln!("NetworkEvent error : {}", e); eprintln!("NetworkEvent error : {}", e);
@@ -557,7 +629,9 @@ pub fn start_p2p_executor(
}; };
} }
Err(err_msg) => { 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(_) => {} Ok(_) => {}
Err(e) => { Err(e) => {
eprintln!("NetworkEvent error : {}", e); eprintln!("NetworkEvent error : {}", e);
@@ -624,7 +698,9 @@ pub fn start_p2p_executor(
); );
} }
Err(err_msg) => { 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(_) => {} Ok(_) => {}
Err(e) => { Err(e) => {
eprintln!("NetworkEvent error : {}", e); eprintln!("NetworkEvent error : {}", e);
@@ -743,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(_))) {

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

@@ -317,10 +317,10 @@ pub fn parse_message(
String::from_utf8(received_message[LENGTH..(msg_length + LENGTH)].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)); let _ = cmd_tx_clone.send(NetworkEvent::Error(err_msg, "".to_owned()));
} else { } else {
let err_msg = format!("Error received from peer {} : N/A", ip,); 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()));
} }
} }
@@ -475,6 +475,7 @@ pub fn parse_message(
.try_into() .try_into()
.expect("incorrect size"), .expect("incorrect size"),
); );
println!("received length:{}", received_length);
let received_datum = &received_message[LENGTH..]; let received_datum = &received_message[LENGTH..];
let parsed_node = let parsed_node =
parse_received_datum(received_datum.to_vec(), received_length as usize); parse_received_datum(received_datum.to_vec(), received_length as usize);

86
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,47 +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);
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 { 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)); 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(_) => {
@@ -112,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)]