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

Compare commits

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

9 Commits
bigfix ... cb2e89b1e9

Author SHA1 Message Date
Tiago Batista Cardoso
cb2e89b1e9 working 2026-01-24 19:47:15 +01:00
Tiago Batista Cardoso
524eaec76d decent progress 2026-01-22 01:05:02 +01:00
TIBERGHIEN corentin
34a9db047d ping deadlock 2026-01-22 00:40:29 +01:00
Tiago Batista Cardoso
fe04c8ed27 tried 2026-01-22 00:40:21 +01:00
Tiago Batista Cardoso
1f41ba5261 give up 2026-01-22 00:30:17 +01:00
Tiago Batista Cardoso
7eb1ab119d wip 2026-01-22 00:14:26 +01:00
Tiago Batista Cardoso
0799841cf2 splash 2026-01-21 23:58:15 +01:00
Tiago Batista Cardoso
424c11c5aa work 2026-01-21 22:48:05 +01:00
Tiago Batista Cardoso
271fdbbb4c temp 2026-01-21 17:40:21 +01:00
15 changed files with 502 additions and 1365 deletions
Expand all files Collapse all files

1
.gitignore vendored
View File

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

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

@@ -1,16 +1,14 @@
use client_network::{
ChunkNode, MerkleNode, MerkleTree, NetworkCommand, NetworkEvent, NodeHash,
big_or_chunk_to_file, generate_base_tree, node_hash_to_hex_string, remove_null_bytes,
ChunkNode, MerkleNode, MerkleTree, NetworkCommand, NetworkEvent, NodeHash, filename_to_string,
node_hash_to_hex_string,
};
use crossbeam_channel::{Receiver, Sender};
use egui::{
Align, CentralPanel, CollapsingHeader, Color32, Context, CornerRadius, Frame, Id, Layout,
ProgressBar, ScrollArea, SidePanel, Stroke, TopBottomPanel, Ui, ViewportCommand,
Align, Align2, Button, CentralPanel, CollapsingHeader, Color32, Context, CornerRadius, Frame,
Id, LayerId, Layout, Order, Popup, Response, ScrollArea, SidePanel, Stroke, TextStyle,
TopBottomPanel, Ui, ViewportCommand,
};
use std::collections::HashMap;
use std::collections::HashSet;
use std::fs::{OpenOptions, create_dir};
use std::{collections::HashMap, fmt::format};
enum ServerStatus {
Loading,
@@ -19,49 +17,45 @@ enum ServerStatus {
ConnectedHandshake,
}
// --- Main Application Struct ---
pub struct P2PClientApp {
remaining: std::time::Duration, // temps restant
last_update: std::time::Instant, // pour calculer delta
timer_started: bool,
// Communication channels
network_cmd_tx: Sender<NetworkCommand>,
network_event_rx: Receiver<NetworkEvent>,
// GUI State
status_message: String,
known_peers: Vec<(String, bool)>,
loading_peers: Vec<String>,
connect_address_input: String,
connected_address: String,
connect_name_input: String,
// Key: Parent Directory Hash (String), Value: List of children FileNode
loaded_fs: HashMap<String, MerkleTree>,
shared_tree: MerkleTree,
// Current peer tree displayed
active_peer: Option<String>,
server_status: ServerStatus,
error_message: Option<(String, String)>, // Some(message) -> afficher, None -> rien
success_message: Option<(String, String)>, // Some(message) -> afficher, None -> rien
show_network_popup: bool, // gérer selon besoin
error_message: Option<String>, // Some(message) -> afficher, None -> rien
success_message: Option<String>, // Some(message) -> afficher, None -> rien
//
active_server: String,
current_downloading_file_map: MerkleTree,
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,
show_network_window: bool,
show_choose_server_window: bool,
}
impl P2PClientApp {
pub fn new(cmd_tx: Sender<NetworkCommand>, event_rx: Receiver<NetworkEvent>) -> Self {
let loaded_fs = HashMap::new();
let current_downloading_file_map = MerkleTree::new(HashMap::new(), [0; 32]);
//let (root_hash, tree_content) = MerkleNode::generate_base_tree();
let mut loaded_fs = HashMap::new();
//let tree = MerkleTree::new(tree_content, root_hash);
//loaded_fs.insert("bob".to_string(), tree);
Self {
remaining: std::time::Duration::from_secs(0),
@@ -69,32 +63,25 @@ impl P2PClientApp {
last_update: std::time::Instant::now(),
network_cmd_tx: cmd_tx,
network_event_rx: event_rx,
status_message: "Client Initialized. Awaiting network status...".to_string(),
known_peers: Vec::new(),
loading_peers: Vec::new(),
connect_address_input: "https://jch.irif.fr:8443".to_string(),
connected_address: "".to_string(),
loaded_fs,
active_peer: None,
server_status: ServerStatus::NotConnected,
show_network_popup: false,
error_message: None,
success_message: None,
connect_name_input: "bob".to_string(),
active_server: "".to_string(),
shared_tree: generate_base_tree(),
current_downloading_file_map: current_downloading_file_map,
current_total_chunks: None,
current_received_chunks: 0,
root_downloading_file: "".to_string(),
remaining_chunks: HashSet::new(),
show_network_window: false,
show_choose_server_window: false,
}
}
pub fn show_error(&mut self, msg: impl Into<String>, peer_username: impl Into<String>) {
self.error_message = Some((msg.into(), peer_username.into()));
pub fn show_error(&mut self, msg: impl Into<String>) {
self.error_message = Some(msg.into());
}
pub fn show_success(&mut self, msg: impl Into<String>, peer_username: impl Into<String>) {
self.success_message = Some((msg.into(), peer_username.into()));
pub fn show_success(&mut self, msg: impl Into<String>) {
self.success_message = Some(msg.into());
}
pub fn clear_error(&mut self) {
self.error_message = None;
@@ -102,16 +89,10 @@ impl P2PClientApp {
pub fn clear_success(&mut self) {
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 ---
impl eframe::App for P2PClientApp {
fn update(&mut self, ctx: &Context, _frame: &mut eframe::Frame) {
if matches!(self.server_status, ServerStatus::Connected) && !self.timer_started {
@@ -120,6 +101,7 @@ impl eframe::App for P2PClientApp {
self.timer_started = true;
}
// in update (every frame)
let now = std::time::Instant::now();
let delta = now.saturating_duration_since(self.last_update);
self.last_update = now;
@@ -130,77 +112,38 @@ impl eframe::App for P2PClientApp {
self.remaining = self.remaining.saturating_sub(delta);
}
// 1. Process incoming Network Events
// We poll the channel and update the GUI state for every event received.
while let Ok(event) = self.network_event_rx.try_recv() {
match event {
NetworkEvent::RootRequest(addr) => {
let root = self.shared_tree.root;
let _ = self
.network_cmd_tx
.send(NetworkCommand::SendRootReply(root.to_vec(), addr));
}
NetworkEvent::DatumRequest(node_hash, addr) => {
let hash: NodeHash = node_hash.try_into().expect("incorrect size");
let asked_datum = self.shared_tree.data.get(&hash);
match asked_datum {
Some(datum_found) => {
let _ = self.network_cmd_tx.send(NetworkCommand::SendDatum(
datum_found.clone(),
node_hash,
addr,
));
}
None => {
let _ = self
.network_cmd_tx
.send(NetworkCommand::SendNoDatum(node_hash.to_vec(), addr));
}
NetworkEvent::PeerConnected(addr) => {
todo!();
self.status_message = format!("✅ Peer connected: {}", addr);
if !self.known_peers.contains(&(addr, true)) {
self.known_peers.push((addr, true));
}
}
NetworkEvent::PeerListUpdated(peers) => {
//todo!();
self.known_peers = peers;
}
NetworkEvent::FileTreeReceived(node_hash, merklenode, ip) => {
match &self.active_peer {
Some(active_peer) => {
if let Some(maptree) = self.loaded_fs.get_mut(active_peer) {
maptree.data.insert(node_hash, merklenode.clone());
match merklenode {
MerkleNode::Directory(d) => {
for entry in d.entries {
let _ = self.network_cmd_tx.send(
NetworkCommand::GetChildren(
entry.content_hash,
ip.clone(),
false,
),
);
}
}
MerkleNode::BigDirectory(bigd) => {
for entry in bigd.children_hashes {
let _ = self.network_cmd_tx.send(
NetworkCommand::GetChildren(
entry,
ip.clone(),
false,
),
);
}
}
_ => {}
}
}
}
None => {}
}
NetworkEvent::FileTreeReceived(node_hash, merklenode) => {
//self.status_message = "🔄 File tree updated successfully.".to_string();
}
NetworkEvent::FileTreeRootReceived(peer_id, root_hash) => {
// todo!();
/*self.status_message = format!(
"🔄 Received Merkle Root from {}: {}",
peer_id,
&root_hash[..8]
);*/
if let Ok(chunknode) = ChunkNode::new(Vec::new()) {
let data_map: HashMap<NodeHash, MerkleNode> = HashMap::new();
//data_map.insert(root_hash, MerkleNode::Chunk(chunknode));
println!("len root: {}", data_map.len());
println!("node hash: {:?}", root_hash.to_vec());
let mut data_map: HashMap<NodeHash, MerkleNode> = HashMap::new();
data_map.insert(root_hash, MerkleNode::Chunk(chunknode));
let tree = MerkleTree {
data: data_map,
root: root_hash,
@@ -214,11 +157,17 @@ impl eframe::App for P2PClientApp {
println!("tree created");
}
//self.active_peer_id = Some(peer_id.clone());
// Request the content of the root directory immediately
/*let _ = self
.network_cmd_tx
.send(NetworkCommand::RequestDirectoryContent(peer_id, root_hash));*/
}
NetworkEvent::Connected(ip) => {
self.server_status = ServerStatus::Connected;
self.connected_address = ip.clone();
self.show_choose_server_window = true;
let _ = self.network_cmd_tx.send(NetworkCommand::FetchPeerList(
self.connected_address.clone(),
));
@@ -232,214 +181,39 @@ impl eframe::App for P2PClientApp {
self.known_peers.clear();
self.server_status = ServerStatus::NotConnected;
}
NetworkEvent::Error(err, peer_username) => {
self.loading_peers.retain(|s| s != peer_username.as_str());
self.show_error(err, peer_username);
NetworkEvent::Error(err) => {
self.show_error(err);
}
NetworkEvent::InitDownload(hash, ip, name) => {
if let Some(addr) = &self.active_peer {
if let Some(roottree) = self.loaded_fs.get(addr) {
if let Some(root) = roottree.data.get(&hash) {
self.current_downloading_file_map.root = hash;
self.root_downloading_file = name;
let _ = self
.current_downloading_file_map
.data
.insert(hash, root.clone());
let _ = self
.network_cmd_tx
.send(NetworkCommand::GetChildren(hash, ip, true));
}
}
}
}
NetworkEvent::DataReceived(hash, merkle_node, ip) => {
let _ = self
.current_downloading_file_map
.data
.insert(hash, merkle_node.clone());
println!("merkle:{}", merkle_node.get_type_byte());
match merkle_node {
MerkleNode::Big(bigfile) => {
for entry in bigfile.children_hashes {
println!("entry: {:?}", entry);
let _ = self.network_cmd_tx.send(NetworkCommand::GetChildren(
entry,
ip.clone(),
true,
));
self.remaining_chunks.insert(entry);
self.current_total_chunks = Some(self.remaining_chunks.len());
}
self.remaining_chunks.remove(&hash);
}
MerkleNode::Chunk(_) => {
self.remaining_chunks.remove(&hash);
}
_ => {}
}
println!("remaining chunks size: {}", self.remaining_chunks.len());
if self.remaining_chunks.is_empty() {
let file = OpenOptions::new().append(true).create(true).open(
"./Download/".to_string()
+ &remove_null_bytes(&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);
}
}
} else {
eprintln!("error root absent");
}
println!("bigfile téléchargé {}", self.root_downloading_file);
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() {
self.current_total_chunks = None;
self.current_received_chunks = 0;
println!("bigfile téléchargé");
}
}
}
NetworkEvent::Success(msg, peer_username) => {
self.loading_peers.retain(|s| s != peer_username.as_str());
self.show_success(msg, peer_username);
NetworkEvent::Success(msg) => {
self.show_success(msg);
}
NetworkEvent::DataReceived(_, merkle_node) => todo!(),
NetworkEvent::HandshakeFailed() => {}
NetworkEvent::ServerHandshakeFailed(err) => {
self.active_server = "".to_string();
self.server_status = ServerStatus::NotConnected;
let err_msg = format!("Failed to connect to the server: {}", err);
self.show_error(err_msg, "");
match self.network_cmd_tx.send(NetworkCommand::ResetServerPeer()) {
Ok(_) => {}
Err(err) => {
println!("GUI Error : {}", err.to_string());
}
};
self.show_error(err_msg);
let res = self.network_cmd_tx.send(NetworkCommand::ResetServerPeer());
}
}
}
if self.show_choose_server_window {
let full_rect = ctx.input(|i| i.content_rect());
let modal_size = egui::vec2(400.0, 160.0);
egui::Area::new(Id::new("modal_blocker_bg"))
.order(egui::Order::Background)
.show(ctx, |ui| {
let painter = ui.painter();
painter.rect_filled(full_rect, 0.0, egui::Color32::from_black_alpha(160));
let sense = egui::Sense::click_and_drag();
ui.allocate_exact_size(full_rect.size(), sense);
});
egui::Window::new("Choose the server")
.resizable(false)
.collapsible(false)
.title_bar(true)
.anchor(egui::Align2::CENTER_CENTER, egui::Vec2::ZERO)
.fixed_size(modal_size)
.show(ctx, |ui| {
ScrollArea::vertical()
.auto_shrink([false; 2])
.show(ui, |ui| {
ui.style_mut().visuals.widgets.inactive.bg_fill =
ui.style().visuals.widgets.inactive.bg_fill; // no-op to get mutable borrow
if self.known_peers.is_empty() {
ui.add_space(10.0);
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
// place spinner to the right of the label
ui.horizontal(|ui| {
// 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.
let resp = if &self.active_server == &peer.0 {
// draw with frame inline
let frame = Frame {
fill: Color32::DARK_BLUE,
stroke: Stroke::default(),
corner_radius: CornerRadius::from(0.5),
..Default::default()
};
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
// use resp (click handling etc.)
if resp.clicked() {
self.active_server = peer.0.to_string();
match self.network_cmd_tx.send(
NetworkCommand::ServerHandshake(
peer.0.to_string(),
self.connected_address.clone(),
),
) {
Ok(_) => {}
Err(e) => {
println!("GUI Error : {}", e.to_string());
}
};
ui.close();
self.show_choose_server_window = false;
}
});
}
}
});
});
}
// 2. Menu Bar
TopBottomPanel::top("top_panel").show(ctx, |ui| {
egui::MenuBar::new().ui(ui, |ui| {
ui.menu_button("File", |ui| {
if ui.button("Settings").clicked() {}
if ui.button("Settings").clicked() {
//show settings
}
if ui.button("Quit").clicked() {
// Use ViewportCommand to request a close
ctx.send_viewport_cmd(ViewportCommand::Close);
}
});
if ui.button("Network").clicked() {
self.show_network_window = true;
}
if self.show_network_window {
ui.menu_button("Network", |ui| {
match self.server_status {
ServerStatus::Connected | ServerStatus::ConnectedHandshake => {
let desired = egui::vec2(300.0, 0.0); // width 300, auto-height if 0
@@ -451,14 +225,14 @@ impl eframe::App for P2PClientApp {
self.server_status = ServerStatus::NotConnected;
self.remaining = std::time::Duration::from_secs(0);
self.timer_started = false;
self.show_network_window = false;
ui.close();
}
});
}
ServerStatus::NotConnected => {
egui::Window::new("Network")
.resizable(false)
.show(ctx, |ui| {
let desired = egui::vec2(0.0, 0.0); // width 300, auto-height if 0
ui.set_min_size(desired);
ui.vertical(|ui| {
ui.horizontal(|ui| {
ui.label("Server IP:");
ui.text_edit_singleline(&mut self.connect_address_input);
@@ -470,58 +244,100 @@ impl eframe::App for P2PClientApp {
if ui.button("Connect").clicked() {
let addr = self.connect_address_input.clone();
let name = self.connect_name_input.clone();
let _ = self.network_cmd_tx.send(
NetworkCommand::ConnectToServerPut(
addr,
name.to_string(),
),
);
let _ = self
.network_cmd_tx
.send(NetworkCommand::ConnectToServerPut(addr, name));
self.server_status = ServerStatus::Loading;
ui.close();
self.show_network_window = false;
self.loaded_fs
.insert(name.to_string(), self.shared_tree.clone());
}
});
}
_ => {}
}
/* ui.horizontal(|ui| {
ui.label("Server peer name:");
ui.text_edit_singleline(&mut self.connect_server_name_input);
if ui.button("Connect").clicked() {
let addr = self.connect_address_input.clone();
let serv_name = self.connect_server_name_input.clone();
let _ = self
.network_cmd_tx
.send(NetworkCommand::ConnectToServer(addr, serv_name));
self.server_status = ServerStatus::Loading;
ui.close();
}
});*/
});
// état
/*if ui.button("Network").clicked() {
self.show_network_popup = true;
}*/
/*if self.show_network_popup {
egui::Window::new("Network")
.collapsible(false)
.resizable(false)
.show(ctx, |ui| {
ui.horizontal_wrapped(|ui| {
ui.with_layout(
egui::Layout::right_to_left(egui::Align::TOP),
|ui| {
if ui.button("✕").clicked() {
self.show_network_popup = false;
}
},
);
});
ui.horizontal(|ui| {
ui.label("Server IP:");
ui.text_edit_singleline(&mut self.connect_address_input);
});
ui.horizontal(|ui| {
ui.label("Server peer name:");
ui.text_edit_singleline(&mut self.connect_server_name_input);
if ui.button("Connect").clicked() {
// envoyer commande...
let addr = self.connect_address_input.clone();
let serv_name = self.connect_server_name_input.clone();
let _ = self
.network_cmd_tx
.send(NetworkCommand::ConnectToServer(addr, serv_name));
self.server_status = ServerStatus::Loading;
self.show_network_popup = false;
}
});
});
}*/
});
});
TopBottomPanel::bottom("bottom_panel").show(ctx, |ui| {
ui.horizontal(|ui| {
match self.server_status {
ServerStatus::Loading => ui.spinner(),
ServerStatus::Connected => ui.label("Registered but no server peer chosen..."),
ServerStatus::NotConnected => ui.label("No connection.."),
ServerStatus::ConnectedHandshake => ui.label("📡"),
};
ui.add_space(8.0); // small gap
// desired progress bar width
let bar_width = 220.0f32;
// push it to the right by adding space equal to remaining width minus bar width
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),
);
ServerStatus::Loading => {
ui.spinner();
}
ServerStatus::Connected => {
ui.label("Registered but no server peer chosen...");
}
ServerStatus::NotConnected => {
ui.label("No connection..");
}
ServerStatus::ConnectedHandshake => {
let str = format!("📡");
ui.label(str);
}
}
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));
});
});
@@ -543,20 +359,11 @@ impl eframe::App for P2PClientApp {
error.to_string()
);
}
if let Some(active_peer) = &self.active_peer {
if let Some(tree) = self.loaded_fs.get(active_peer) {
println!("{}", tree.data.len());
}
}
}
});
ui.separator();
ScrollArea::vertical()
.auto_shrink([false; 2])
.show(ui, |ui| {
ui.style_mut().visuals.widgets.inactive.bg_fill =
ui.style().visuals.widgets.inactive.bg_fill; // no-op to get mutable borrow
ScrollArea::vertical().show(ui, |ui| {
if self.known_peers.is_empty() {
ui.add_space(10.0);
ui.label("No active peers.");
@@ -564,52 +371,27 @@ impl eframe::App for P2PClientApp {
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
//
if peer.0.eq(&self.connect_name_input) {
ui.horizontal(|ui| {
let resp = ui.selectable_label(
is_active,
format!("{} (you)", peer.0),
);
if resp.clicked() {
self.active_peer = Some(peer.0.clone());
}
});
} else {
// place spinner to the right of the label
ui.horizontal(|ui| {
let resp = if &self.active_server == &peer.0 {
let selectable: Response;
if &self.active_server == &peer.0 {
// Create a frame with green background and render the selectable inside it.
// Adjust rounding, padding and stroke as desired.
let frame = Frame {
fill: Color32::DARK_BLUE,
stroke: Stroke::default(),
corner_radius: CornerRadius::from(0.5),
..Default::default()
};
frame
.show(ui, |ui| {
ui.selectable_label(
is_active,
format!("{}", peer.0),
)
})
.inner
} else {
let internal = frame.show(ui, |ui| {
ui.selectable_label(is_active, format!("{}", peer.0))
};
ui.add_space(4.0); // small gap
if self.loading_peers.contains(&peer.0) {
ui.with_layout(
Layout::right_to_left(Align::Center),
|ui| {
ui.spinner();
},
);
});
selectable = internal.response;
} else {
selectable = ui.selectable_label(is_active, format!("{}", peer.0));
}
if resp.clicked() {
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
@@ -617,16 +399,15 @@ impl eframe::App for P2PClientApp {
.contains_key(self.active_peer.as_ref().unwrap())
{
//todo!();
let _ = self.network_cmd_tx.send(
NetworkCommand::Discover(
let _ = self.network_cmd_tx.send(NetworkCommand::Discover(
peer.0.clone(),
"root".to_string(),
self.connected_address.clone(),
),
);
));
}
}
resp.context_menu(|ui| {
selectable.context_menu(|ui| {
// ... action
match self.server_status {
ServerStatus::Connected => {
if ui
@@ -634,17 +415,12 @@ impl eframe::App for P2PClientApp {
.clicked()
{
self.active_server = peer.0.to_string();
match self.network_cmd_tx.send(
let res = self.network_cmd_tx.send(
NetworkCommand::ServerHandshake(
peer.0.to_string(),
self.connected_address.clone(),
),
) {
Ok(_) => {}
Err(e) => {
println!("GUI Error : {}", e.to_string());
},
};
);
}
}
_ => {}
@@ -654,20 +430,14 @@ impl eframe::App for P2PClientApp {
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(
match self.network_cmd_tx.send(NetworkCommand::NatTraversal(
peer.0.to_string(),
self.connected_address.clone(),
),
) {
)) {
Ok(_) => {
print!(
"[+] successfully sent nat traversal request"
)
print!("[+] successfully sent nat traversal request")
}
Err(_) => {
print!("[-] failed to send nat traversal request")
@@ -681,8 +451,6 @@ impl eframe::App for P2PClientApp {
// ... autres boutons
});
});
}
}
}
});
@@ -699,17 +467,13 @@ impl eframe::App for P2PClientApp {
ui.separator();
if let Some(active_peer) = &self.active_peer {
if let Some(tree) = self.loaded_fs.clone().get(active_peer) {
if let Some(tree) = self.loaded_fs.get(active_peer) {
ScrollArea::vertical().show(ui, |ui| {
// Start drawing the tree from the root hash
self.draw_file_tree(ui, tree);
});
} else {
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 {
ui.label("Connect to a peer to view a file tree.");
@@ -728,8 +492,7 @@ impl eframe::App for P2PClientApp {
.resizable(false)
.anchor(egui::Align2::CENTER_CENTER, [0.0, 0.0])
.show(ctx, |ui| {
ui.label(&msg.1);
ui.label(&msg.0);
ui.label(&msg);
if ui.button("OK").clicked() {
self.clear_error();
}
@@ -743,8 +506,7 @@ impl eframe::App for P2PClientApp {
.resizable(false)
.anchor(egui::Align2::CENTER_CENTER, [0.0, 0.0])
.show(ctx, |ui| {
ui.label(&msg.1);
ui.label(&msg.0);
ui.label(&msg);
if ui.button("OK").clicked() {
self.clear_success();
}
@@ -759,7 +521,7 @@ impl eframe::App for P2PClientApp {
// --- Helper for Drawing the Recursive File Tree ---
impl P2PClientApp {
fn draw_file_tree(&mut self, ui: &mut Ui, tree: &MerkleTree) {
fn draw_file_tree(&self, ui: &mut Ui, tree: &MerkleTree) {
assert!(self.active_peer.is_some());
assert!(
self.loaded_fs
@@ -776,7 +538,7 @@ impl P2PClientApp {
}
fn draw_file_node(
&mut self,
&self,
ui: &mut Ui,
to_draw: NodeHash,
tree: &MerkleTree,
@@ -789,12 +551,11 @@ impl P2PClientApp {
if let Some(current) = tree.data.get(&to_draw) {
let name = {
if filename.is_some() {
String::from_utf8(filename.unwrap().to_vec()).expect("err")
filename_to_string(filename.unwrap())
} else {
node_hash_to_hex_string(&to_draw)
}
};
match current {
MerkleNode::Chunk(node) => {
if ui
@@ -802,30 +563,11 @@ impl P2PClientApp {
.on_hover_text("Click to request file chunks...")
.clicked()
{
match create_dir("./Download/") {
Ok(_) => println!("Directory created successfully!"),
Err(e) => println!("Failed to create directory: {}", e),
}
let new_name = format!("./Download/{}", name);
let sani = remove_null_bytes(&new_name);
println!("sani:{}", sani);
let mut file = OpenOptions::new()
.append(true)
.create(true)
.open(sani)
.unwrap();
big_or_chunk_to_file(tree, &MerkleNode::Chunk(node.clone()), &mut file);
todo!();
// if let Some(peer_id) = active_peer_id.clone() {
// let _ = self.network_cmd_tx.send(NetworkCommand::RequestChunk(peer_id, entry_hash.clone()));
// // self.status_message = format!("Requested file chunks for: {}...", &entry_hash[..8]);
// }
// todo!();
}
}
MerkleNode::Directory(node) => {
@@ -839,29 +581,26 @@ impl P2PClientApp {
entry.content_hash,
tree,
depth + 1,
Some(entry.filename.try_into().expect("incorrect size")),
Some(
entry
.filename
.as_slice()
.try_into()
.expect("incorrect size"),
),
);
}
});
}
MerkleNode::Big(node) => {
if ui
.selectable_label(false, format!("📄 (B) {}", name))
.on_hover_text("Click to request file chunks...")
.clicked()
{
if let Some(name) = filename {
if let Ok(nameb) = String::from_utf8(name.to_vec()) {
if let Some(addr) = &self.active_peer {
let _ = self.network_cmd_tx.send(NetworkCommand::InitDownload(
to_draw,
addr.clone(),
nameb,
));
}
}
}
CollapsingHeader::new(format!("📄 (B) {}", name))
.default_open(false)
.enabled(true)
.show(ui, |ui| {
for child in &node.children_hashes {
self.draw_file_node(ui, child.clone(), tree, depth + 1, None);
}
});
}
MerkleNode::BigDirectory(node) => {
CollapsingHeader::new(format!("📁 (BD) {}", name))

2
client-gui/src/main.rs
View File

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

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

@@ -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() {

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

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

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

@@ -11,27 +11,9 @@ pub fn parse_received_datum(
datum_length: usize,
) -> Option<([u8; 32], MerkleNode)> {
let hash_name: [u8; 32] = recevied_datum[..32].try_into().expect("error");
let value = &recevied_datum[32..datum_length];
let sigstart = datum_length - 64;
let value = &recevied_datum[32..sigstart];
let value_slice = value.to_vec();
println!("valueslice: {:?}, {}", value_slice, value_slice.len());
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((
@@ -39,17 +21,14 @@ pub fn parse_received_datum(
MerkleNode::Chunk(crate::ChunkNode { data: value_slice }),
)),
DIRECTORY => {
let nb_entries = value_slice[1];
let mut dir_entries = Vec::new();
let mut offset = 1 as usize;
for i in 0..((value_slice.len() - 1) / 64) as u8 {
offset = (1 + 64 * i as usize) as usize;
println!("offset:{}, i:{}", offset, i);
let name = &value_slice[offset..offset + 32];
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(&value_slice[offset + 32..offset + 64]);
let dp_name = String::from_utf8(name.to_vec()).expect("err");
println!("name:{}", dp_name);
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"),
@@ -67,38 +46,35 @@ pub fn parse_received_datum(
}
}
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");
let chlidren: Vec<NodeHash> = Vec::new();
Some((
hash_name,
MerkleNode::Big(crate::BigNode {
children_hashes: bigdir_entries,
children_hashes: chlidren,
}),
))
/*let chlidren: Vec<NodeHash> = Vec::new();
tree.data.insert(
hash_name,
MerkleNode::Big(crate::BigNode {
children_hashes: chlidren,
}),
);*/
}
BIGDIRECTORY => {
let mut bigdir_entries: Vec<NodeHash> = Vec::new();
let nb_entries = value_slice[1];
let mut dir_entries = Vec::new();
let mut offset = 1 as usize;
for i in 0..((value_slice.len() - 1) / 32) as u8 {
offset = (1 + 32 * i as usize) as usize;
println!("offset:{}, i:{}", offset, i);
let hash = &value_slice[offset..offset + 32];
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
bigdir_entries.push(hash.try_into().expect("incorrect size"));
dir_entries.push(hash);
}
let current = BigDirectoryNode::new(bigdir_entries);
let current = BigDirectoryNode::new(dir_entries);
match current {
Ok(current_node) => Some((hash_name, MerkleNode::BigDirectory(current_node))),
Err(e) => {
@@ -109,5 +85,4 @@ pub fn parse_received_datum(
}
_ => None,
}
}
}

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

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

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

@@ -1,10 +1,15 @@
use tokio::sync::oneshot;
use crate::{
NetworkEvent, NodeHash,
cryptographic_signature::{CryptographicSignature, get_peer_key, verify_signature},
NetworkEvent, NodeHash, P2PSharedData,
cryptographic_signature::{
CryptographicSignature, get_peer_key, sign_message, verify_signature,
},
datum_parsing::parse_received_datum,
messages_channels::MultipleSenders,
messages_structure::construct_message,
peers_refresh::HandshakeHistory,
registration,
server_communication::generate_id,
timestamp::Timestamp,
};
@@ -27,7 +32,6 @@ pub enum EventType {
Ping,
NatTraversal,
DatumRequest,
DatumRequestBig,
Unknown,
}
@@ -41,7 +45,6 @@ impl EventType {
EventType::NatTraversal => "NatTraversal".to_owned(),
EventType::DatumRequest => "DatumRequest".to_owned(),
EventType::Unknown => "Unknown".to_owned(),
EventType::DatumRequestBig => "DatumRequestBig".to_owned(),
}
}
@@ -317,10 +320,10 @@ pub fn parse_message(
String::from_utf8(received_message[LENGTH..(msg_length + LENGTH)].to_vec())
{
let err_msg = format!("Error received from peer {} : {}", ip, err_received);
let _ = cmd_tx_clone.send(NetworkEvent::Error(err_msg, "".to_owned()));
let _ = cmd_tx_clone.send(NetworkEvent::Error(err_msg));
} else {
let err_msg = format!("Error received from peer {} : N/A", ip,);
let _ = cmd_tx_clone.send(NetworkEvent::Error(err_msg, "".to_owned()));
let _ = cmd_tx_clone.send(NetworkEvent::Error(err_msg));
}
}
@@ -370,11 +373,14 @@ pub fn parse_message(
// envoyer la root request
let _ = &guard.remove_entry(&id);
println!("message {} retiré de la liste", id);
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");
let rootrequest = construct_message(
ROOTREQUEST,
Vec::new(),
generate_id(),
crypto_pair,
);
//&guard.insert(, v)
return rootrequest;
}
EventType::Hello => {
@@ -389,7 +395,6 @@ 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) => {
@@ -427,9 +432,7 @@ pub fn parse_message(
constructed_message = datumreqest;
guard.insert(new_id, EventType::DatumRequest);
}
_ => {
println!("event not prensent");
}
_ => {}
}
}
None => {}
@@ -458,62 +461,17 @@ 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,
ip.to_string(),
));
let _ =
cmd_tx.send(NetworkEvent::FileTreeReceived(tuple.0, tuple.1));
}
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

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

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

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

@@ -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();
}*/
}
}

2
client-network/src/peers_refresh.rs
View File

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

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

@@ -2,7 +2,6 @@ use crate::NetworkEvent;
use crate::P2PSharedData;
use crate::cryptographic_signature::CryptographicSignature;
use crate::get_server_address;
use crate::get_socket_address;
use crate::message_handling::EventType;
use crate::messages_structure::construct_message;
use crate::server_communication::generate_id;
@@ -51,54 +50,29 @@ 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, String),
) -> bool {
is_server_handshake: bool,
) {
println!("username: {}, ip: {}", username.clone(), ip.clone());
let crypto_pair = sd.cryptopair_ref();
let senders = sd.senders_ref();
let id = generate_id();
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()
}
}
}
};
if address.eq(&"".to_string()) {
return false;
}
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.0 {
if is_server_handshake {
sd.add_message(id, EventType::Hello);
} else {
sd.add_message(id, EventType::HelloThenRootRequest);
@@ -108,19 +82,19 @@ pub async fn perform_handshake(
Some(handshake_message) => {
senders.send_dispatch(
handshake_message,
address,
is_server_handshake.0,
sockaddr_bytes.to_string(),
is_server_handshake,
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) => {}
//}
}
None => {
let err_msg = format!("failed to retreive socket address:").to_string();
let res = event_tx.send(NetworkEvent::Error(err_msg));
}
}
/*let mut list = messages_list.lock().expect("Failed to lock messages_list");
match list.get(&id) {
@@ -138,5 +112,37 @@ pub async fn perform_handshake(
let hello_handshake_received = UDPMessage::parse(buf.to_vec());
hello_handshake_received.display();*/
//TODO
return true;
}
#[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);
}
}
}*/
}

BIN
project.pdf
View File

Binary file not shown.

1
rapport.txt
View File

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

25
todo.md
View File

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