From affedf3f3b223a3c18a83a8072884f3309f4b36a Mon Sep 17 00:00:00 2001 From: Patryk Hegenberg Date: Mon, 22 Apr 2024 16:00:21 +0200 Subject: [PATCH] relay: sender: receiver: change standart ips --- src/cli/args.rs | 8 ++++---- src/receiver/client.rs | 14 +++++++++----- src/relay/server.rs | 6 +++--- src/sender/server.rs | 2 +- src/transfer_info/transfer_info.rs | 4 ++-- 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/cli/args.rs b/src/cli/args.rs index 1c3e915..7d39d0b 100644 --- a/src/cli/args.rs +++ b/src/cli/args.rs @@ -82,7 +82,7 @@ impl Args { match &self.command { Some(Commands::Send { relay, file }) => { let _ = match sender::send_info( - relay.as_deref().unwrap_or("http://0.0.0.0:8080"), + relay.as_deref().unwrap_or("http://0.0.0.0:8000"), file.as_deref().unwrap_or("test.txt"), ) .await @@ -101,19 +101,19 @@ impl Args { name, }) => { let response = receiver::download_info( - relay.as_deref().unwrap_or("http://0.0.0.0:8080"), + relay.as_deref().unwrap_or("http://0.0.0.0:8000"), name.as_deref().unwrap_or("None"), ) .await; match response { Ok(res) => { debug!("The response is: {:#?}", res); - let reachable = receiver::ping_sender(&res.ip).await; + let reachable = receiver::ping_sender(&res.body.ip).await; match reachable { Ok(_) => match receiver::download_file(&res, overwrite).await { Ok(_) => { info!("Download complete"); - let _ = match receiver::signal_success(&res.ip).await { + let _ = match receiver::signal_success(&res.body.ip).await { Ok(_) => Ok(()), Err(err) => Err(err), }; diff --git a/src/receiver/client.rs b/src/receiver/client.rs index 0aa966e..0728082 100644 --- a/src/receiver/client.rs +++ b/src/receiver/client.rs @@ -8,7 +8,7 @@ use tracing::{debug, error, info}; type Result = std::result::Result>; pub async fn download_info(relay: &str, filename: &str) -> Result { - match reqwest::get(format!("{}/download/{}", relay.to_string(), filename)).await { + match reqwest::get(format!("{}/download/{}", relay, filename)).await { Ok(resp) => { let json = resp.json::().await?; debug!("Json Response: {:#?}", json); @@ -36,11 +36,15 @@ pub async fn download_file(transfer_info: &TransferInfoRequest, overwrite: &bool ))); } - let resp = reqwest::get(format!("http://{}:1300/download_file", &transfer_info.ip)).await?; + let resp = reqwest::get(format!( + "http://{}:8100/download_file", + &transfer_info.body.ip + )) + .await?; if !resp.status().is_success() { return Err(Box::new(std::io::Error::new( std::io::ErrorKind::Other, - format!("Failed to download file from {}", &transfer_info.ip), + format!("Failed to download file from {}", &transfer_info.body.ip), ))); } let mut dest = File::create(&transfer_info.body.files)?; @@ -52,7 +56,7 @@ pub async fn download_file(transfer_info: &TransferInfoRequest, overwrite: &bool pub async fn ping_sender(sender: &String) -> Result { debug!("Pinging Sender on {:#?}", sender); - match reqwest::get(format!("http://{}:1300/ping", sender)).await { + match reqwest::get(format!("http://{}:8100/ping", sender)).await { Ok(resp) => { debug!("Sender directly reachable"); debug!("Response is: {:#?}", resp); @@ -69,7 +73,7 @@ pub async fn signal_success(sender: &String) -> Result<()> { debug!("Signaling shutdown to {:#?}", sender); let client = Client::new(); let _ = client - .post(format!("http://{}:1300/shutdown", sender)) + .post(format!("http://{}:8100/shutdown", sender)) .send() .await?; Ok(()) diff --git a/src/relay/server.rs b/src/relay/server.rs index bd6be75..29ad781 100644 --- a/src/relay/server.rs +++ b/src/relay/server.rs @@ -34,7 +34,7 @@ pub async fn start_server(port: Option<&i32>, listen_addr: Option<&String>) { }; let app_port = match port { Some(port) => port.to_string(), - None => env::var("APP_PORT").unwrap_or("1323".to_string()), + None => env::var("APP_PORT").unwrap_or("8000".to_string()), }; debug!("Server configured to accept connections on host {app_host}..."); @@ -86,12 +86,12 @@ async fn download_info( ( StatusCode::NOT_FOUND, Json(TransferInfoRequest { - ip: "".to_string(), name: "".to_string(), message: "error".to_string(), body: TransferInfoBody { keyword: "".to_string(), files: "".to_string(), + ip: "".to_string(), }, }), ) @@ -107,12 +107,12 @@ async fn upload_info( debug!("Got upload request from {}", addr.ip().to_string()); let mut data = shared_state.data.lock().unwrap(); let t_request = TransferInfoRequest { - ip: addr.ip().to_string(), name: generate_random_name(), message: "created".to_string(), body: TransferInfoBody { keyword: payload.keyword, files: payload.files, + ip: payload.ip, }, }; data.push(t_request.clone()); diff --git a/src/sender/server.rs b/src/sender/server.rs index acde90b..b0eedf5 100644 --- a/src/sender/server.rs +++ b/src/sender/server.rs @@ -19,7 +19,7 @@ lazy_static! { pub async fn serf_file(path: &String) { debug!("Sender starting..."); let app_host = "0.0.0.0".to_string(); - let app_port = "1300".to_string(); + let app_port = "8100".to_string(); debug!("Server configured to accept connections on host {app_host}..."); debug!("Server configured to listen connections on port {app_port}..."); diff --git a/src/transfer_info/transfer_info.rs b/src/transfer_info/transfer_info.rs index c6e7aa5..64eb44b 100644 --- a/src/transfer_info/transfer_info.rs +++ b/src/transfer_info/transfer_info.rs @@ -2,7 +2,6 @@ use serde::{Deserialize, Serialize}; #[derive(Debug, Serialize, Deserialize, Clone)] pub struct TransferInfoRequest { - pub ip: String, pub name: String, pub message: String, pub body: TransferInfoBody, @@ -12,17 +11,18 @@ pub struct TransferInfoRequest { pub struct TransferInfoBody { pub keyword: String, pub files: String, + pub ip: String, } impl TransferInfoRequest { pub fn new() -> Self { Self { - ip: "".to_string(), name: "".to_string(), message: "".to_string(), body: TransferInfoBody { keyword: "".to_string(), files: "".to_string(), + ip: "".to_string(), }, } }