diff --git a/src/main.rs b/src/main.rs index 7f5f236..35872cd 100644 --- a/src/main.rs +++ b/src/main.rs @@ -22,36 +22,24 @@ fn main() { //env_logger::Builder::from_env(Env::default().default_filter_or("info")).init(); // Parse the command line arguments. - let args: Vec = env::args().collect(); - if args.len() == 1 || args.contains(&"--help".to_string()) { - eprintln!("Usage: cargo run --dest [--request/-r ] [--data/-d ] [--payload/-p ]"); - std::process::exit(1); - } + // let args: Vec = env::args().collect(); - let dest_ip = args[1].parse::().unwrap(); - - let mut ping_request = None; - let mut data = None; - let mut temp_payload = None; - for (i, arg) in args[1..].iter().enumerate() { - if arg == "--request" || arg == "-r" { - ping_request = Some(args[i + 2].parse::().unwrap()); - } else if arg == "--data" || arg == "-d" { - data = Some(args[i + 2].parse::().unwrap()); - } else if arg == "--payload" || arg == "-p" { - temp_payload = Some(args[i + 2].as_bytes()); - } - } + let mut dest_ip : Ipv4Addr = Ipv4Addr::UNSPECIFIED; + let mut ping_request : u16 = 0x0800; + let mut data : u16 = 0x0000; + let mut payload = Vec::::new(); + parse_all_arguments(&mut dest_ip, &mut ping_request, &mut data, &mut payload); + // SOURCE IP ADDRESS // let localhost = Ipv4Addr::LOCALHOST; let localhost = Ipv4Addr::UNSPECIFIED; let socket_ip_address = SocketAddr::new(IpAddr::V4(localhost), 80); let socket2_ip_address = socket_ip_address.into(); - let ping_request = ping_request.unwrap_or(0x0800); // Default ping request value - let data = data.unwrap_or(0x0000); // Default data value - let payload=temp_payload.unwrap_or(b""); + // let ping_request = ping_request.unwrap_or(0x0800); // Default ping request value + // let data = data.unwrap_or(0x0000); // Default data value + // let payload=temp_payload.unwrap_or(b""); // Create a UDP socket. @@ -119,8 +107,8 @@ fn main() { let now = Instant::now(); let result = socket_arc.send_to(&buf, dest_addr); match result { - Ok(bytes) => println!("> {} bytes sent over the socket", bytes), - Err(err) => println!("> Failed to send data over the socket: {}", err) + Ok(bytes) => println!(" > {} bytes sent over the socket", bytes), + Err(err) => println!(" > Failed to send data over the socket: {}", err) } // Wait for a response from the destination. @@ -177,4 +165,31 @@ fn main() { // Some(p) => { // payload=*p // }, // Default payload value -// }; \ No newline at end of file +// }; + +fn parse_all_arguments(dest_ip: &mut Ipv4Addr, ping_req: &mut u16, data: &mut u16, payload: &mut Vec){ + // Load all inline arguments and change them in place + let args: Vec = env::args().collect(); + + if args.len() == 1 { + exit_with_help(); + } + + *dest_ip=args[1].parse::().unwrap(); + for (i,arg) in args[1..].iter().enumerate(){ + if arg == "--help" || arg == "-h" { + exit_with_help(); + } else if arg == "--request" || arg == "-r" { + *ping_req = args[i + 2].parse::().unwrap(); + } else if arg == "--data" || arg == "-d" { + *data = args[i + 2].parse::().unwrap(); + } else if arg == "--payload" || arg == "-p" { + *payload = args[i + 2].as_bytes().to_vec(); + } + } +} + +fn exit_with_help() { + eprintln!("Usage: cargo run --dest [--request/-r ] [--data/-d ] [--payload/-p ]"); + std::process::exit(1); +} \ No newline at end of file