From e97a15d84b48dc463d4313957032423e987a19c8 Mon Sep 17 00:00:00 2001 From: Namu Date: Mon, 23 Mar 2026 16:45:29 +0100 Subject: [PATCH] fix: format the project --- src/config/mod.rs | 50 +++++++++++++++++++++++------------------------ src/main.rs | 2 +- src/server/mod.rs | 11 ++++++++--- 3 files changed, 34 insertions(+), 29 deletions(-) diff --git a/src/config/mod.rs b/src/config/mod.rs index b3f4f7b..bc58cb5 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -9,33 +9,35 @@ pub struct Forwarding { from: String, to: String, #[serde(rename = "doReverse")] - do_reverse: bool + do_reverse: bool, } impl Forwarding { pub fn new(from: String, to: String, do_reverse: bool) -> Forwarding { - Forwarding{ + Forwarding { from, to, - do_reverse + do_reverse, } } pub fn from_json(json: &Value) -> Forwarding { - let object_forwarding = json.as_object() - .expect("Error parsing forwarding"); + let object_forwarding = json.as_object().expect("Error parsing forwarding"); - let from = object_forwarding.get("from") + let from = object_forwarding + .get("from") .unwrap() .as_str() .expect("Error parsing from field"); - let to = object_forwarding.get("to") + let to = object_forwarding + .get("to") .unwrap() .as_str() .expect("Error parsing to field"); - let do_reverse = object_forwarding.get("doReverse") + let do_reverse = object_forwarding + .get("doReverse") .unwrap() .as_bool() .expect("Error parsing doReverse field"); @@ -49,7 +51,7 @@ pub struct Config { #[serde(rename = "serverAddr")] server_addr: String, blacklist: Vec, - forwarding: Vec + forwarding: Vec, } impl Config { @@ -57,23 +59,23 @@ impl Config { Config { server_addr, blacklist, - forwarding + forwarding, } } fn read_config_file(file_name: String) -> String { - let mut file = File::open(file_name).expect("Error opening config.json file. Go to the readme file and paste the example."); + let mut file = File::open(file_name) + .expect("Error opening config.json file. Go to the readme file and paste the example."); let mut buf = String::new(); - file.read_to_string(&mut buf).expect("Error reading config file content."); + file.read_to_string(&mut buf) + .expect("Error reading config file content."); buf } fn parse_buffer(buf: &str) -> serde_json::Map { - let json: Value = serde_json::from_str(buf) - .expect("Error parsing config file"); + let json: Value = serde_json::from_str(buf).expect("Error parsing config file"); - let object_data = json.as_object() - .expect("Error parsing config file."); + let object_data = json.as_object().expect("Error parsing config file."); object_data.clone() } @@ -92,20 +94,18 @@ impl Config { let buf = Config::read_config_file(file_name); let object_data = Self::parse_buffer(&buf); - - let server_addr = object_data.get("serverAddr") + let server_addr = object_data + .get("serverAddr") .unwrap() .as_str() .unwrap() .to_string(); - let blacklist = object_data.get("blacklist") - .unwrap() - .as_array() - .unwrap(); + let blacklist = object_data.get("blacklist").unwrap().as_array().unwrap(); let str_blacklist = convert_to_vec_string(blacklist); - let raw_forwarding = object_data.get("forwarding") + let raw_forwarding = object_data + .get("forwarding") .unwrap() .as_array() .expect("Error parsing forwarding."); @@ -121,9 +121,9 @@ impl Config { pub fn is_forwarded(&self, addr: String) -> Option { for elem_forwarding in &self.forwarding { if elem_forwarding.from == addr { - return Some(elem_forwarding.to.clone()) + return Some(elem_forwarding.to.clone()); } else if elem_forwarding.do_reverse && elem_forwarding.to == addr { - return Some(elem_forwarding.from.clone()) + return Some(elem_forwarding.from.clone()); } } None diff --git a/src/main.rs b/src/main.rs index b916955..0b9b2f3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,8 +1,8 @@ use crate::config::Config; mod config; -mod utils; mod server; +mod utils; fn main() { let config = Config::from_json("config.json".to_string()); diff --git a/src/server/mod.rs b/src/server/mod.rs index 910db8d..0e0fdc7 100644 --- a/src/server/mod.rs +++ b/src/server/mod.rs @@ -1,6 +1,6 @@ -use std::net::UdpSocket; -use colored::Colorize; use crate::config::Config; +use colored::Colorize; +use std::net::UdpSocket; pub fn listen(config: &Config) { let serv_config = config; @@ -37,7 +37,12 @@ pub fn listen(config: &Config) { .expect("Error forwarding message to another ip."); } - println!("{}-{}: {}", src_addr.to_string().green(), chrono::Local::now(), message); + println!( + "{}-{}: {}", + src_addr.to_string().green(), + chrono::Local::now(), + message + ); } } }