From 80eac2db10355b421405342236296a1484932065 Mon Sep 17 00:00:00 2001 From: beffroi Date: Fri, 9 Dec 2022 09:15:04 +0100 Subject: [PATCH] Step 1.1 of reactor --- src/main.rs | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/main.rs b/src/main.rs index 35872cd..88b68d8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -24,13 +24,8 @@ fn main() { // Parse the command line arguments. // let args: Vec = env::args().collect(); - let mut dest_ip : Ipv4Addr = Ipv4Addr::UNSPECIFIED; - let mut ping_request : u16 = 0x0800; - let mut data : u16 = 0x0000; - let mut payload = Vec::::new(); + let (dest_ip,ping_request,data,payload) = parse_all_arguments();//&mut dest_ip, &mut ping_request, &mut data, &mut payload); - parse_all_arguments(&mut dest_ip, &mut ping_request, &mut data, &mut payload); - // SOURCE IP ADDRESS // let localhost = Ipv4Addr::LOCALHOST; let localhost = Ipv4Addr::UNSPECIFIED; @@ -167,26 +162,30 @@ fn main() { // }, // Default payload value // }; -fn parse_all_arguments(dest_ip: &mut Ipv4Addr, ping_req: &mut u16, data: &mut u16, payload: &mut Vec){ +fn parse_all_arguments() -> (Ipv4Addr,u16,u16,Vec){ // Load all inline arguments and change them in place let args: Vec = env::args().collect(); - + let mut ping_request : u16 = 0x0800; + let mut data : u16 = 0x0000; + let mut payload = Vec::::new(); + if args.len() == 1 { exit_with_help(); } - *dest_ip=args[1].parse::().unwrap(); + let 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(); + ping_request = args[i + 2].parse::().unwrap(); } else if arg == "--data" || arg == "-d" { - *data = args[i + 2].parse::().unwrap(); + data = args[i + 2].parse::().unwrap(); } else if arg == "--payload" || arg == "-p" { - *payload = args[i + 2].as_bytes().to_vec(); + payload = args[i + 2].as_bytes().to_vec(); } } + (dest_ip,ping_request, data, payload) } fn exit_with_help() {