graphical stuff
This commit is contained in:
@@ -4,6 +4,7 @@ mod message_handling;
|
||||
mod messages_channels;
|
||||
mod messages_structure;
|
||||
mod registration;
|
||||
mod server_communication;
|
||||
|
||||
use crate::{
|
||||
cryptographic_signature::CryptographicSignature,
|
||||
@@ -12,6 +13,7 @@ use crate::{
|
||||
registration::{
|
||||
get_socket_address, parse_addresses, register_ip_addresses, register_with_the_server,
|
||||
},
|
||||
server_communication::get_peer_list,
|
||||
};
|
||||
use std::sync::{Arc, Mutex};
|
||||
use std::{
|
||||
@@ -19,10 +21,40 @@ use std::{
|
||||
str::FromStr,
|
||||
};
|
||||
|
||||
pub struct P2PSharedData {
|
||||
shared_socket: Arc<UdpSocket>,
|
||||
shared_cryptopair: Arc<CryptographicSignature>,
|
||||
shared_messageslist: Arc<Mutex<HashMap<i32, EventType>>>,
|
||||
shared_senders: Arc<MultipleSenders>,
|
||||
}
|
||||
|
||||
impl P2PSharedData {
|
||||
pub fn new(username: String) -> P2PSharedData {
|
||||
let messages_list = HashMap::<i32, EventType>::new();
|
||||
let username = String::from(username);
|
||||
let crypto_pair = CryptographicSignature::new(username);
|
||||
let socket = UdpSocket::bind("0.0.0.0:0").expect("bind failed");
|
||||
|
||||
let shared_socket = Arc::new(socket);
|
||||
let shared_cryptopair = Arc::new(crypto_pair);
|
||||
let shared_messageslist = Arc::new(Mutex::new(messages_list));
|
||||
|
||||
let senders = MultipleSenders::new(1, &shared_socket);
|
||||
let shared_senders = Arc::new(senders);
|
||||
P2PSharedData {
|
||||
shared_socket: shared_socket,
|
||||
shared_cryptopair: shared_cryptopair,
|
||||
shared_messageslist: shared_messageslist,
|
||||
shared_senders: shared_senders,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Messages sent to the Network thread by the GUI.
|
||||
pub enum NetworkCommand {
|
||||
ConnectToServer(String, String), // ServerIP
|
||||
FetchPeerList(String), // ServerIP
|
||||
ConnectToServerPut(String), // ServerIP
|
||||
ServerHandshake(String), // ServerName
|
||||
FetchPeerList(String), // ServerIP
|
||||
RegisterAsPeer(String),
|
||||
Ping(),
|
||||
ConnectPeer(String), // IP:PORT
|
||||
@@ -35,6 +67,7 @@ pub enum NetworkCommand {
|
||||
/// Messages sent to the GUI by the Network thread.
|
||||
pub enum NetworkEvent {
|
||||
Connected(),
|
||||
ConnectedHandshake(),
|
||||
Disconnected(),
|
||||
Error(),
|
||||
PeerConnected(String),
|
||||
@@ -69,6 +102,7 @@ pub fn calculate_chunk_id(data: &[u8]) -> String {
|
||||
pub fn start_p2p_executor(
|
||||
cmd_rx: Receiver<NetworkCommand>,
|
||||
event_tx: Sender<NetworkEvent>,
|
||||
shared_data: Option<P2PSharedData>,
|
||||
) -> tokio::task::JoinHandle<()> {
|
||||
// Use tokio to spawn the asynchronous networking logic
|
||||
tokio::task::spawn(async move {
|
||||
@@ -81,6 +115,49 @@ pub fn start_p2p_executor(
|
||||
// Check for commands from the GUI
|
||||
if let Ok(cmd) = cmd_rx.try_recv() {
|
||||
match cmd {
|
||||
NetworkCommand::ServerHandshake(username) => {
|
||||
let server_addr_query = get_socket_address(username);
|
||||
|
||||
match server_addr_query.await {
|
||||
Ok(sockaddr_bytes) => {
|
||||
match String::from_utf8(sockaddr_bytes.to_vec()) {
|
||||
Ok(s) => {
|
||||
let addresses = parse_addresses(&s);
|
||||
if let Some(first) = addresses.first() {
|
||||
// first: &SocketAddr
|
||||
/*start_receving_thread(
|
||||
&shared_socket,
|
||||
&shared_messageslist,
|
||||
&shared_cryptopair,
|
||||
*first, // copie le SocketAddr (implémente Copy pour SocketAddr)
|
||||
&shared_senders,
|
||||
);
|
||||
register_ip_addresses(
|
||||
&shared_cryptopair,
|
||||
first.to_string(),
|
||||
&shared_senders,
|
||||
&shared_messageslist,
|
||||
545,
|
||||
);*/
|
||||
|
||||
let res = event_tx.send(NetworkEvent::Connected());
|
||||
} else {
|
||||
let res = event_tx.send(NetworkEvent::Error());
|
||||
eprintln!("no valid socket addresses found in: {}", s);
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
let res = event_tx.send(NetworkEvent::Error());
|
||||
eprintln!("invalid UTF-8 in socket address bytes: {}", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
eprintln!("failed to retrieve socket address: {}", e);
|
||||
let res = event_tx.send(NetworkEvent::Error());
|
||||
}
|
||||
}
|
||||
}
|
||||
NetworkCommand::ConnectPeer(addr) => {
|
||||
println!("[Network] ConnectPeer() called");
|
||||
println!("[Network] Attempting to connect to: {}", addr);
|
||||
@@ -97,14 +174,14 @@ pub fn start_p2p_executor(
|
||||
NetworkCommand::RequestChunk(_, _) => {
|
||||
println!("[Network] RequestChunk() called");
|
||||
}
|
||||
NetworkCommand::ConnectToServer(ip, server_name) => {
|
||||
NetworkCommand::ConnectToServerPut(ip) => {
|
||||
println!("[Network] ConnectToServer() called");
|
||||
|
||||
// Actual server connection
|
||||
|
||||
let messages_list = HashMap::<i32, EventType>::new();
|
||||
|
||||
let username = String::from("az");
|
||||
let username = String::from("Gamemeixtreize");
|
||||
|
||||
let crypto_pair = CryptographicSignature::new(username);
|
||||
|
||||
@@ -118,57 +195,47 @@ pub fn start_p2p_executor(
|
||||
|
||||
let shared_senders = Arc::new(senders);
|
||||
if let Err(e) = register_with_the_server(&shared_cryptopair, &ip).await {
|
||||
let res = event_tx.send(NetworkEvent::Error());
|
||||
eprintln!("request failed: {}", e);
|
||||
}
|
||||
|
||||
let res = event_tx.send(NetworkEvent::Connected());
|
||||
|
||||
println!("ip: {}", ip);
|
||||
|
||||
let server_addr_query = get_socket_address(server_name);
|
||||
//tokio::time::sleep(std::time::Duration::from_millis(5000)).await;
|
||||
|
||||
match server_addr_query.await {
|
||||
Ok(sockaddr_bytes) => {
|
||||
match String::from_utf8(sockaddr_bytes.to_vec()) {
|
||||
Ok(s) => {
|
||||
let addresses = parse_addresses(&s);
|
||||
if let Some(first) = addresses.first() {
|
||||
// first: &SocketAddr
|
||||
start_receving_thread(
|
||||
&shared_socket,
|
||||
&shared_messageslist,
|
||||
&shared_cryptopair,
|
||||
*first, // copie le SocketAddr (implémente Copy pour SocketAddr)
|
||||
&shared_senders,
|
||||
);
|
||||
register_ip_addresses(
|
||||
&shared_cryptopair,
|
||||
first.to_string(),
|
||||
&shared_senders,
|
||||
&shared_messageslist,
|
||||
545,
|
||||
);
|
||||
} else {
|
||||
eprintln!("no valid socket addresses found in: {}", s);
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
eprintln!("invalid UTF-8 in socket address bytes: {}", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
Err(e) => eprintln!("failed to retrieve socket address: {}", e),
|
||||
}
|
||||
|
||||
tokio::time::sleep(std::time::Duration::from_millis(5000)).await;
|
||||
|
||||
let res = event_tx.send(NetworkEvent::Connected());
|
||||
/*let res = event_tx.send(NetworkEvent::Connected());
|
||||
if let Some(error) = res.err() {
|
||||
println!(
|
||||
"[Network] Couldn't send crossbeam message to GUI: {}",
|
||||
error.to_string()
|
||||
);
|
||||
}
|
||||
}*/
|
||||
}
|
||||
NetworkCommand::FetchPeerList(ip) => {
|
||||
println!("cc");
|
||||
match get_peer_list(String::from("https://jch.irif.fr:8443")).await {
|
||||
Ok(body) => match String::from_utf8(body.to_vec()) {
|
||||
Ok(peers_list) => {
|
||||
let mut peers: Vec<String> = Vec::new();
|
||||
let mut current = String::new();
|
||||
for i in peers_list.chars() {
|
||||
if i == '\n' {
|
||||
peers.push(current.clone());
|
||||
current.clear();
|
||||
} else {
|
||||
current.push(i);
|
||||
}
|
||||
}
|
||||
let res = event_tx.send(NetworkEvent::PeerListUpdated(peers));
|
||||
}
|
||||
Err(e) => {
|
||||
eprintln!("invalid UTF-8 in socket address bytes: {}", e);
|
||||
}
|
||||
},
|
||||
Err(e) => println!("error"),
|
||||
}
|
||||
println!("[Network] FetchPeerList() called");
|
||||
}
|
||||
NetworkCommand::RegisterAsPeer(_) => {
|
||||
|
||||
Reference in New Issue
Block a user